From 85bef770fc6ddb7c4b2312fdb5e524c20d6e9c50 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 18 Nov 2022 16:32:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=9B=98=E7=82=B9=E8=BD=AC?= =?UTF-8?q?=E5=8D=95=E4=BA=A7=E5=93=81=E6=95=B0=E9=87=8F=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/admin/service/inventory/InvCountCodesService.java | 2 ++ .../service/inventory/impl/InvCountCodesServiceImpl.java | 1 + .../service/inventory/impl/InvCountOrderServiceImpl.java | 8 ++++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountCodesService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountCodesService.java index 04350ec8..d8e5dbbf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountCodesService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountCodesService.java @@ -42,4 +42,6 @@ public interface InvCountCodesService { * @return */ Long getCountOrderCodesNum(String orderIdFk); + + int getActCount(String nameCode); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountCodesServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountCodesServiceImpl.java index 410e6dc8..a293795e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountCodesServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountCodesServiceImpl.java @@ -104,6 +104,7 @@ public class InvCountCodesServiceImpl implements InvCountCodesService { return invCountCodesDao.countByOrderId(orderIdFk); } + @Override public int getActCount(String nameCode) { FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); filterUdiInfoRequest.setNameCode(nameCode); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java index 1c4edc94..690e0e2b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java @@ -273,6 +273,9 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { codesList.forEach(invCountCodes -> { if (invCountCodes.getProductId().equals(productId) && !verifyCodeExist(outOrderCodes, invCountCodes.getCode())) { WarehouseEntity warehouseEntity = buildWarehouse(invCountOrder, invCountCodes.getCode(), invCountCodes.getProductId()); + int count = invCountCodesService.getActCount(warehouseEntity.getNameCode()); + warehouseEntity.setCount(count); + warehouseEntity.setReCount(count); inOrderCodes.add(warehouseEntity); } }); @@ -282,6 +285,9 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { invProductDetailEntities.forEach(invProductDetailEntity -> { if (!countCodes.contains(invProductDetailEntity.getOriginCode()) && !verifyCodeExist(outOrderCodes, invProductDetailEntity.getCode())) { WarehouseEntity warehouseEntity = buildWarehouse(invCountOrder, invProductDetailEntity.getCode(), invProductDetailEntity.getProductIdFk()); + int count = invCountCodesService.getActCount(warehouseEntity.getNameCode()); + warehouseEntity.setCount(count); + warehouseEntity.setReCount(count); outOrderCodes.add(warehouseEntity); } }); @@ -366,8 +372,6 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { warehouseEntity.setExpireDate(udi.getExpireDate()); warehouseEntity.setSerialNo(udi.getSerialNo()); warehouseEntity.setNameCode(udi.getUdi()); - warehouseEntity.setCount(1); - warehouseEntity.setReCount(1); return warehouseEntity; }