From 05c56e46b4dfa857a89ead927f1a8a59d56aa82b Mon Sep 17 00:00:00 2001
From: "sky.meng" <sky.meng@estsh.com>
Date: Wed, 26 Jun 2019 16:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 26 ++++++++++++++++++++++
 .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java     | 19 ++++++++++++++++
 .../pojo/wms/modelbean/WmsPoAsnRecvModel.java      |  2 +-
 3 files changed, 46 insertions(+), 1 deletion(-)

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 caf74ae..af67eec 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
@@ -2638,4 +2638,30 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 包装类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOCK_LEVEL_STATUS {
+        LOW("LOW", "低于最低库存"),
+        HIGH("HIGH", "高于最高库存"),
+        NORMAL("NORMAL", "安全库存");
+
+        private String code;
+        private String description;
+
+        STOCK_LEVEL_STATUS(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
index 5335318..110155d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :物料实体
@@ -126,4 +127,22 @@ public class WmsPart extends BaseBean {
     @Column(name="OUT_CLOSE_FLAG")
     @ApiParam("項目结算标识")
     private String outCloseFlag;
+
+    @Transient
+    @ApiParam("总数量")
+    private Double qty;
+
+    @Transient
+    @ApiParam("库存水平")
+    private String stockLevelStatus;
+
+    public WmsPart(){}
+
+    public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty){
+        this.partNo = partNo;
+        this.partName = partName;
+        this.max = maxQty;
+        this.min = minQty;
+        this.qty = cqty;
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java
index e380985..0c43dd0 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java
@@ -69,7 +69,7 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable<WmsPoAsnRe
 
     @Override
     public int compareTo(WmsPoAsnRecvModel o) {
-        return getLocalTime(this.getPlanTime()).isAfter(getLocalTime(o.getPlanTime()))? 1 : 0;
+        return getLocalTime(this.getPlanTime()).isAfter(getLocalTime(o.getPlanTime()))? 1 : -1;
     }
 
     public static LocalTime getLocalTime(String planTime){