From f3574a0347f91c79a670cfa45c39d292292f1ff9 Mon Sep 17 00:00:00 2001 From: Vayne Date: Wed, 12 Apr 2023 23:23:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/jnpf/poundlist/entity/PoundlistEntity.java | 6 ------ .../purchaseorder/entity/PurchaseorderitemEntity.java | 3 ++- .../saleorder/controller/SaleorderitemController.java | 8 ++++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java index c1395175..aa624774 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java @@ -194,12 +194,6 @@ public class PoundlistEntity { @TableField("IS_EXPENSE") private String isExpense; - @TableField(exist = false) - private String isPayment; - - @TableField(exist = false) - private String isTransfer; - @TableField(exist = false) private String materialName; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java index 51c587ee..0781422a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java @@ -151,7 +151,8 @@ public class PurchaseorderitemEntity { @TableField("SUPPLIER_ID") private String supplierId; - @TableField("is_payment") + + @TableField("IS_PAYMENT") private String isPayment; @TableField(exist = false) 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 3ba5e4d0..d2567303 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 @@ -248,10 +248,10 @@ public class SaleorderitemController { if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){ entity.setMaterialName(materialEntity.getItemName()); } - QueryWrapper queryWrapper3 = new QueryWrapper<>(); - queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId()); - PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3); - entity.setPoundEntity(poundlistEntity); + if (StringUtils.isNotEmpty(entity.getPoundlistId())) { + PoundlistEntity poundlistEntity = poundlistService.getById(entity.getPoundlistId()); + entity.setPoundEntity(poundlistEntity); + } entity.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num", false)); } if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())){