From 53119c2fe2df2b133fa3a3ea1efb4eb6fb4a82e3 Mon Sep 17 00:00:00 2001 From: chuang <994001556@qq.com> Date: Sat, 25 Mar 2023 15:04:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A6=9C=E5=8D=95=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E5=AE=A2=E6=88=B7=E4=B8=8E=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerVOController.java | 29 +++++++++++--- .../impl/PurchaseorderitemServiceImpl.java | 10 +++-- .../controller/SupplierController.java | 39 ++++++++++++++++--- .../service/impl/SupplierServiceImpl.java | 3 -- 4 files changed, 63 insertions(+), 18 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/customer/controller/CustomerVOController.java b/SC-boot/linkage-scm/src/main/java/jnpf/customer/controller/CustomerVOController.java index c62e0bf7..b780371d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/customer/controller/CustomerVOController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/customer/controller/CustomerVOController.java @@ -64,6 +64,9 @@ public class CustomerVOController { @Autowired private CustomerService customerService; + @Autowired + private RedisUtil redisUtil; + @@ -79,14 +82,30 @@ public class CustomerVOController { //处理id字段转名称，若无需转或者为空可删除 for(CustomerMobileEntity entity:list){ Map orgIdMap = new HashMap<>(); - entity.setOrgId(generaterSwapUtil.getPopupSelectValue("394016341591396805","F_Id","F_FullName",entity.getOrgId(),orgIdMap)); + String orgIdKey = "394016341591396805" + "F_Id" + "F_FullName"+entity.getOrgId()+orgIdMap; + String orgId =null; + if (orgIdKey!=null&&!redisUtil.exists(orgIdKey)) { + orgId = generaterSwapUtil.getPopupSelectValue("394016341591396805","F_Id","F_FullName",entity.getOrgId(),orgIdMap); + redisUtil.insert(orgIdKey, orgId,86000); + } else { + orgId = String.valueOf(redisUtil.getString(orgIdKey)); + } + entity.setOrgId(orgId); + String provinceKey = entity.getProvince(); + String province=null; + if (provinceKey!=null){ + if (!redisUtil.exists(provinceKey)) { + province = generaterSwapUtil.provinceData(entity.getProvince()); + redisUtil.insert(provinceKey, province,86000); + } else { + province = String.valueOf(redisUtil.getString(provinceKey)); + } + entity.setProvince(province); + }else { entity.setProvince(generaterSwapUtil.provinceData(entity.getProvince())); + } } List listVO=JsonUtil.getJsonToList(list,CustomerListVO.class); - for(CustomerListVO customerVO:listVO){ - } - - PageListVO vo=new PageListVO(); vo.setList(listVO); PaginationVO page=JsonUtil.getJsonToBean(customerPagination,PaginationVO.class); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java index c6daf963..ba4aa10f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java @@ -35,7 +35,6 @@ import jnpf.permission.service.AuthorizeService; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.mapper.PoundlistMapper; import jnpf.poundlist.service.PoundlistService; -import jnpf.purchaseback.entity.PurchasebackEntity; import jnpf.purchaseorder.entity.*; import jnpf.purchaseorder.mapper.Purchaseorder_item0Mapper; import jnpf.purchaseorder.mapper.PurchaseorderitemMapper; @@ -1459,8 +1458,10 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl 0) { model.setPurchaseId(contractMEntities.get(0).getId()); -// 客户id - model.setCustomerId(contractMEntities.get(0).getCode()); +// 供应商id + + + model.setSupplierId(contractMEntities.get(0).getCode()); } else { model.setCauseError("采购合同不存在！请添加采购合同后尝试添加！"); errList.add(model); @@ -1493,7 +1494,8 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl 0) { model.setSalesId(contractMEntities.get(0).getId()); - model.setSupplierId(contractMEntities.get(0).getCode()); +// 客户 + model.setCustomerId(contractMEntities.get(0).getCode()); } else { model.setCauseError("销售合同不存在！请添加销售合同后尝试添加！"); errList.add(model); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/controller/SupplierController.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/controller/SupplierController.java index 9558bcb7..90c5e962 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/controller/SupplierController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/controller/SupplierController.java @@ -64,6 +64,9 @@ public class SupplierController { @Autowired private SupplierService supplierService; + @Autowired + private RedisUtil redisUtil; + @@ -79,15 +82,39 @@ public class SupplierController { //处理id字段转名称，若无需转或者为空可删除 for(SupplierMobileEntity entity:list){ Map companyIdMap = new HashMap<>(); - entity.setCompanyId(generaterSwapUtil.getPopupSelectValue("394016341591396805","F_Id","F_FullName",entity.getCompanyId(),companyIdMap)); + String companyIdKey="394016341591396805"+"F_Id"+"F_FullName"+entity.getCompanyId()+companyIdMap; + String companyId=null; + if (!redisUtil.exists(companyIdKey)) { + companyId = generaterSwapUtil.getPopupSelectValue("394016341591396805","F_Id","F_FullName",entity.getCompanyId(),companyIdMap); + redisUtil.insert(companyIdKey, companyId,86000); + } else { + companyId = String.valueOf(redisUtil.getString(companyIdKey)); + } + entity.setCompanyId(companyId); + String provinceId=null; + String provinceKey=entity.getProvince(); + if (provinceKey!=null){ + if (!redisUtil.exists(provinceKey)) { + provinceId = generaterSwapUtil.provinceData(entity.getProvince()); + redisUtil.insert(provinceKey, provinceId,86000); + } else { + provinceId = String.valueOf(redisUtil.getString(provinceKey)); + } + entity.setProvince(provinceId); + }else { entity.setProvince(generaterSwapUtil.provinceData(entity.getProvince())); - entity.setStatus(generaterSwapUtil.switchSelectValue(entity.getStatus() ,"1" ,"0")); + } + String statusKey=entity.getStatus() +"1" +"0"; + String statusValue=null; + if (!redisUtil.exists(statusKey)) { + statusValue = generaterSwapUtil.switchSelectValue(entity.getStatus() ,"1" ,"0"); + redisUtil.insert(statusKey, statusValue,86000); + } else { + statusValue = String.valueOf(redisUtil.getString(statusKey)); + } + entity.setStatus(statusValue); } List listVO=JsonUtil.getJsonToList(list,SupplierListVO.class); - for(SupplierListVO supplierVO:listVO){ - } - - PageListVO vo=new PageListVO(); vo.setList(listVO); PaginationVO page=JsonUtil.getJsonToBean(supplierPagination,PaginationVO.class); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java index f5a2e2d6..abe660d6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java @@ -48,7 +48,6 @@ public class SupplierServiceImpl extends ServiceImpl getList(SupplierPagination supplierPagination){ String userId=userProvider.get().getUserId(); @@ -117,8 +116,6 @@ public class SupplierServiceImpl extends ServiceImpl