From efa5da8667859ca8a3bed9e4ec9f81a4042129b5 Mon Sep 17 00:00:00 2001
From: jimmy <1622218722@qq.com>
Date: Sat, 24 Nov 2018 20:37:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 575b828..c5a60d7 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/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();
     }

From d2d4171e1425b7dc0d1344de9d1f017af300e157 Mon Sep 17 00:00:00 2001
From: amy <962239776@qq.com>
Date: Sat, 24 Nov 2018 20:45:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index cea18b8..b05f9b6 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -1331,4 +1331,41 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     *作业流程动作类型
+     */
+    @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;
+        }
+    }
+
 }