From d6ec5ea2da54bbf76685bd697bc39a7170d6d814 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Fri, 8 Nov 2024 10:12:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E5=BF=97=E9=82=A6=E5=B7=A5?= =?UTF-8?q?=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 增加自提签收和复核的回传 --- .../java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java | 5 ++++- .../logpm/factorydata/zbom/enums/ZbomNodeMappingEnums.java | 4 ++++ .../logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java index 68f8b74c6..4837560a3 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java @@ -17,9 +17,12 @@ public enum NodeNeedEnums implements Serializable { UNLOAD_INCOMING_WAREHOUSE(105010,"卸车入库"), // TRANSFER_WAREHOUSE_UNLOADING(105020, "中转仓卸车确认"), TRANSFER_WAREHOUSE_DEPART(103080, "中转仓发车"), - SIGN_DIRECT_SHIPPER(105030,"直发商家签收"), END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"), + + SIGN_DIRECT_SHIPPER(105030,"直发商家签收"), DISTRIBUTION_SIGN_FOR(302060, "配送签收"), + SIGN_BILLOFLADING(301080, "自提签收"), + SIGN_BILLOFLADING_REVIEW(301090, "自提复核"), SIGN_TRIPARTITE_TRANSFER_DEPART(104040, "三方中转签收"), CLERK_REVIEW(303010, "文员复核"); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/ZbomNodeMappingEnums.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/ZbomNodeMappingEnums.java index d8ef82f11..3d811473b 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/ZbomNodeMappingEnums.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/ZbomNodeMappingEnums.java @@ -50,9 +50,13 @@ public enum ZbomNodeMappingEnums { DISTRIBUTION_SIGN_FOR(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.DISTRIBUTION_SIGN_FOR, 1), SIGN_FOR_DIRECT_SHIPPER(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_DIRECT_SHIPPER, 1), SIGN_FOR_TRIPARTITE_TRANSFER_DEPART(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_TRIPARTITE_TRANSFER_DEPART, 1), + SIGN_BILLOFLADING(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_BILLOFLADING, 1), + SIGN_BILLOFLADING_REVIEW(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_BILLOFLADING_REVIEW, 1), /** * 部分签收 -- 文员复核 */ + PARTIAL_SIGN_BILLOFLADING(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_BILLOFLADING, 2), + PARTIAL_SIGN_BILLOFLADING_REVIEW(ZbomNodeEnums.SIGN_FOR, WorkNodeEnums.SIGN_BILLOFLADING_REVIEW, 2), PARTIAL_RECEIPT(ZbomNodeEnums.PARTIAL_RECEIPT, WorkNodeEnums.CLERK_REVIEW, 2), PARTIAL_DISTRIBUTION_SIGN_FOR(ZbomNodeEnums.PARTIAL_RECEIPT, WorkNodeEnums.DISTRIBUTION_SIGN_FOR, 2), PARTIAL_RECEIPT_DIRECT_SHIPPER(ZbomNodeEnums.PARTIAL_RECEIPT, WorkNodeEnums.SIGN_DIRECT_SHIPPER, 2), 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 ed671f71f..b3d17eb06 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 @@ -144,7 +144,8 @@ public class ZbomNodeDataPushListener { } // 签收节点获取组装未签收数据 Map noSignNumberMap = null; - if (EnumUtil.equals(WorkNodeEnums.CLERK_REVIEW, node)) { + ZbomNodeEnums zbNode = ZbomNodeMappingEnums.getZbomByNodeAndStatus(workNodeEnums); + if (StrUtil.equals(ZbomNodeEnums.SIGN_FOR.getCode(), zbNode.getCode())) { noSignNumberMap = getNoSignNumber(content); } // 获取历史发送的节点数据