From 23091d21fb834e1dfc802262cc3861828d4b30b9 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sun, 8 Jan 2023 11:21:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java | 1 + .../resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java index 930f69f..441202b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java @@ -28,4 +28,5 @@ public class FilterThrProductsRequest extends ListPageRequest { private Long id; private String uuid; private Integer diType; + private String companyName; } diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml index 9793385..3348083 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml @@ -96,6 +96,7 @@ p.zczbhhzbapzbh FROM thr_products_add_di tdi LEFT JOIN productinfo p ON tdi.uuid = p.uuid + LEFT JOIN company c on c.customerId=tdi.customerId AND tdi.status = #{checkStatus} @@ -124,6 +125,9 @@ AND p.diType = #{diType} + + AND c.companyName = #{companyName} + order by tdi.createTime DESC From 6cfd683086c908c6d96decf0ca0d80515fc32820 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sun, 8 Jan 2023 14:21:20 +0800 Subject: [PATCH 2/5] =?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/thrsys/ThrProductsController.java | 2 +- .../glxp/sale/admin/service/inout/impl/OrderServiceImpl.java | 4 ++-- .../main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsController.java index ccb159a..e0b9d04 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsController.java @@ -99,7 +99,7 @@ public class ThrProductsController { filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode()); } List udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); - if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 1) { return "该产品已与UDI码关联，无法删除！"; } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index 3f6b598..cdbe876 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -272,8 +272,8 @@ public class OrderServiceImpl implements OrderService { supplementOrder.setFromSubInvCode(order.getInvWarehouseCode()); //根据分库code查询总库coder InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseDao.filterGroupInvSubAndcode(order.getFromCorpId()); - supplementOrder.setLocStorageCode(invSubWarehouseEntity.getParentId()); - supplementOrder.setInvStorageCode(invSubWarehouseEntity.getParentId()); + supplementOrder.setLocStorageCode(invSubWarehouseEntity.getParentId()); + supplementOrder.setInvStorageCode(invSubWarehouseEntity.getParentId()); String name = invWarehouseDao.getNameByCode(order.getInvStorageCode()); if (StrUtil.isNotEmpty(order.getFromSubInvCode())) { diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 09f857b..131a653 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -50,7 +50,7 @@ AND nameCode LIKE concat(#{nameCode},'%') - AND thirdId LIKE concat(#{thirdId},'%') + AND thirdId LIKE #{thirdId} AND basic_udirel.uuid = #{uuid} From 9ea955d9a26e9d8e6b22add443916f0fc1df83e8 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sun, 8 Jan 2023 15:14:37 +0800 Subject: [PATCH 3/5] =?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 | 4 ---- 1 file changed, 4 deletions(-) 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 1ba7ce6..81782ac 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 @@ -90,10 +90,6 @@ public class ThrProductsAddDiController { FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); filterUdiInfoRequest.setNameCode(filterThrProductsRequest.getCode()); List temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); - if (temps != null && temps.size() > 0) { - filterThrProductsRequest.setUuid(temps.get(0).getUuid()); - filterUdiInfoRequest.setNameCode(null); - } } filterThrProductsRequest.setDiType(1); List thrProductsAddDiResponses = thrProductsAddDiService.filterThrProductsList(filterThrProductsRequest); From 30fec4bd16e01a1fd0fc846e67ce781c716b6443 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sun, 8 Jan 2023 15:53:05 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml | 4 ++++ 1 file changed, 4 insertions(+) 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 22eac00..36edfc7 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml @@ -7,6 +7,7 @@ resultType="com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity"> SELECT thr_products_add.*,basic_corp.name corpName FROM thr_products_add left join basic_corp on thr_products_add.customerId = basic_corp.erpId + left join company on company.customerid=thr_products_add.customerid AND thr_products_add.name LIKE concat('%',#{name},'%') @@ -41,6 +42,9 @@ AND customerId = #{customerId} + + AND companyName = #{companyName} + group by thr_products_add.id From f264d8cc471608d064b32c19e1f1763ea77e35cf Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sun, 8 Jan 2023 16:36:22 +0800 Subject: [PATCH 5/5] =?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/thrsys/ThrProductsAddController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0ee08fb..8f52228 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,7 +90,7 @@ public class ThrProductsAddController { } ThrProductsAddEntity tempEntity = thrProductsAddService.selectById(thrProductsAddEntity.getId() + ""); - if (thrProductsService.isExit(tempEntity.getCode(), tempEntity.getThirdSysFk())) { + if (!thrProductsService.isExit(tempEntity.getCode(), tempEntity.getThirdSysFk())) { return ResultVOUtils.error(500, "已存在相同产品编码，无法添加！"); } thrProductsAddService.updateThrProducts(thrProductsAddEntity);