Merge branch 'dev' into test

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

@@ -5,7 +5,6 @@ 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;
@@ -123,14 +122,6 @@ public class WmsPart extends BaseBean {
     @ApiParam(value = "默认入库库位")
     private String inLocateNo;
 
-    @Transient
-    @ApiParam("默认入库存储区")
-    private String inZoneNo;
-
-    @Transient
-    @ApiParam("默认入库仓库")
-    private String inWhNo;
-
     @Column(name = "PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
@@ -169,12 +160,4 @@ public class WmsPart extends BaseBean {
         this.min = minQty;
         this.qty = cqty;
     }
-
-    public WmsPart(String partNo, String vendorNo, String inLocateNo, String inZoneNo, String inWhNo) {
-        this.partNo = partNo;
-        this.vendorNo = vendorNo;
-        this.inLocateNo = inLocateNo;
-        this.inZoneNo = inZoneNo;
-        this.inWhNo = inWhNo;
-    }
 }