Merge branch 'dev' into test

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

@@ -64,6 +64,18 @@ public class BasVendor extends BaseBean{
     @ApiParam(value = "密码")
     private String password;
 
+    @Column(name = "VENDOR_CALL")
+    @ApiParam("供应商电话")
+    private String vendorCall;
+
+    @Column(name = "VENDOR_FAX")
+    @ApiParam("传真")
+    private String vendorFax;
+
+    @Column(name = "VENDOR_PHONE")
+    @ApiParam("手机")
+    private String vendorPhone;
+
     public BasVendor() {
     }
 

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

@@ -109,4 +109,16 @@ public class WmsASNMaster extends BaseBean {
     @Column(name = "REMARK")
     @ApiParam("备注")
     public String remark;
+
+    @Transient
+    @ApiParam("供应商电话")
+    private String vendorCall;
+
+    @Transient
+    @ApiParam("传真")
+    private String vendorFax;
+
+    @Transient
+    @ApiParam("手机")
+    private String vendorPhone;
 }

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

@@ -64,8 +64,8 @@ public class WmsMoveToERP extends BaseBean {
     private String carNo;
 
     @Column(name="ITEM")
-    @ApiParam(value = "行号", example = "0")
+    @ApiParam(value = "行号")
-    public Integer item;
+    public String item;
 
     @Column(name="PART_NO")
     @ApiParam("物料编码")

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

@@ -119,4 +119,16 @@ public class WmsPOMaster extends BaseBean {
     @Transient
     @ApiParam("邮箱")
     private String vendorEmail;
+
+    @Transient
+    @ApiParam("供应商电话")
+    private String vendorCall;
+
+    @Transient
+    @ApiParam("传真")
+    private String vendorFax;
+
+    @Transient
+    @ApiParam("手机")
+    private String vendorPhone;
 }

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import net.bytebuddy.implementation.bind.annotation.Default;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -88,6 +90,7 @@ public class WmsPart extends BaseBean {
     @ApiParam(value = "标准包装", example = "1")
     private Double snp;
 
+    @ColumnDefault("2")
     @Column(name = "IQC")
     @ApiParam(value = "收货检验否", example = "1")
     private Integer iqc;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -247,7 +247,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
-        DdlPreparedPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
+        DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result);
         DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
 
         getStringBuilderPack(wmsPart, result);