From 88754f9a71efb17ab05bbec8d1959270e76264c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= <gragon.xu@estsh.com>
Date: Wed, 16 Oct 2019 21:52:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=9C=8B=E6=9D=BF=E9=87=8D?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/wms/modelbean/WmsPoAsnRecvModel.java      | 35 ++++++++++------------
 1 file changed, 15 insertions(+), 20 deletions(-)

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 0c43dd0..536f46c 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
@@ -16,7 +16,7 @@ import java.time.LocalTime;
  **/
 @Data
 @Api("供应商收货看板")
-public class WmsPoAsnRecvModel extends BaseBean implements Comparable<WmsPoAsnRecvModel>{
+public class WmsPoAsnRecvModel extends BaseBean implements Comparable<WmsPoAsnRecvModel> {
 
     @ApiParam("订单号")
     private String orderNo;
@@ -33,9 +33,9 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable<WmsPoAsnRe
     @ApiParam("计划收货时间")
     private String planTime;
     @ApiParam("总数量")
-    private Double qty;
+    private Double transQty;
     @ApiParam("已收货数量")
-    private Double recQty;
+    private Double resQty;
     @ApiParam("最早收货时间")
     private String earliestReceTime;
     @ApiParam("最晚收货时间")
@@ -47,36 +47,31 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable<WmsPoAsnRe
     @ApiParam("收货状态")
     private String receiveStatus;
 
-    public WmsPoAsnRecvModel(String orderNo,String dock,String vendorNo,String prodCfgTypeCode, String prodCfgTypeName,String planDate,String planTime,Double qty,Double recQty){
+    public WmsPoAsnRecvModel(String orderNo, String partNo, String vendorName, String dock, String prodCfgTypeName,
+                             String planTime, Double transQty, Double resQty) {
         this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.vendorName = vendorName;
         this.dock = dock;
-        this.planDate = planDate;
-        this.planTime = planTime;
-        this.qty = qty;
-        this.recQty = recQty;
-        this.prodCfgTypeCode = prodCfgTypeCode;
         this.prodCfgTypeName = prodCfgTypeName;
-        this.vendorNo = vendorNo;
-
-    }
-    public WmsPoAsnRecvModel(String orderNo,String dock,String planDate,String planTime){
-        this.orderNo = orderNo;
-        this.dock = dock;
-        this.planDate = planDate;
         this.planTime = planTime;
+        this.transQty = transQty;
+        this.resQty = resQty;
+    }
+
+    public WmsPoAsnRecvModel() {
     }
-    public WmsPoAsnRecvModel(){}
 
     @Override
     public int compareTo(WmsPoAsnRecvModel o) {
-        return getLocalTime(this.getPlanTime()).isAfter(getLocalTime(o.getPlanTime()))? 1 : -1;
+        return getLocalTime(this.getPlanTime()).isAfter(getLocalTime(o.getPlanTime())) ? 1 : -1;
     }
 
-    public static LocalTime getLocalTime(String planTime){
+    public static LocalTime getLocalTime(String planTime) {
         LocalTime time = null;
         try {
             time = LocalTime.parse(planTime);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return time;