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 7ada6219..725256c2 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 @@ -703,9 +703,10 @@ public class SaleorderitemController { } vo.setSalesorder_item0List(jg_salesorder_item0ModelList); List jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id); + List jg_receiptoutModelList = new ArrayList<>(); if (jg_receiptoutList.size()>0) { List list = saleorderitemService.getReceiptout(jg_receiptoutList.get(0).getId()); - List jg_receiptoutModelList = JsonUtil.getJsonToList(list, ReceiptoutsoitemModel.class); + jg_receiptoutModelList = JsonUtil.getJsonToList(list, ReceiptoutsoitemModel.class); for (ReceiptoutsoitemModel jg_receiptoutModel : jg_receiptoutModelList) { jg_receiptoutModel.setDocumentNo(jg_receiptoutList.get(0).getDocumentNo()); jg_receiptoutModel.setIssueDate(jg_receiptoutList.get(0).getIssueDate().getTime()); @@ -718,19 +719,20 @@ public class SaleorderitemController { Map warehouseMap = new HashMap<>(); jg_receiptoutModel.setWarehouseId(generaterSwapUtil.getPopupSelectValue("399117969575232581","id","name",jg_receiptoutModel.getWarehouseId(),warehouseMap)); } - vo.setReceiptoutsoitemList(jg_receiptoutModelList); } + vo.setReceiptoutsoitemList(jg_receiptoutModelList); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ArinvoicesEntity::getSalesOrderId,id); ArinvoicesEntity arinvoicesEntity = arinvoicesService.getOne(queryWrapper); + List jg_arinvoices_item0ModelList = new ArrayList<>(); if (ObjectUtils.isNotEmpty(arinvoicesEntity)) { List jg_arinvoices_item0List = saleorderitemService.GetArinvoices_item0soitemList(arinvoicesEntity.getId()); - List jg_arinvoices_item0ModelList = JsonUtil.getJsonToList(jg_arinvoices_item0List, Arinvoices_item0soitemModel.class); + jg_arinvoices_item0ModelList = JsonUtil.getJsonToList(jg_arinvoices_item0List, Arinvoices_item0soitemModel.class); for (Arinvoices_item0soitemModel jg_arinvoices_item0Model : jg_arinvoices_item0ModelList) { jg_arinvoices_item0Model.setAttachMent(generaterSwapUtil.getFileNameInJson(jg_arinvoices_item0Model.getAttachMent())); } - vo.setArinvoices_item0soitemList(jg_arinvoices_item0ModelList); } + vo.setArinvoices_item0soitemList(jg_arinvoices_item0ModelList); QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.lambda().eq(Collection_item0Entity::getSalesorderId,id); List collection_item0Entity = collection_item0Service.list(queryWrapper1); @@ -740,11 +742,11 @@ public class SaleorderitemController { List jg_collectionList = saleorderitemService.GetCollectionsoitemList(collection_item0Entity1.getCollectionId()); collectionsoitemEntityList.addAll(jg_collectionList); } - List jg_collectionModelList = JsonUtil.getJsonToList(collectionsoitemEntityList, CollectionsoitemModel.class); - for (CollectionsoitemModel jg_collectionModel : jg_collectionModelList) { - } - vo.setCollectionsoitemList(jg_collectionModelList); } + List jg_collectionModelList = JsonUtil.getJsonToList(collectionsoitemEntityList, CollectionsoitemModel.class); + for (CollectionsoitemModel jg_collectionModel : jg_collectionModelList) { + } + 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){ diff --git a/SC-web/src/views/scm/basicInformation/saleorder/Detail.vue b/SC-web/src/views/scm/basicInformation/saleorder/Detail.vue index 469feed5..9559df3c 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/Detail.vue @@ -2,7 +2,7 @@ + width="1500px">