Merge remote-tracking branch 'origin/master'

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

@@ -1331,4 +1331,39 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 作业记录参数状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ALD_EXECUTE_STATUS {
+        NORMAL(1, "创建"),
+        PROCESSING(10, "处理中"),
+        COMPLETED(20, "已完成");
+        private int value;
+        private String description;
+
+        ALD_EXECUTE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -49,4 +49,7 @@ public class WmsActionStepCallParam extends BaseBean {
     @ApiParam(value = "参数值")
     private String paramValue;
 
+    @ApiParam(value = "组件名称")
+    private transient String amName;
+
 }

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

@@ -1112,6 +1112,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result);
+        HqlPack.getNumEqualPack(wmsActionStepCallParam.getSeq(), "seq", result);
         getStringBuilderPack(wmsActionStepCallParam, result);
 
         return result.toString();