From 1b71d4082210688d3979c16c7a0ae8651b584c04 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Mon, 8 Apr 2024 19:27:44 +0800 Subject: [PATCH] =?UTF-8?q?fix(service)=EF=BC=9A=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E7=AD=BE=E6=94=B6=E9=87=8D=E5=A4=8D=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 90391c557..bb29aef4b 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 @@ -137,6 +137,7 @@ public class ZbomNodeDataPushListener { List orders = orderPackageService.findOrderCodebypackageCodes(packageCodeList); // 根据运单号和自编码分组查询出未签收的数量 List noSignNumberDTOS = orderPackageService.findNoSignNumber(packageCodeList); + log.info("未签收数据：{}", JSONUtil.toJsonStr(noSignNumberDTOS)); Map noSignNumberMap = new HashMap<>(); if (CollUtil.isNotEmpty(noSignNumberDTOS)) { for (NoSignNumberDTO noSignNumberDTO : noSignNumberDTOS) { @@ -150,17 +151,20 @@ public class ZbomNodeDataPushListener { order.setAddress(entries.getStr("address")); // 如果是签收节点，需要判断是否为全部签收和部分签收 if (EnumUtil.equals(NodeEnums.CLERK_REVIEW, node)) { + log.info("key：{}，签收数量：{}", order.getDepartCode() + "_" + order.getPlatformOrderCode(), order.getSignQty()); Integer signNumber = Convert.toInt(order.getSignQty()); // 查询当前未签收的数量与当前签收数量比较，如果未签收数较大，则是部分签收 String key = order.getDepartCode() + order.getPlatformOrderCode(); // 部分签收 order.setNode(ZbomNodeMappingEnums.getZbomByNodeAndStatus(nodeEnums, ZbomConstants.Status.SIGN_FOR_SECTION_STATUS).getCode()); - if (noSignNumberMap.containsKey(key)) { + if (ObjectUtil.isNotEmpty(noSignNumberMap) && noSignNumberMap.containsKey(key)) { Integer noSignNum = noSignNumberMap.get(key); if (noSignNum <= signNumber) { // 全部签收 order.setNode(ZbomNodeMappingEnums.getZbomByNodeAndStatus(nodeEnums, ZbomConstants.Status.SIGN_FOR_ALL_STATUS).getCode()); } + } else { + continue; } } else { order.setRejectQty("");