Merge branch 'test' of channing.zhang/i3plus-pojo into test

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java

@@ -478,6 +478,8 @@ public class WmsDocMovementDetails extends BaseBean {
     String prodCfgTypeName;
 
 
+
+
     public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo,Integer itemStatus) {
         this.custNo = custNo;
         this.orderNo = orderNo;
@@ -719,6 +721,19 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.custNo = custNo;
     }
 
+    public WmsDocMovementDetails(String orderNo,String custPartNo,String srcZoneNo, String destZoneNo,String destLocateNo,Double qty,Double pickQty, String createDatetime,Integer orderStatus,String createUser) {
+        this.orderNo = orderNo;
+        this.custPartNo = custPartNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.destLocateNo = destLocateNo;
+        this.qty = qty;
+        this.pickQty = pickQty;
+        this.createDatetime = createDatetime;
+        this.orderStatus = orderStatus;
+        this.createUser = createUser;
+
+    }
     public WmsDocMovementDetails(String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo, String locateName) {
         this.orderNo = orderNo;
         this.srcZoneNo = srcZoneNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java

@@ -358,6 +358,23 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("查询状态集合")
     public List<Integer> orderStatusList;
 
+    @Transient
+    @ApiParam("一个应拣数里面的料子")
+    public Double snp;
+
+    @Transient
+    @ApiParam("实拣数")
+    public int pickQty;
+
+
+    @Transient
+    @ApiParam("拣货状态")
+    public Integer pickOrderStatus;
+
+    @Transient
+    @ApiParam("完成时间")
+    public String complateDatetime;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }
@@ -401,4 +418,16 @@ public class WmsDocMovementMaster extends BaseBean {
         this.custOwner = custOwner;
         this.custTel = custTel;
     }
+
+    public WmsDocMovementMaster(String orderNo,String createDatetime,Double qty,Double snp,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) {
+        this.orderNo = orderNo;
+        this.createDatetime = createDatetime;
+        this.qty = qty;
+        this.snp = snp;
+        this.orderStatus = orderStatus;
+        this.organizeCode = organizeCode;
+        this.createUser = createUser;
+        this.assignPlanDate = planDate;
+        this.assignPlanTime = planTime;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java

@@ -33,8 +33,8 @@ public class WmsFix extends BaseBean{
     @ApiParam("设备编号")
     public String fixId;
 
-    @Column(name = "FIX_MAC")
+    @Column(name = "FIX_MAC")    @ApiParam("设备mac地址")
-    @ApiParam("设备mac地址")
+
     public String fixMac;
 
     @Column(name = "FIX_NAME")