From 25910245dc40ed2afe8663476a25200368ef7323 Mon Sep 17 00:00:00 2001 From: Vayne Date: Sat, 1 Apr 2023 20:31:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SaleorderitemController.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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 3d69fd35..47411b5c 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 @@ -782,7 +782,11 @@ public class SaleorderitemController { } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ArinvoicesEntity::getSalesOrderId,id); - ArinvoicesEntity arinvoicesEntity = arinvoicesService.getOne(queryWrapper); + List arinvoicesList = arinvoicesService.list(queryWrapper); + ArinvoicesEntity arinvoicesEntity = new ArinvoicesEntity(); + if (arinvoicesList!=null && arinvoicesList.size()>0) { + arinvoicesEntity = JsonUtil.getJsonToBean(arinvoicesList.get(0), ArinvoicesEntity.class); + } List jg_arinvoices_item0ModelList = new ArrayList<>(); if (ObjectUtils.isNotEmpty(arinvoicesEntity)) { List jg_arinvoices_item0List = saleorderitemService.GetArinvoices_item0soitemList(arinvoicesEntity.getId()); @@ -914,7 +918,11 @@ public class SaleorderitemController { vo.setReceiptoutsoitemList(jg_receiptoutModelList); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ArinvoicesEntity::getSalesOrderId,id); - ArinvoicesEntity arinvoicesEntity = arinvoicesService.getOne(queryWrapper); + List arinvoicesList = arinvoicesService.list(queryWrapper); + ArinvoicesEntity arinvoicesEntity = new ArinvoicesEntity(); + if (arinvoicesList!=null && arinvoicesList.size()>0) { + arinvoicesEntity = JsonUtil.getJsonToBean(arinvoicesList.get(0), ArinvoicesEntity.class); + } List jg_arinvoices_item0ModelList = new ArrayList<>(); if (ObjectUtils.isNotEmpty(arinvoicesEntity)) { List jg_arinvoices_item0List = saleorderitemService.GetArinvoices_item0soitemList(arinvoicesEntity.getId());