From 9e0f5644586f15f34d7434644015caf33f8f9f3a Mon Sep 17 00:00:00 2001 From: chuang <994001556@qq.com> Date: Sat, 25 Mar 2023 08:49:59 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BB=8A=E6=97=A5=E6=A6=9C=E5=8D=95?= =?UTF-8?q?=E6=8C=87=E6=95=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/messageCenter/MessageCenterMapper.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml index 219ef70e..b8ff10b3 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml @@ -456,16 +456,16 @@ ( SELECT count(*) poundNum, - ROUND( SUM( CASE a.unit WHEN '0' THEN a.buckle_weight WHEN '1' THEN a.buckle_weight / 1000 END ), 6 ) buckleWeightSum, - ROUND( SUM( CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ), 6 ) settlementSum, - ROUND( SUM( a.settlement * a.purchase_price ), 6 ) purchaseAmountSum, - ROUND( SUM( a.settlement * a.sales_price ), 6 ) salesAmountSum + IFNULL(ROUND( SUM( CASE a.unit WHEN '0' THEN a.buckle_weight WHEN '1' THEN a.buckle_weight / 1000 END ), 6 ),0) buckleWeightSum, + IFNULL(ROUND( SUM( CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ), 6 ),0) settlementSum, + IFNULL(ROUND( SUM( a.settlement * a.purchase_price ), 6 ),0) purchaseAmountSum, + IFNULL(ROUND( SUM( a.settlement * a.sales_price ), 6 ),0) salesAmountSum FROM jg_poundlist a WHERE a.delete_mark = '0' AND TO_DAYS( - NOW()) - TO_DAYS( a.creator_time ) = 0 + '2023-03-25') - TO_DAYS( a.creator_time ) = 0 ) aaa From 88b33ed8127b42fe0f9fa99fbb487cb7b65851af Mon Sep 17 00:00:00 2001 From: mhsnet Date: Sat, 25 Mar 2023 09:31:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=91=982=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SC-web/src/views/scm/basicInformation/natural/Form.vue | 7 +++++-- SC-web/src/views/scm/basicInformation/natural/index.vue | 4 ---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/SC-web/src/views/scm/basicInformation/natural/Form.vue b/SC-web/src/views/scm/basicInformation/natural/Form.vue index d329e21a..19a08e14 100644 --- a/SC-web/src/views/scm/basicInformation/natural/Form.vue +++ b/SC-web/src/views/scm/basicInformation/natural/Form.vue @@ -100,7 +100,7 @@ export default { bankAccount: '', bank: '', bankNo: '', - photos: null, + photos: [], creatorUserName: '', creatorTime: "", }, @@ -147,7 +147,7 @@ export default { method: 'get' }).then(res => { if (res.data.photos == null) { - res.data.photos = JSON.stringify([]); + res.data.photos = []; } this.dataInfo(res.data) this.loading = false @@ -210,6 +210,9 @@ export default { dataInfo(dataAll) { let _dataAll = dataAll _dataAll.photos = JSON.parse(_dataAll.photos) + if(_dataAll.photos == ''||_dataAll.photos == null){ + _dataAll.photos = []; + } this.dataForm = _dataAll }, }, diff --git a/SC-web/src/views/scm/basicInformation/natural/index.vue b/SC-web/src/views/scm/basicInformation/natural/index.vue index 6807328b..e280ab9a 100644 --- a/SC-web/src/views/scm/basicInformation/natural/index.vue +++ b/SC-web/src/views/scm/basicInformation/natural/index.vue @@ -170,16 +170,12 @@ export default { method: 'post', data: _query }).then(res => { - console.log(res) var _list = []; for (let i = 0; i < res.data.list.length; i++) { let _data = res.data.list[i]; - console.log(_data); - i _list.push(_data) } this.list = _list - console.log(this.list) this.total = res.data.pagination.total this.listLoading = false From 51ca023718a16b96caa92aac284cb00f3300f3d8 Mon Sep 17 00:00:00 2001 From: mhsnet Date: Sat, 25 Mar 2023 09:58:27 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/scm/basicInformation/messagecenter/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SC-web/src/views/scm/basicInformation/messagecenter/index.vue b/SC-web/src/views/scm/basicInformation/messagecenter/index.vue index 4ded594a..cd262dbf 100644 --- a/SC-web/src/views/scm/basicInformation/messagecenter/index.vue +++ b/SC-web/src/views/scm/basicInformation/messagecenter/index.vue @@ -46,8 +46,8 @@
- 新增 - +
@@ -68,14 +68,14 @@ - + From 12af56cad335cf61816f262d3167fbea0d2c15c0 Mon Sep 17 00:00:00 2001 From: 17602169347 Date: Sat, 25 Mar 2023 11:54:50 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A3=85=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/poundlist/PoundlistMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml index 8667ae0b..8506fee7 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml @@ -26,7 +26,7 @@ LEFT JOIN jg_contract d ON a.sales_id=d.id LEFT JOIN jg_receiptout_item0 e ON a.id=e.poundlist_id LEFT JOIN jg_salesorder g ON g.contract_id=d.id -WHERE a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and g.delete_mark = 0 and +WHERE a.delete_mark = 0 and a.creator_time BETWEEN #{startTime} and #{endTime} OR a.department_id =#{departmentIdS} @@ -50,7 +50,7 @@ WHERE a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete LEFT JOIN jg_supplier b ON a.supplier_id=b.id LEFT JOIN jg_customer c ON a.customer_id=c.id LEFT JOIN jg_material d ON a.material_id=d.id -WHERE a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 +WHERE a.delete_mark = 0 and a.creator_time BETWEEN #{startTime} and #{endTime} @@ -69,7 +69,7 @@ WHERE a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete LEFT JOIN jg_natural i on a.natural_id = i.id LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id LEFT JOIN jg_salesorder_item0 k on a.id = k.poundlist_id - where a.is_examine = '1' + where a.is_examine = '1' and a.delete_mark = 0 AND (b.ticketno LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{poundlistPagination.keyword},'%')) From c17da30f3953831755b2d5c7775fc9687a3d3263 Mon Sep 17 00:00:00 2001 From: mhsnet Date: Sat, 25 Mar 2023 14:32:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=8B=96=E7=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Upload/UploadImgB.vue | 175 ++++++++++++++++++ .../scm/basicInformation/vehicle/Form.vue | 33 ++-- 2 files changed, 189 insertions(+), 19 deletions(-) create mode 100644 SC-web/src/components/Generator/components/Upload/UploadImgB.vue diff --git a/SC-web/src/components/Generator/components/Upload/UploadImgB.vue b/SC-web/src/components/Generator/components/Upload/UploadImgB.vue new file mode 100644 index 00000000..c0c5c86f --- /dev/null +++ b/SC-web/src/components/Generator/components/Upload/UploadImgB.vue @@ -0,0 +1,175 @@ + + + + diff --git a/SC-web/src/views/scm/basicInformation/vehicle/Form.vue b/SC-web/src/views/scm/basicInformation/vehicle/Form.vue index 5a89afb6..0eac3524 100644 --- a/SC-web/src/views/scm/basicInformation/vehicle/Form.vue +++ b/SC-web/src/views/scm/basicInformation/vehicle/Form.vue @@ -37,31 +37,20 @@ - + + + + - - - --> + + + @@ -232,3 +221,9 @@ }, } + \ No newline at end of file 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 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A6=9C=E5=8D=95?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=AE=A2=E6=88=B7=E4=B8=8E=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=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