【KT-快速入库功能】

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

@@ -4545,4 +4545,110 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 计划拉动明细表状态创建
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PULL_TASK_DETAILS_STATUS {
+        BE_HANDLE(10,"BE_HANDLE", "待处理"),
+        CANCELLATION(20,"CANCELLATION", "已处理");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PULL_TASK_DETAILS_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 计划拉动明细表状态创建
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PULL_TASK_MASTER_STATUS {
+        CREATE(10,"CREATE", "创建"),
+        ENABLED(20,"ENABLED", "已启动"),
+        COMPLETE(30,"COMPLETE", "已完成"),
+        CLOSE(40,"CLOSE", "已关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PULL_TASK_MASTER_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -32,7 +32,7 @@ public class WmsPullTaskDetails extends BaseBean{
 
     @Column(name="WROKORDER_NO")
     @ApiParam("工单号")
-    private String woekorderNo;
+    private String wrokorderNo;
 
     @Column(name="ITEM")
     @ApiParam(value = "行号", example = "0")
@@ -47,8 +47,8 @@ public class WmsPullTaskDetails extends BaseBean{
     private String locateNo;
 
     @Column(name="LOCATE_CAPACITY")
-    @ApiParam("库位容量")
-    private String locateCapacity;
+    @ApiParam(value = "库位容量", example = "0")
+    private Integer locateCapacity = 0;
 
     @Column(name="PART_NO")
     @ApiParam("零件编号")
@@ -58,49 +58,53 @@ public class WmsPullTaskDetails extends BaseBean{
     @ApiParam("零件名称")
     private String partNameRdd;
 
+    @Column(name="PLAN_PACK_QTY")
+    @ApiParam(value = "计划数量", example = "0d")
+    private Double planPackQty = 0d;
+
     @Column(name="PLAN_PACK_COUNT")
-    @ApiParam(value = "计划容器数", example = "0")
-    private Integer planPackCount = 0;
+    @ApiParam(value = "计划容器数", example = "0d")
+    private Double planPackCount = 0d;
 
     @Column(name="FIRST_BATCH_QTY")
-    @ApiParam(value = "首批批量", example = "0")
-    private Integer firstBatchQty = 0;
+    @ApiParam(value = "首批批量", example = "0d")
+    private Double firstBatchQty = 0d;
 
     @Column(name="FIRST_PACK_COUNT")
-    @ApiParam(value = "首批容器数", example = "0")
-    private Integer firstPackCount = 0;
+    @ApiParam(value = "首批容器数", example = "0d")
+    private Double firstPackCount = 0d;
 
     @Column(name="REQUEST_QTY")
-    @ApiParam(value = "补货批量", example = "0")
-    private Integer requestQty = 0;
+    @ApiParam(value = "补货批量", example = "0d")
+    private Double requestQty = 0d;
 
     @Column(name="REQUEST_PACK_COUNT")
-    @ApiParam(value = "补货容器数", example = "0")
-    private Integer requestPackCount = 0;
+    @ApiParam(value = "补货容器数", example = "0d")
+    private Double requestPackCount = 0d;
 
     @Column(name="REQUEST_LOT_NO")
-    @ApiParam(value = "补货批次", example = "0")
-    private Integer requestLotNo = 0;
+    @ApiParam(value = "补货批次", example = "0d")
+    private Double requestLotNo = 0d;
 
     @Column(name="REQUEST_TOTAL_COUNT")
-    @ApiParam(value = "补货累加次数", example = "0")
-    private Integer requestTotalCount = 0;
+    @ApiParam(value = "补货累加次数", example = "0d")
+    private Double requestTotalCount = 0d;
 
     @Column(name="LAST_REQUEST_TIME")
     @ApiParam("上一次补货时间")
     private String lastRequestTtime;
 
     @Column(name="BOOT_QTY")
-    @ApiParam(value = "尾箱批量", example = "0")
-    private Integer bootQty = 0;
+    @ApiParam(value = "尾箱批量", example = "0d")
+    private Double bootQty = 0d;
 
     @Column(name="BOOT_PACK_COUNT")
-    @ApiParam(value = "尾箱容器数", example = "0")
-    private Integer bootPackCount = 0;
+    @ApiParam(value = "尾箱容器数", example = "0d")
+    private Double bootPackCount = 0d;
 
     @Column(name="BOOT_LOT_NO")
-    @ApiParam(value = "尾箱批次", example = "0")
-    private Integer bootLotNo = 0;
+    @ApiParam(value = "尾箱批次", example = "0d")
+    private Double bootLotNo = 0d;
 
     @Column(name="ORDER_STATUS")
     @ApiParam(value = "单据状态", example = "0")
@@ -110,48 +114,56 @@ public class WmsPullTaskDetails extends BaseBean{
         return orderStatus == null ? 0 : this.orderStatus.intValue();
     }
 
-    public Integer getBootLotNo() {
-        return bootLotNo == null ? 0 : this.bootLotNo.intValue();
+    public Double getBootLotNo() {
+        return bootLotNo == null ? 0d : this.bootLotNo.doubleValue();
     }
 
-    public Integer getBootPackCount() {
-        return bootPackCount == null ? 0 : this.bootPackCount.intValue();
+    public Double getBootPackCount() {
+        return bootPackCount == null ? 0d : this.bootPackCount.doubleValue();
     }
 
-    public Integer getBootQty() {
-        return bootQty == null ? 0 : this.bootQty.intValue();
+    public Double getBootQty() {
+        return bootQty == null ? 0d : this.bootQty.doubleValue();
     }
 
-    public Integer getRequestTotalCount() {
-        return requestTotalCount == null ? 0 : this.requestTotalCount.intValue();
+    public Double getRequestTotalCount() {
+        return requestTotalCount == null ? 0d : this.requestTotalCount.doubleValue();
     }
 
-    public Integer getRequestLotNo() {
-        return requestLotNo == null ? 0 : this.requestLotNo.intValue();
+    public Double getRequestLotNo() {
+        return requestLotNo == null ? 0d : this.requestLotNo.doubleValue();
     }
 
-    public Integer getRequestPackCount() {
-        return requestPackCount == null ? 0 : this.requestPackCount.intValue();
+    public Double getRequestPackCount() {
+        return requestPackCount == null ? 0d : this.requestPackCount.doubleValue();
     }
 
-    public Integer getRequestQty() {
-        return requestQty == null ? 0 : this.requestQty.intValue();
+    public Double getRequestQty() {
+        return requestQty == null ? 0d : this.requestQty.doubleValue();
     }
 
-    public Integer getFirstPackCount() {
-        return firstPackCount == null ? 0 : this.firstPackCount.intValue();
+    public Double getFirstPackCount() {
+        return firstPackCount == null ? 0d : this.firstPackCount.doubleValue();
     }
 
-    public Integer getFirstBatchQty() {
-        return firstBatchQty == null ? 0 : this.firstBatchQty.intValue();
+    public Double getFirstBatchQty() {
+        return firstBatchQty == null ? 0d : this.firstBatchQty.doubleValue();
     }
 
-    public Integer getPlanPackCount() {
-        return planPackCount == null ? 0 : this.planPackCount.intValue();
+    public Double getPlanPackCount() {
+        return planPackCount == null ? 0d : this.planPackCount.doubleValue();
     }
 
     public Integer getItem() {
         return item == null ? 0 : this.item.intValue();
     }
 
+    public Double getLocateCapacity() {
+        return locateCapacity == null ? 0d : this.locateCapacity.doubleValue();
+    }
+
+    public Double getPlanPackQty() {
+        return planPackQty == null ? 0d : this.planPackQty.doubleValue();
+    }
+
 }

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

@@ -2611,4 +2611,39 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 拉动计划主表信息分页查询条件
+     *
+     * @param wmsPullTaskMaster
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getInPack(statusList, "orderStatus", result);
+        DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result);
+        DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result);
+        DdlPreparedPack.getStringSmallerPack(wmsPullTaskMaster.getEndProductTime(), "endProductTime", result);
+
+        getStringBuilderPack(wmsPullTaskMaster, result);
+
+        return result;
+    }
+
+    /**
+     * 拉动计划明细表信息分页查询条件
+     *
+     * @param wmsPullTaskDetails
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWrokorderNo(), "wrokorderNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result);
+
+        getStringBuilderPack(wmsPullTaskDetails, result);
+
+        return result;
+    }
+
 }