From 3b3ddd581a6de2201e7f6a2eb591bdd8621b6dc1 Mon Sep 17 00:00:00 2001
From: wangjie <jhforever.wang@estsh.com>
Date: Fri, 23 Aug 2019 17:58:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?mest=E6=9D=A1=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=9C=80=E5=A4=A7=E5=80=BC=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index e140fef..3dbbb91 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -12,6 +12,42 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * mes条码生成规则最大值后是否循环
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum NUMBER_RULE_ISCYCLE {
+
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        NUMBER_RULE_ISCYCLE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 关键件条码规则信息绑定规则
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

From 3f5f89bd1b5dc1f84010640aadd6ca2e4b31ccd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= <gragon.xu@estsh.com>
Date: Sun, 25 Aug 2019 00:13:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?=
 =?UTF-8?q?=EF=BC=9A=E8=8E=B7=E5=8F=96ID=E7=9C=9F=E5=AE=9E=E5=80=BC?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=9A=84=E7=BB=84=E4=BB=B6=E7=BC=93=E5=AD=98=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=88=E6=89=8B=E5=B7=A5=E9=A2=86=E6=96=99=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=97=A0=E6=B3=95=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
index 319e6d5..1ea54c2 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
@@ -75,15 +75,15 @@ public class WmsActionGroup extends BaseBean {
     private Integer submitStepSeq;
 
     public long getInitAmIdVal() {
-        return this.initAmId == null ? 0 : this.initAmId.intValue();
+        return this.initAmId == null ? 0 : this.initAmId.longValue();
     }
 
     public long getDetailsAmIdVal() {
-        return this.detailsAmId == null ? 0 : this.detailsAmId.intValue();
+        return this.detailsAmId == null ? 0 : this.detailsAmId.longValue();
     }
 
     public long getEndAmIdVal() {
-        return this.endAmId == null ? 0 : this.endAmId.intValue();
+        return this.endAmId == null ? 0 : this.endAmId.longValue();
     }
 
     public int getAutoInitVal() {