From b3faaf50f4ebff876d5a79c8e402e02bc5bf7843 Mon Sep 17 00:00:00 2001
From: "gragon.xu" <gragon.xu@estsh.com>
Date: Mon, 19 Nov 2018 17:08:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BA=A4=E6=98=93=E5=89=8D?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BB=A5=E5=8F=8A(11=E6=9C=8819=E6=97=A5)?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E5=B0=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java   | 18 ++++++------------
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java |  2 ++
 .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java   |  2 +-
 3 files changed, 9 insertions(+), 13 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 f684e42..ce312a7 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
@@ -703,19 +703,17 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PART_ABC {
-        A(1, "A", "正常"),
-        B(2, "B", "正常"),
-        C(3, "C", "取消"),
-        D(4, "D", "取消"),
-        E(5, "E", "取消");
+        A(1, "A"),
+        B(2, "B"),
+        C(3, "C"),
+        D(4, "D"),
+        E(5, "E");
 
         private int value;
-        private String code;
         private String description;
 
-        PART_ABC(int value, String code, String description) {
+        PART_ABC(int value, String description) {
             this.value = value;
-            this.code = code;
             this.description = description;
         }
 
@@ -727,10 +725,6 @@ 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++) {
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index 01d0144..2ab56fe 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -118,6 +119,7 @@ public class WmsStockSn extends BaseBean {
 
     @Column(name = "PDATE")
     @ApiParam(value = "打印时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date pdate;
     /**
      * 1=ASN,10=PO,20=SO
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 292eb7b..09f0130 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
@@ -823,7 +823,7 @@ public class WmsHqlPack {
     public static String packWmsTransSn(String tranNo) {
         StringBuffer result = new StringBuffer();
         //查询参数封装
-        HqlPack.getStringEqualPack(tranNo, "tranNo", result);
+        HqlPack.getStringEqualPack(tranNo, "transNo", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         return result.toString();
     }