From e7fa2f3abf5fe3840b9503637b9eca3898c3f902 Mon Sep 17 00:00:00 2001
From: "gragon.xu" <gragon.xu@estsh.com>
Date: Fri, 15 Mar 2019 19:52:24 +0800
Subject: [PATCH] =?UTF-8?q?NC,=E7=9B=98=E7=82=B9=E4=BA=A4=E6=98=93?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 31 ++++++++++++++++++++--
 .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  |  1 +
 2 files changed, 30 insertions(+), 2 deletions(-)

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 9571e6f..b2c4f53 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
@@ -962,13 +962,15 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SN_QUALITY_STATUS {
-        NORMAL(10, "合格"), ABNORMAL(20, "不合格"), ISOLATED(30, "隔离");
+        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离");
 
         private int value;
+        private String code;
         private String description;
 
-        SN_QUALITY_STATUS(int value, String description) {
+        SN_QUALITY_STATUS(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -980,6 +982,10 @@ public class WmsEnumUtil {
             return description;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -989,6 +995,26 @@ public class WmsEnumUtil {
             }
             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)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static SN_QUALITY_STATUS codeOf(Integer value) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
     }
 
     /**
@@ -1087,6 +1113,7 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
     }
 
     /**
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 9d209d1..4f5ae6b 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
@@ -872,6 +872,7 @@ public class WmsHqlPack {
 
         HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
         HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result);
+        HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result);
 
         getStringBuilderPack(wmsMoveMaster, result);