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 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()); } }