From 20fe5d4c7385f2adadf270a8827f583e8c9780cc Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 10 Apr 2024 10:57:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=20=E4=BF=AE=E5=A4=8D=E6=89=98?= =?UTF-8?q?=E7=9B=98=E6=9F=A5=E8=AF=A2=E5=A4=9A=E4=B8=AA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml index 8d52f9f84..8c43cef07 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml @@ -64,7 +64,7 @@ lwtt.tray_type FROM logpm_warehouse_tray AS tray - left join logpm_warehouse_tray_type lwtt on tray.id = lwtt.tray_id + left join logpm_warehouse_tray_type lwtt on tray.id = lwtt.tray_id and lwtt.is_deleted=0 INNER JOIN logpm_warehouse_warehouse AS warehouse ON tray.warehouse_id = warehouse.id tray.is_deleted = '0' From f4d2e8ad519d96982248a4b1a14adaeee526ae20 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Wed, 10 Apr 2024 12:08:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(all):=20=E4=BF=AE=E6=94=B9=E5=BF=97?= =?UTF-8?q?=E9=82=A6=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factorydata/zbom/mq/ZbomNodeDataPushListener.java | 7 ++++--- .../report/controller/ReportBillLoadingController.java | 4 ++-- 2 files changed, 6 insertions(+), 5 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 1deed9c08..01d36c6b0 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 @@ -213,6 +213,9 @@ public class ZbomNodeDataPushListener { paramDTO.setNode(zbNode.getCode()); ZbFactoryNodeOrderEntity nodeOrderEntity = nodeOrderMap.get(departCode + platformOrderCode); ZbomNodeEnums currentNode = zbNode; + if (ObjectUtil.isEmpty(nodeOrderEntity)) { + nodeOrderEntity = new ZbFactoryNodeOrderEntity(); + } // 如果是签收节点，需要判断是否为全部签收和部分签收 if (EnumUtil.equals(NodeEnums.CLERK_REVIEW, node)) { // 签收节点设置签收数量 @@ -221,9 +224,7 @@ public class ZbomNodeDataPushListener { // 签收环节上一个节点是在途，说明缺少一个送货抵达,需要补一个节点 if (ObjectUtil.isEmpty(nodeOrderEntity) || ObjectUtil.equal(nodeOrderEntity.getCurrentNode(), ZbomNodeEnums.INTRANSIT.getIndex())) { - if (ObjectUtil.isEmpty(nodeOrderEntity)) { - nodeOrderEntity = new ZbFactoryNodeOrderEntity(); - } + // 第一次签收，节点改为送货抵达 paramDTO.setNode(ZbomNodeEnums.DELIVERY_ARRIVAL.getCode()); currentNode = ZbomNodeEnums.DELIVERY_ARRIVAL; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java index 9fd6ff0e9..e8a5db74d 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java @@ -52,8 +52,8 @@ public class ReportBillLoadingController { .node(nodeEnums) .brand(BrandEnums.ZB) .operatorTime(new Date()) - .operator("test") - .address("test") + .operator((String) map.get("operator")) + .address((String) map.get("address")) .content((List) map.get("content")) .build(); sender.sendNodeDataByBrand(build);