From ae805a659611b79d9151bc176f6b511f9269c136 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Wed, 10 Jun 2020 11:08:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/SwebEnumUtil.java    | 40 ++++++++++++++++++++++
 .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java      |  1 +
 2 files changed, 41 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java
index a493481..fd9784a 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java
@@ -700,4 +700,44 @@ public class SwebEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 条码类型 10=实物条码，20=虚拟条码
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_STOCK_TYPE {
+        SOURCE(10, "实物条码"),
+        TARGET(20, "虚拟条码"),
+        CUST_SN(30, "客户条码");
+
+        private int value;
+        private String description;
+
+        ORDER_STOCK_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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
index f510f8e..459a7e8 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
@@ -179,6 +179,7 @@ public class SwebHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(master, result);
     }