开发流程管家根据任务创建流程

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

@@ -2022,18 +2022,20 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATA_STATUS {
-        ENABLE(1, "启用"),
+        ENABLE(1, "启用", "fa fa-success cell-fa fa-check"),
-        DISABLE(2, "禁用"),
+        DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle"),
-        LOCKING(3, "全部");
+        LOCKING(3, "全部", "fa cell-fa fa-lock");
 
         private int value;
+        private String name;
         private String description;
 
         DATA_STATUS() {
         }
 
-        DATA_STATUS(int value, String description) {
+        DATA_STATUS(int value, String name, String description) {
             this.value = value;
+            this.name = name;
             this.description = description;
         }
 
@@ -2045,10 +2047,24 @@ public class WmsEnumUtil {
             return description;
         }
 
+        public String getName() {
+            return name;
+        }
+
+        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].getName();
+                }
+            }
+            return tmp;
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].description.equals(desc)) {
+                if (values()[i].name.equals(desc)) {
                     tmp = values()[i].value;
                 }
             }

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

@@ -56,6 +56,11 @@ public class WmsActionGroup extends BaseBean {
     @ApiParam(value = "结束组件编号", example = "0")
     private Long endAmId;
 
+    // 1=true, 2 = false
+    @Column(name="AUTO_INIT")
+    @ApiParam(value = "任务自动初始化", example = "0")
+    private Integer autoInit;
+
     public Long getInitAmId() {
         if (initAmId != null) {
             return initAmId.longValue();

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

@@ -1423,4 +1423,16 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsDataAuth, result);
         return result.toString();
     }
+
+    /**
+     * 根据条件查询任务明细信息
+     * @param taskDetails
+     * @return
+     */
+    public static String packHqlWmsTaskDetails(WmsTaskDetails taskDetails) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringEqualPack(taskDetails.getOrderNo(), "orderNo", result);
+        getStringBuilderPack(taskDetails, result);
+        return result.toString();
+    }
 }