From 2a87b0e3683335d77316007d729ffa98adbe274f Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sun, 8 Jan 2023 17:05:06 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/thrsys/ThrProductsAddController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java index 8f52228..3a4d9d2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java @@ -90,9 +90,9 @@ public class ThrProductsAddController { } ThrProductsAddEntity tempEntity = thrProductsAddService.selectById(thrProductsAddEntity.getId() + ""); - if (!thrProductsService.isExit(tempEntity.getCode(), tempEntity.getThirdSysFk())) { - return ResultVOUtils.error(500, "已存在相同产品编码，无法添加！"); - } +// if (thrProductsService.isExit(tempEntity.getCode(), tempEntity.getThirdSysFk())) { +// return ResultVOUtils.error(500, "已存在相同产品编码，无法添加！"); +// } thrProductsAddService.updateThrProducts(thrProductsAddEntity); if (thrProductsAddEntity.getCheckStatus() == 2) { ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); From 70347afc3d0a6fedaa6dbc607092a75522819c18 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 9 Jan 2023 10:09:48 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/thrsys/ThrProductsAddDiController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java index 81782ac..7a32cc4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java @@ -248,7 +248,7 @@ public class ThrProductsAddDiController { } ThrProductsAddDiEntity thrProductsAddDiEntity = thrProductsAddDiService.filterThrProductsGetId(Integer.valueOf(deleteRequest.getId())); if (thrProductsAddDiEntity != null) { - if (thrProductsAddDiEntity.getStatus() != 1) { + if (thrProductsAddDiEntity.getStatus() == 2) { return ResultVOUtils.error(877, "审批状态发生改变请刷新页面重新操作！"); } } From 67a558e3cbddc5ee2afc7081aa3bec2c1effa2ef Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 9 Jan 2023 13:38:25 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/inventory/InvProductDetailDao.xml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml index 6bf7615..154da34 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml @@ -28,7 +28,7 @@ AND purchaseType = #{purchaseType} - + AND batchNo = #{batchNo} @@ -41,7 +41,7 @@ AND supId = #{supId} - AND code = #{code} + AND originCode = #{code} AND originCode = #{originCode} @@ -52,9 +52,21 @@ AND invWarehouseCode = #{invWarehouseCode} + + AND invSpaceCode = #{invSpaceCode} + AND orderIdFk = #{orderIdFk} + + AND productIdFk in + + #{item} + + + + AND updateTime #{updateTime} + From c64b69056042e3066d8eede5ae051e3c0f7bceb0 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 9 Jan 2023 17:43:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/admin/controller/inout/WareHouseController.java | 9 ++++----- .../req/inventory/FilterInvProductDetailRequest.java | 8 ++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index 449a051..2e8c85f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -35,10 +35,7 @@ import com.glxp.sale.admin.res.inout.WarehouseUserResponse; import com.glxp.sale.admin.res.inventory.InvBusUserResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.CustomerService; -import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; -import com.glxp.sale.admin.service.basic.BussinessTypeService; -import com.glxp.sale.admin.service.basic.UdiInfoService; -import com.glxp.sale.admin.service.basic.UdiRelevanceService; +import com.glxp.sale.admin.service.basic.*; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inout.*; @@ -111,6 +108,8 @@ public class WareHouseController { @Resource UdiInfoUtils udiInfoUtils; + @Resource + private CustomService customService; @@ -1098,7 +1097,7 @@ public class WareHouseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } //计算实际数量 - int reCount= udiInfoUtils.getActCount(warehouseEntity); + int reCount= customService.getActCount(warehouseEntity); warehouseEntity.setReCount(reCount); boolean b = codesTempService.update(warehouseEntity); if (warehouseEntity.getMySupId() != null) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductDetailRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductDetailRequest.java index b8d80ce..13e9603 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductDetailRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductDetailRequest.java @@ -27,9 +27,17 @@ public class FilterInvProductDetailRequest extends ListPageRequest { private String orderIdFk; + private String invStorageCode; private String invWarehouseCode; private String invSpaceCode; private List invCodes; + //更新时间 + private String updateTime; + /** + * 产品ID集合 + */ + private List productIdList; + } From a9a7313d53586c4e0afbd6c0e658771ad1ee3d31 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 9 Jan 2023 17:45:19 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/basic/CustomService.java | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/service/basic/CustomService.java diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/CustomService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/CustomService.java new file mode 100644 index 0000000..01c84b9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/CustomService.java @@ -0,0 +1,37 @@ +package com.glxp.sale.admin.service.basic; + + +import com.glxp.sale.admin.entity.inout.WarehouseEntity; +import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; +import com.glxp.sale.admin.service.basic.UdiRelevanceService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class CustomService { + + @Resource + UdiRelevanceService udiRelevanceService; + + public int getActCount(WarehouseEntity warehouseEntity) { + UdiRelevanceResponse udiInfoBean; + if (warehouseEntity.getRelId() != null) { + udiInfoBean = udiRelevanceService.selectGroupById(warehouseEntity.getRelId()); + } else + udiInfoBean = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode()); + if (udiInfoBean != null) { + if (udiInfoBean.getIsUseDy() == 1 && udiInfoBean.getDiType() != 2) { + if (udiInfoBean.getBhzxxsbzsl() == 0) + return udiInfoBean.getZxxsbzbhsydysl(); + else + return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl(); + } else { + return udiInfoBean.getBhzxxsbzsl(); + } + } + + return 1; + } + +} From 42284a0a6fa3af84af5582fcead67daecb142fde Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 10 Jan 2023 13:41:30 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mybatis/mapper/auth/CustomerInfoDao.xml | 4 ++-- .../resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml index fc7ab24..33a330c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml @@ -31,8 +31,8 @@ customer_contact.contacts,customer_contact.mobile,customer_info.userMax,customer_contact.email,customer_contact.tel,customer_info.companyName ,auth_role.`name` role FROM customer_info - INNER JOIN customer_contact on customer_info.customerId=customer_contact.customerId - INNER JOIN auth_role on customer_info.roleId = auth_role.id + left JOIN customer_contact on customer_info.customerId=customer_contact.customerId + left JOIN auth_role on customer_info.roleId = auth_role.id AND customer_info.customerName LIKE concat('%',#{customerName},'%') diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml index 36edfc7..a956569 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml @@ -40,7 +40,7 @@ AND checkStatus = #{checkStatus} - AND customerId = #{customerId} + AND thr_products_add.customerId = #{customerId} AND companyName = #{companyName}