From 4b75ba614168a522b31257c90a10f8838a54e7be Mon Sep 17 00:00:00 2001 From: Vayne Date: Sun, 2 Apr 2023 20:18:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SaleorderitemController.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 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 47411b5c..47aa2d82 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 @@ -756,9 +756,9 @@ public class SaleorderitemController { // Map materialIdMap = new HashMap<>(); // jg_salesorder_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesorder_item0Model.getMaterialId(),materialIdMap)); // } - if (jg_salesorder_item0ModelList!=null && jg_salesorder_item0ModelList.size()>0) { + vo.setSalesorder_item0List(jg_salesorder_item0ModelList); - } + List jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id); List jg_receiptoutModelList = new ArrayList<>(); if (jg_receiptoutList!=null && jg_receiptoutList.size()>0) { @@ -777,9 +777,9 @@ public class SaleorderitemController { // jg_receiptoutModel.setWarehouseId(generaterSwapUtil.getPopupSelectValue("399117969575232581","id","name",jg_receiptoutModel.getWarehouseId(),warehouseMap)); } } - if (jg_receiptoutModelList!=null && jg_receiptoutModelList.size()>0) { + vo.setReceiptoutsoitemList(jg_receiptoutModelList); - } + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ArinvoicesEntity::getSalesOrderId,id); List arinvoicesList = arinvoicesService.list(queryWrapper); @@ -795,9 +795,9 @@ public class SaleorderitemController { jg_arinvoices_item0Model.setAttachMent(generaterSwapUtil.getFileNameInJson(jg_arinvoices_item0Model.getAttachMent())); } } - if (jg_arinvoices_item0ModelList!=null && jg_arinvoices_item0ModelList.size()>0) { + vo.setArinvoices_item0soitemList(jg_arinvoices_item0ModelList); - } + QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.lambda().eq(Collection_item0Entity::getSalesorderId,id); List collection_item0Entity = collection_item0Service.list(queryWrapper1); @@ -811,23 +811,23 @@ public class SaleorderitemController { List jg_collectionModelList = JsonUtil.getJsonToList(collectionsoitemEntityList, CollectionsoitemModel.class); for (CollectionsoitemModel jg_collectionModel : jg_collectionModelList) { } - if (jg_collectionModelList!=null && jg_collectionModelList.size()>0) { + vo.setCollectionsoitemList(jg_collectionModelList); - } + List jg_salesbackList = saleorderitemService.GetSalesbacksoitemList(id); List jg_salesbackModelList = JsonUtil.getJsonToList(jg_salesbackList,SalesbacksoitemModel.class); for(SalesbacksoitemModel jg_salesbackModel : jg_salesbackModelList){ } - if (jg_salesbackModelList!=null && jg_salesbackModelList.size()>0) { + vo.setSalesbacksoitemList(jg_salesbackModelList); - } + List jg_paymentList = saleorderitemService.GetPaymentsoitemList(id); List jg_paymentModelList = JsonUtil.getJsonToList(jg_paymentList,PaymentsoitemModel.class); for(PaymentsoitemModel jg_paymentModel : jg_paymentModelList){ } - if (jg_paymentModelList!=null && jg_paymentModelList.size()>0) { + vo.setPaymentsoitemList(jg_paymentModelList); - } + List poundlist = saleorderitemService.GetPoundlistList(id); vo.setPoundlistentityList(poundlist); From 3cefa1410e402eabad42da953551134da42af5f4 Mon Sep 17 00:00:00 2001 From: Vayne Date: Sun, 2 Apr 2023 21:54:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue | 2 +- SC-web/src/views/scm/basicInformation/collection/Detail.vue | 2 +- SC-web/src/views/scm/basicInformation/receiptout/Detail.vue | 2 +- SC-web/src/views/scm/basicInformation/saleback/Detail.vue | 2 +- SC-web/src/views/scm/basicInformation/saleorder/Detail.vue | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue index 790757a1..634ca78c 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue @@ -1,5 +1,5 @@