归档修改

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java

@@ -722,7 +722,7 @@ public class PurchaseorderController {
         List<Purchaseorder_item0Entity> purchaseorder_item0EntityList = purchaseorderitemService.GetPurchaseorder_item0List(id);
         for (Purchaseorder_item0Entity purchaseorder_item0Entity : purchaseorder_item0EntityList) {
             PoundlistEntity poundlistEntity = poundlistService.getById(purchaseorder_item0Entity.getPoundlistId());
-            if (StringUtil.isEmpty(poundlistEntity.getIsPay()) && poundlistEntity.getPayDate()==null){
+            if (poundlistEntity.getPayDate()==null){
                 poundlistEntity.setIsPay("1");
                 poundlistEntity.setPayDate(new Date());
             }

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java

@@ -384,7 +384,7 @@ public class SaleorderitemController {
                         for (Salesorder_item0Entity salesorder_item0Entity : salesorder_item0EntityList){
                             PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId());
                             if (ObjectUtils.isNotEmpty(poundlistEntity)){
-                                if (StringUtil.isEmpty(poundlistEntity.getIsCollection()) && poundlistEntity.getPaymentDate() == null){
+                                if (poundlistEntity.getPaymentDate() == null){
                                     poundlistEntity.setIsCollection("1");
                                     poundlistEntity.setPaymentDate(new Date());
                                 }