From 15a259c8b2485ebd073c60ed710842575c247834 Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Sat, 12 Sep 2020 14:51:51 +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

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java  | 16 ++++++++++++++++
 .../i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java     |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
index eb834de..942dfca 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
@@ -195,6 +195,11 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam(value = "部门名称", example = "1")
     public Integer departName;
 
+    @Transient
+    @ApiParam("周总数")
+    private Integer weekRcCount;
+
+
     public WmsPOMaster() {
 
     }
@@ -219,6 +224,17 @@ public class WmsPOMaster extends BaseBean {
         this.planTime = planTime;
     }
 
+    public WmsPOMaster(String orderNo, Integer poStatus, String vendorNo, String vendorName,
+                       String dockCode, String planDate, String planTime) {
+        this.orderNo = orderNo;
+        this.poStatus = poStatus;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.dock = dockCode;
+        this.planDate = planDate;
+        this.planTime = planTime;
+    }
+
     public int getPoStatusVal() {
         return this.poStatus == null ? 0 : this.poStatus;
     }
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 4f21a95..387aba1 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, String>> ltCurrentDayResultMap;
+    private Map<Integer, Map<String, Object>> ltCurrentDayResultMap;
 
     public WmsPoAsnRecvModel(String orderNo, String partNo, String vendorName, String dock, String prodCfgTypeName,
                              String planTime, Double transQty, Double resQty) {