Finish Task #2080 Cost:8h

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

@@ -300,6 +300,63 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 收货状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REC_STATUS_KANBAN {
+        TO_BE_RECEIVED(10, "TO_BE_RECEIVED", "待收货"),
+        RECEIVING(20, "RECEIVING", "收货中"),
+        DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟未收货"),
+        COMPLETED(40, "COMPLETED", "已完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        REC_STATUS_KANBAN(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
      * 订单明细状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -1649,6 +1706,42 @@ public class WmsEnumUtil {
      * 质检业务状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_STATUS {
+        INSPECTION_FREE(10, "免检"),
+        PENDING_QUALITY_INSPECTION(20, "待质检"),
+        QUALITY_INSPECTION_COMPLETED(30, "质检完成");
+
+        private int value;
+        private String description;
+
+        QC_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 质检业务状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_INFO_STATUS {
         CREATE(10, "新建"),
         FINISH(20, "处理中"),
@@ -8454,4 +8547,78 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 频次
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FREQUENCY {
+        ORDER_GENERATE(10, "MULTI_FREQUENCY", "多频次"),
+        STRATEGIC_ACTION(20, "NON_MULTI_FREQUENCY", "非多频次"),
+        TASK_GENERATE(30, "AMP", "AMP");
+
+        private int value;
+        private String code;
+        private String description;
+
+        FREQUENCY(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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        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;
+        }
+
+        public static FREQUENCY codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 }

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

@@ -16,6 +16,7 @@ import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 盘点单冻结信息
@@ -154,6 +155,14 @@ public class WmsCSOrderDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description")
     public Integer differenceType;
 
+    /**
+     * 差异类型：10：盘平，20：盘亏，30盘赢
+     */
+    @Transient
+    @ApiParam("差异集合")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class, refForeignKey = "value", value = "description")
+    public List<Integer> differenceTypeList;
+
     public Integer getDifferenceTypeVal() {
         return this.differenceType == null ?
         -1: this.differenceType;

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

@@ -284,6 +284,13 @@ public class WmsPart extends BaseBean {
     public Integer isRecycle;
 
 
+    @Column(name = "FREQUENCY")
+    @ApiParam(value = "频次", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FREQUENCY")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FREQUENCY.class, refForeignKey = "value", value = "description", hidden = true)
+    private Integer frequency;
+
+
     public int getIqcVal() {
         return this.iqc == null ? 0 : this.iqc.intValue();
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsReceiptKanbanDto.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-07-09 9:50 上午
+ * @Modify:
+ **/
+@Data
+@Api("静态盘点查询输出实体类")
+public class WmsReceiptKanbanDto {
+
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @ApiParam(value = "频次")
+    private String frequency;
+
+    @ApiParam(value = "供应商名称")
+    private String verdorName;
+
+    @ApiParam(value = "订单号")
+    private String orderNo;
+
+
+    @ApiParam(value = "道口")
+    private String dock;
+
+    @ApiParam(value = "项目")
+    private String prodCfgTypeCode;
+
+    @ApiParam(value = "窗口时间")
+    private String planDate;
+
+    @ApiParam(value = "开始收货时间")
+    private String earliestReceTime;
+
+    @ApiParam(value = "结束收货时间")
+    private String latestReceTime;
+
+    @ApiParam(value = "收货状态")
+    private String receStatus;
+
+    @ApiParam(value = "质检状态")
+    private String qcStatus;
+
+    @ApiParam(value = "工厂代码")
+    private String organizeCode;
+}