任务#2893,2894

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

@@ -278,8 +278,8 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("物料编号")
     public String partNo;
 
-    @ApiParam(value = "标题")
     @Transient
+    @ApiParam(value = "标题")
     public String title;
 
     @Transient
@@ -346,6 +346,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("目标库位代码")
     public String destLocateNo;
 
+    @Transient
+    @ApiParam("查询状态集合")
+    public List<Integer> orderStatusList;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }

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

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 库位物料表
@@ -87,6 +88,26 @@ public class WmsLocatePart extends BaseBean {
     @ApiParam("库位类型")
     private Integer locateType;
 
+    @Transient
+    @ApiParam("库位类型")
+    private List<Integer> locateTypeList;
+
+    @Transient
+    @ApiParam("物料类型")
+    private List<String> partTypeList;
+
+    @Transient
+    @ApiParam(value = "存储区")
+    private String zoneNo;
+
+    @Transient
+    @ApiParam(value = "仓库")
+    private String whNo;
+
+    @Transient
+    @ApiParam(value = "库存单位")
+    private String stockUnit;
+
     public Double getMin() {
         return this.min == null ? 0 : this.min;
     }
@@ -107,5 +128,23 @@ public class WmsLocatePart extends BaseBean {
         return this.min ==null?0:this.min.doubleValue();
     }
 
+    public WmsLocatePart() {
+    }
 
+    public WmsLocatePart(String locateNo, String partNo, String partNameRdd, Double pullQty, Double max, Double min,
+                         Integer isGeneratePicklist, Double safetyStock, Double moq, String zoneNo, String whNo,
+                         String stockUnit) {
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.pullQty = pullQty;
+        this.max = max;
+        this.min = min;
+        this.isGeneratePicklist = isGeneratePicklist;
+        this.safetyStock = safetyStock;
+        this.moq = moq;
+        this.zoneNo = zoneNo;
+        this.whNo = whNo;
+        this.stockUnit = stockUnit;
+    }
 }

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

@@ -86,6 +86,10 @@ public class WmsSerialSnTrans extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer isOk;
 
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
     @Transient
     @ApiParam("操作类型")
     private List<Integer> transTypeLst;