diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java index bbfce0b2..5b25f3f2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java @@ -722,7 +722,7 @@ public class PurchaseorderController { List 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()); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java index 378a8d02..9f530fb1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java +++ b/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()); }