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

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

@@ -1399,4 +1399,41 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     *作业流程动作类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTION_GROUP_DETAILS_VALUE_TYPE {
+        ONETIMEONLY(10, "只输入一次"),
+        MANYTIME(20, "输入多次"),
+        MAYTIMEUNIQUE(30, "输入多次不允许重复"),
+        ACTIONFINISH(40, "本流程结束");
+
+        private int value;
+        private String description;
+
+        ACTION_GROUP_DETAILS_VALUE_TYPE(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/sqlpack/WmsHqlPack.java

@@ -1002,6 +1002,7 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result);
 
         getStringBuilderPack(wmsActionStepCall, result);
+        HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result);
 
         return result.toString();
     }