Merge branch 'dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -2764,6 +2764,61 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 库存数量类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOCK_QUAN_QTY_TYPE {
+        QTY("qty", "可用数量"),
+        FAIL_QTY("failQty", "不合格数量"),
+        HOLD_QTY("holdQty", "隔离数量"),
+        QC_QTY("qcQty", "质检中数量"),
+        RIN_QTY("rinQty", "待入库数量"),
+        FREEZE_QTY("freezeQty", "冻结数量"),
+        CONSIGN_QTY("consignQty", "寄售数量"),
+        LOCK_QTY("lockQty", "锁定数量"),
+        SCRAP_QTY("scrapQty", "报废数量");
+
+        private String code;
+        private String description;
+
+        STOCK_QUAN_QTY_TYPE(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getValue() {
+            return code;
+        }
+
+        public static STOCK_QUAN_QTY_TYPE codeOf(String code) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String getDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code == code) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * ERP同步标识 10=待同步，20=同步成功，30=同步失败
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java

@@ -33,8 +33,8 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam("关联单号")
     public String refSrc;
 
-    @ApiParam(value = "关联单据类型")
-    private String refType;
+    @ApiParam(value = "关联单据业务类型")
+    private String busiTypeDesc;
 
     @Column(name = "ZDATE")
     @ApiParam(value = "计划日期")
@@ -56,13 +56,13 @@ public class WmsTaskInfoModel implements Serializable {
     }
 
     public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
-                            String refType, String zdate, String ztime, String custNo, String vendorNo) {
+                            String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo) {
         this.orderNo = orderNo;
         this.taskStatus = taskStatus;
         this.opTypeName = opTypeName;
         this.transTypeCode = transTypeCode;
         this.refSrc = refSrc;
-        this.refType = refType;
+        this.busiTypeDesc = busiTypeDesc;
         this.zdate = zdate;
         this.ztime = ztime;
         this.custNo = custNo;

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

@@ -112,10 +112,22 @@ public class WmsPart extends BaseBean {
     @ApiParam(value = "是否条码管理", example = "1")
     private Integer snControl;
 
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商代码")
+    private String vendorNo;
+
     @Column(name = "IN_LOCATE_NO")
     @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;
@@ -136,7 +148,9 @@ public class WmsPart extends BaseBean {
     @ApiParam("库存水平")
     private String stockLevelStatus;
 
-    public WmsPart(){}
+
+    public WmsPart() {
+    }
 
     public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty) {
         this.partNo = partNo;
@@ -145,4 +159,12 @@ 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;
+    }
 }

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

@@ -134,6 +134,14 @@ public class WmsTaskDetails extends BaseBean {
     @ApiParam("目的库存地代码")
     public String destAreaNo;
 
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    public Integer busiType;
+
+    @Column(name = "BUSI_TYPE_DESC")
+    @ApiParam("业务类型描述")
+    public String busiTypeDesc;
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;
     }

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

@@ -475,7 +475,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //客户编号
-        DdlPreparedPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result);
+        DdlPreparedPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result);
         //客户简称
         DdlPreparedPack.getStringLikerPack(basCustomer.getCustName(), "custName", result);
         //客户全称
@@ -633,7 +633,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result);
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result);
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result);
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result);
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);