Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -3693,6 +3693,7 @@ public class MesPcnEnumUtil {
         WS_CMD_INIT_MODULE(10, "initModule", "actorReceiveStrategyInitService", "展示组件初始化"),
         WS_CMD_DO_SCAN(20, "doScan", "actorReceiveStrategyScanService", "执行扫描"),
         WS_CMD_DO_MODULE(30, "doModule", "actorReceiveStrategyModuleService", "展示组件执行方法"),
+        WS_CMD_DO_FUNCTION(30, "doFunction", "actorReceiveStrategyFunctionService", "展示组件业务功能方法"),
         WS_CMD_JUMP_PROCESS(40, "jumpProcess", "actorReceiveStrategyJumpProcessService", "跳过工序"),
         WS_CMD_STOP_CELL_MONITOR(50, "stopCellMonitor", "actorReceiveStrategyStopCellMonitorService", "停止执行监听组件");
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java

@@ -66,7 +66,7 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable {
     //枚举：CommonEnumUtil.DATA_SOURCE_TYPE
     @Column(name = "DATASOURCE_TYPE")
     @ApiParam(value = "数据源类型")
-    private Integer dataSourceType;
+    private String dataSourceType;
 
     @Column(name = "LAST_EXECUTION_TIME")
     @ApiParam("末次迁移时间")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java

@@ -136,6 +136,21 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("备注")
     private String remark;
 
+    @Column(name = "REASON")
+    @ApiParam("原因")
+    public String reason;
+
+    @Column(name = "DEPARTMENT")
+    @ApiParam(value = "部门")
+    private String department;
+
+    @Column(name = "RECEIVER")
+    @ApiParam("领用人")
+    private String receiver;
+
+    @Column(name = "PROD_DFG_TYPE_CODE")
+    @ApiParam("项目号")
+    private String prodCfgTypeCode;
 
     @Transient
     private List<WmsDocMovementDetails> movementDetailsList;