Merge remote-tracking branch 'remotes/origin/test' into dev

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java

@@ -3,9 +3,7 @@ package cn.estsh.i3plus.pojo.model.dynamic.table;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -31,6 +29,9 @@ public class DynTableRow implements Serializable {
     // 行Size
     private Integer cellSize = 0;
 
+    //时间
+    private String createDatetime;
+
     // 行数据
     private Map<String, DynTableCell> cellMap = new HashMap<>();
 

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

@@ -385,6 +385,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "实际发运时间")
     private String actualPlanTime;
 
+    @Transient
+    @ApiParam(value = "目的库位名称")
+    public String destLocateName;
+
 
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
@@ -715,4 +719,12 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.custNo = custNo;
     }
 
+    public WmsDocMovementDetails(String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo, String locateName) {
+        this.orderNo = orderNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.destLocateNo = destLocateNo;
+        this.destLocateName = locateName;
+    }
+
 }