From 885a8352f05c049050c76b78f5dc58f7b285ba44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Tue, 18 Apr 2023 16:56:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jnpf/purchaseorder/controller/PurchaseorderController.java | 2 +- .../java/jnpf/saleorder/controller/SaleorderitemController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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()); }