From a52b397093c9bc5a02119715974cbeca01f49f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Mon, 8 May 2023 09:42:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ReceiptinController.java | 24 +++++++++++------ .../controller/ReceiptoutController.java | 26 ++++++++++++------- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java index 5dba4b4e..f4ab2644 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java @@ -224,10 +224,18 @@ public class ReceiptinController { List list= receiptinService.getTypeList(receiptinPagination,receiptinPaginationExportModel.getDataType()); //处理id字段转名称，若无需转或者为空可删除 for(ReceiptinEntity entity:list){ - Map soucenoMap = new HashMap<>(); - entity.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","id","document_no",entity.getSouceno(),soucenoMap)); - Map supplierIdMap = new HashMap<>(); - entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("397751667988199621","id","supplier_name",entity.getSupplierId(),supplierIdMap)); + PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(entity.getSouceno()); + if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)){ + entity.setPurchaseorderSouceno(purchaseorderitemEntity.getDocumentNo()); + } + SupplierEntity supplierEntity = supplierService.getById(entity.getSupplierId()); + if (ObjectUtils.isNotEmpty(supplierEntity)){ + entity.setSupplier(supplierEntity.getSupplierName()); + } +// Map soucenoMap = new HashMap<>(); +// entity.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","id","document_no",entity.getSouceno(),soucenoMap)); +// Map supplierIdMap = new HashMap<>(); +// entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("397751667988199621","id","supplier_name",entity.getSupplierId(),supplierIdMap)); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); } List listVO=JsonUtil.getJsonToList(list,ReceiptinListVO.class); @@ -254,8 +262,8 @@ public class ReceiptinController { case "type" : entitys.add(new ExcelExportEntity("业务类型" ,"type")); break; - case "souceno" : - entitys.add(new ExcelExportEntity("来源单号" ,"souceno")); + case "purchaseorderSouceno" : + entitys.add(new ExcelExportEntity("来源单号" ,"purchaseorderSouceno")); break; case "receiptamount" : entitys.add(new ExcelExportEntity("入库金额" ,"receiptamount")); @@ -266,8 +274,8 @@ public class ReceiptinController { case "receiptnum" : entitys.add(new ExcelExportEntity("入库数量" ,"receiptnum")); break; - case "suppliername" : - entitys.add(new ExcelExportEntity("供应商名称" ,"suppliername")); + case "supplier" : + entitys.add(new ExcelExportEntity("供应商名称" ,"supplier")); break; case "supplierId" : entitys.add(new ExcelExportEntity("供应商id" ,"supplierId")); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java index c4546b91..4c9a381c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java @@ -249,12 +249,20 @@ public class ReceiptoutController { List list= receiptoutService.getTypeList(receiptoutPagination,receiptoutPaginationExportModel.getDataType()); //处理id字段转名称，若无需转或者为空可删除 for(ReceiptoutEntity entity:list){ - Map sourceNoMap = new HashMap<>(); - entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSourceNo(),sourceNoMap)); - Map customerIdMap = new HashMap<>(); - entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap)); + SaleorderitemEntity saleorderitemEntity = saleorderitemService.getById(entity.getSourceNo()); + if (ObjectUtils.isNotEmpty(saleorderitemEntity)){ + entity.setSourceOrderNo(saleorderitemEntity.getDocumentNo()); + } + CustomerEntity customerEntity = customerService.getById(entity.getCustomerId()); + if (ObjectUtils.isNotEmpty(customerEntity)){ + entity.setCustomerNm(customerEntity.getSupplierNm()); + } +// Map sourceNoMap = new HashMap<>(); +// entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSourceNo(),sourceNoMap)); +// Map customerIdMap = new HashMap<>(); +// entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap)); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); - entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName())); +// entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName())); } List listVO=JsonUtil.getJsonToList(list,ReceiptoutListVO.class); for(ReceiptoutListVO receiptoutVO:listVO){ @@ -280,8 +288,8 @@ public class ReceiptoutController { case "type" : entitys.add(new ExcelExportEntity("业务类型" ,"type")); break; - case "source" : - entitys.add(new ExcelExportEntity("来源单号" ,"source")); + case "sourceOrderNo" : + entitys.add(new ExcelExportEntity("来源单号" ,"sourceOrderNo")); break; case "amount" : entitys.add(new ExcelExportEntity("出库金额" ,"amount")); @@ -292,8 +300,8 @@ public class ReceiptoutController { case "num" : entitys.add(new ExcelExportEntity("出库数量" ,"num")); break; - case "customerName" : - entitys.add(new ExcelExportEntity("客户名称" ,"customerName")); + case "customerNm" : + entitys.add(new ExcelExportEntity("客户名称" ,"customerNm")); break; case "remark" : entitys.add(new ExcelExportEntity("备注" ,"remark"));