Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/enums/NodeNeedEnums.java

@@ -13,11 +13,12 @@ import java.io.Serializable;
 @Getter
 public enum NodeNeedEnums implements Serializable {
 
-	INITIAL_WAREHOUSE_DEPART(40, "始发仓发车"),
-	TRANSFER_WAREHOUSE_UNLOADING(50, "中转仓卸车确认"),
-	TRANSFER_WAREHOUSE_DEPART(60, "中转仓发车"),
-	END_WAREHOUSE_UNLOADING(70, "末端仓卸车确认"),
-	CLERK_REVIEW(140, "文员复核");
+	INITIAL_WAREHOUSE_DEPART(60, "始发仓发车"),
+	TRANSFER_WAREHOUSE_UNLOADING(110, "中转仓卸车确认"),
+	TRANSFER_WAREHOUSE_DEPART(120, "中转仓发车"),
+	SIGN_DIRECT_SHIPPER(160,"直发商家签收"),
+	END_WAREHOUSE_UNLOADING(170, "末端仓卸车确认"),
+	CLERK_REVIEW(290, "文员复核");
 
 	private Integer code;
 	private String value;

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/resources/application-dev.yml

@@ -2,6 +2,8 @@
 server:
   port: 18910
 
+zb:
+  enable: false
 #数据源配置
 #spring:
 #  datasource: