Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -80,7 +80,6 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam("条码")
     public String sn;
 
-
     /**
      * 质检状态:1=未质检,10=质检中,20=质检合格,
      * 30=质检不合格,40=已退货
@@ -117,6 +116,10 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam(value = "供应商编码")
     public String vendorNo;
 
+    @Column(name = "LOT_NO", nullable = false)
+    @ApiParam("收货批次")
+    public String lotNo = "";
+
     @Transient
     @ApiParam(value = "实盘数量", example = "1")
     @AnnoOutputColumn(hidden = true)

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -47,6 +48,10 @@ public class WmsCSRange extends BaseBean {
     @ApiParam("物料名称")
     public String partNameRdd;
 
+    @Column(name = "WH_NO")
+    @ApiParam("仓库代码")
+    public String whNo;
+
     @Column(name = "ZONE_NO")
     @ApiParam("存储区编号")
     public String zoneNo;
@@ -64,6 +69,15 @@ public class WmsCSRange extends BaseBean {
     @ApiParam("原单号")
     public String srcOrderNo;
 
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "库存数量", example = "0")
+    public Double qty;
+
+    @Column(name = "LOT_NO", nullable = false)
+    @ApiParam("收货批次")
+    public String lotNo = "";
+
     @Transient
     @ApiParam("存储区编号组")
     @AnnoOutputColumn(hidden = true)