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

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

@@ -670,6 +670,40 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 作业组件参数：组件执行方法名称
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MODULE_METHOD_NAME {
+        EXECUTE("execute", "执行方法"),
+        GETOPTIONS("getOptions", "流程初始化方法"),
+        PROMPT("prompt", "初始化方法"),
+        GETLIST("getList", "获取列表数据"),
+        DOCOMPLETE("doComplete", "执行完成方法"),
+        SHOWINFORMATION("showInformation", "回显方法"),
+        INSTALL("install", "安装组件"),
+        UNINSTALL("unInstall", "卸载组件");
+        private String value;
+        private String description;
+
+        MODULE_METHOD_NAME(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+
 
     /**
      * 作业任务状态、移库单条码操作状态
@@ -1456,6 +1490,16 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static COMPONENT_TYPE switchGetValue(int val) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
     }
 
     /**

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

@@ -49,33 +49,33 @@ public class WmsActionGroup extends BaseBean {
     @ApiParam(value = "初始化组件编号", example = "0")
     private Long initAmId;
 
-    @Transient
-    @ApiParam(value = "初始化组件名称")
-    private String initAmName;
+//    @Transient
+//    @ApiParam(value = "初始化组件名称")
+//    private String initAmName;
 
     @Column(name = "DETAILS_AM_ID")
     @ApiParam(value = "明细处理组件编号", example = "0")
     private Long detailsAmId;
 
-    @Transient
-    @ApiParam(value = "明细处理组件名称")
-    private String detailsAmName;
+//    @Transient
+//    @ApiParam(value = "明细处理组件名称")
+//    private String detailsAmName;
 
     @Column(name = "SUBMIT_AM_ID")
     @ApiParam(value = "提交组件编号", example = "0")
     private Long submitAmId;
 
-    @Transient
-    @ApiParam(value = "提交组件名称")
-    private String submitAmName;
+//    @Transient
+//    @ApiParam(value = "提交组件名称")
+//    private String submitAmName;
 
     @Column(name = "END_AM_ID")
     @ApiParam(value = "结束组件编号", example = "0")
     private Long endAmId;
-
-    @Transient
-    @ApiParam(value = "结束组件名称")
-    private String endAmName;
+//
+//    @Transient
+//    @ApiParam(value = "结束组件名称")
+//    private String endAmName;
 
     // 1=true, 2 = false
     @Column(name = "AUTO_INIT")
@@ -108,20 +108,4 @@ public class WmsActionGroup extends BaseBean {
 
     public WmsActionGroup() {
     }
-
-    public WmsActionGroup(String agNameE, String agDescE, String agNameC, String agDescC, Integer autoInit, Long initAmId, String initAmName, Long detailsAmId, String detailsAmName, Long submitAmId, String submitAmName, Long endAmId, String endAmName) {
-        this.agNameE = agNameE;
-        this.agDescE = agDescE;
-        this.agNameC = agNameC;
-        this.agDescC = agDescC;
-        this.autoInit = autoInit;
-        this.initAmId = initAmId;
-        this.initAmName = initAmName;
-        this.detailsAmId = detailsAmId;
-        this.detailsAmName = detailsAmName;
-        this.submitAmId = submitAmId;
-        this.submitAmName = submitAmName;
-        this.endAmId = endAmId;
-        this.endAmName = endAmName;
-    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1139,7 +1139,8 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result);
+        DdlPreparedPack.getStringLikerPack(wmsActionStepType.getAtNameC(), "atNameC", result);
+        DdlPreparedPack.getStringLikerPack(wmsActionStepType.getFunCallName(), "funCallName", result);
 
         getStringBuilderPack(wmsActionStepType, result);
 
@@ -1192,7 +1193,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result);
-        DdlPreparedPack.getNumEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result);
 
         getStringBuilderPack(wmsActionModule, result);