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

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

@@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
-import java.util.List;
 
 /**
  * @Description : ASN订单明细信息
@@ -45,7 +44,7 @@ public class WmsASNMasterDetails extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name = "QTY")
     @ColumnDefault("0")

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

@@ -35,7 +35,7 @@ public class WmsCSAdjustRange extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name="IS_ADJUST")
     @ApiParam(value = "调整标识", example = "1")
@@ -62,7 +62,7 @@ public class WmsCSAdjustRange extends BaseBean {
     public String unit;
 
     public WmsCSAdjustRange(){}
-    public WmsCSAdjustRange(String orderNo, Integer item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) {
+    public WmsCSAdjustRange(String orderNo, String item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) {
         this.orderNo = orderNo;
         this.item = item;
         this.isAdjust = isAdjust;

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

@@ -39,7 +39,7 @@ public class WmsCSOrderDetails extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name = "QTY")
     @ColumnDefault("0")

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

@@ -34,7 +34,7 @@ public class WmsCSRange extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name = "PART_NO")
     @ApiParam("物料编码")

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

@@ -41,7 +41,7 @@ public class WmsDocMovementDetails extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name = "QTY")
     @ColumnDefault("0")

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

@@ -39,7 +39,7 @@ public class WmsDocMovementSn extends BaseBean {
 
     @Column(name="ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name="PART_NO")
     @ApiParam("物料编码")

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

@@ -39,7 +39,7 @@ public class WmsQCDetails extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name = "QTY")
     @ColumnDefault("0")

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

@@ -35,7 +35,7 @@ public class WmsQCTrans extends BaseBean {
 
     @Column(name="ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     /**
      * 状态:1=创建,10=已处理