From 029dc49b9bd1940a3cda97c95ecfb5ecd02f533d Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Mon, 8 Apr 2024 19:03:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(service):=20=E4=BF=AE=E6=94=B9=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=BF=97=E9=82=A6=E7=AD=BE=E6=94=B6=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zbom/mq/ZbomNodeDataPushListener.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java index 1cca7706b..90391c557 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java @@ -77,6 +77,7 @@ public class ZbomNodeDataPushListener { } } } + // 构建参数对象 List nodeConfirmParams = initParam(msgEntries, packageCodeList); try { @@ -107,8 +108,12 @@ public class ZbomNodeDataPushListener { .build(); // 推送成功 nodePushService.save(pushEntity); - // 修改订单包件表的签收状态 - orderPackageService.updateSignForStatus(packageCodeList); + String node = msgEntries.getStr("node"); + NodeEnums nodeEnums = EnumUtil.fromString(NodeEnums.class, node); + if (ObjectUtil.equal(nodeEnums, NodeEnums.CLERK_REVIEW)) { + // 修改订单包件表的签收状态 + orderPackageService.updateSignForStatus(packageCodeList); + } } } } @@ -145,7 +150,7 @@ public class ZbomNodeDataPushListener { order.setAddress(entries.getStr("address")); // 如果是签收节点，需要判断是否为全部签收和部分签收 if (EnumUtil.equals(NodeEnums.CLERK_REVIEW, node)) { - Integer signNumber = Convert.toInt(order.getRejectQty()); + Integer signNumber = Convert.toInt(order.getSignQty()); // 查询当前未签收的数量与当前签收数量比较，如果未签收数较大，则是部分签收 String key = order.getDepartCode() + order.getPlatformOrderCode(); // 部分签收 @@ -159,6 +164,7 @@ public class ZbomNodeDataPushListener { } } else { order.setRejectQty(""); + order.setSignQty(""); order.setNode(ZbomNodeMappingEnums.getZbomByNodeAndStatus(nodeEnums).getCode()); } } From fe5fd299a52a0b2220e5df3959f6811375e9cf97 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 8 Apr 2024 19:03:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E9=99=90=E5=88=B6BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 1 + .../service/impl/DistributionReservationServiceImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 74f936671..50be235e2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -3322,6 +3322,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl