From 97a8a5a6ec93d60c7cb77aba40d29db8f726724a Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Thu, 10 Sep 2020 13:14:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMGN=E7=B3=BB=E5=88=97BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 15 ++++++++++++++-
 .../i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java      |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
index 9cc690d..6133593 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
@@ -11,7 +11,12 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 /**
  * @Description : PO订单明细信息
@@ -190,6 +195,14 @@ public class WmsPOMasterDetails extends BaseBean {
     private String planEndDate;
 
 
+    /**
+     * 状态:1=新建,10=收货中,20=收货完成,
+     * 30=入库中,40=入库完成,90=已关闭,91=已取消
+     */
+    @Transient
+    @ApiParam(value = "状态", example = "1")
+    public Integer poStatus;
+
     public Double getSnpVal() {
         return snp;
     }
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 9e7ed23..4f21a95 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
@@ -54,7 +54,7 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable<WmsPoAsnRe
     private Map<String, Map<Integer, WmsPOMaster>> gteCurrentDayResultMap;
 
     @ApiParam("小于今天的结果集")
-    private Map<Integer, Map<String, Integer>> ltCurrentDayResultMap;
+    private Map<Integer, Map<String, String>> ltCurrentDayResultMap;
 
     public WmsPoAsnRecvModel(String orderNo, String partNo, String vendorName, String dock, String prodCfgTypeName,
                              String planTime, Double transQty, Double resQty) {