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

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/enums/FactoryNodeEnums.java

@@ -17,11 +17,11 @@ public enum FactoryNodeEnums {
 	/**
 	 * 已交接
 	 */
-	INITIAL_WAREHOUSE_ENTRY(20, "Deliveried", 1),
+	INITIAL_WAREHOUSE_ENTRY(101020, "Deliveried", 1),
 	/**
 	 * 收货完成
 	 */
-	END_WAREHOUSE_UNLOADING(170, "Received", 1);
+	END_WAREHOUSE_UNLOADING(105040, "Received", 1);
 
 	private Integer code;
 	private String text;

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

@@ -16,11 +16,11 @@ public enum NodeNeedEnums implements Serializable {
 	/**
 	 * 始发仓入库
 	 */
-	INITIAL_WAREHOUSE_ENTRY(20, "始发仓入库"),
+	INITIAL_WAREHOUSE_ENTRY(101020, "始发仓入库"),
 	/**
 	 * 末端仓卸车确认
 	 */
-	END_WAREHOUSE_UNLOADING(170, "末端仓卸车确认"),
+	END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"),
 	;
 
 	private Integer code;