feat(all): 志邦工厂

1 增加自提签收和复核的回传

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, "文员复核");
 

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),

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<String, Integer> 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);
 				}
 				// 获取历史发送的节点数据