Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java

@@ -143,6 +143,14 @@ public class Material extends BaseAPS {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String orderBatchPeriod;
 
+    @Column(name="LABEL_NAME")
+    @ApiParam(value ="标签名称")
+    private String labelName;
+
+    @Column(name="LABEL_COLOR")
+    @ApiParam(value ="标签颜色")
+    private String labelColor;
+
     @JsonBackReference
     public List<ProductRouting> getProductRoutings() {
         return BeanRelation.list(this, EMaterial.ProductRoutings);

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
+import cn.estsh.i3plus.pojo.aps.holders.EMaterialDeliveryPromise;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @Description :物料交期承诺
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_MATERIAL_DELIVERY_PROMISE")
+@Api("物料")
+public class MaterialDeliveryPromise extends BaseBean {
+    @Column(name="QTY")
+    @ApiParam(value ="到货数量")
+    private Double count;
+
+    @Column(name="DATE_TIME")
+    @ApiParam(value ="到货日期")
+    private Date dateTime;
+
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(relation = "Material", notEmpty = true)
+    private Long materialId;
+
+    public Material getMaterial() {
+        return BeanRelation.get(this, EMaterialDeliveryPromise.Material);
+    }
+
+    public void setMaterial(Material material) {
+        this.materialId = material != null ? material.getId() : 0l;
+        BeanRelation.set(this, EMaterialDeliveryPromise.Material, material);
+    }
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java

@@ -51,6 +51,11 @@ public class SalesOrder extends BaseOrder {
     @FieldAnnotation(modify = false)
     private String calcLeadTime;
 
+    @Column(name="ALLOW_DELAY_TIME")
+    @ApiParam(value ="允许延期时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
+    private String allowDelayTime;
+
     @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EBaseOrder.Works);

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java

@@ -29,6 +29,10 @@ public class DateDuration {
     private double rate = 0.0;
     private boolean bValid = false;
 
+    public DateDuration(int value) {
+        this.time = value;
+    }
+
     public DateDuration(String value) {
         setValue(value);
     }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java

@@ -0,0 +1,5 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EMaterialDeliveryPromise {
+    Material,
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java

@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 延期订单
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+public class DelaySalesOrder {
+    @ApiParam(value ="订单编码")
+    private String orderCode;
+
+    @ApiParam(value ="订单名称")
+    private String orderName;
+
+    @ApiParam(value ="物料编码")
+    private String materialCode;
+
+    @ApiParam(value ="物料名称")
+    private String materialName;
+
+    @ApiParam(value ="订单数量")
+    private Double count;
+
+    @ApiParam(value ="最晚结束时间")
+    private Date let;
+
+    @ApiParam(value ="计划开始时间")
+    private Date planStart;
+
+    @ApiParam(value ="计划结束时间")
+    private Date planEnd;
+
+    @ApiParam(value ="总跨度时间")
+    private String overTime;
+
+    @ApiParam(value ="总生产时间")
+    private String productTime;
+
+    @ApiParam(value ="延期时间")
+    private String delayTime;
+
+    @ApiParam(value ="允许的最大延期时间")
+    private String allowDelayTime;
+
+    // 0正常显示，1显示黄色，2显示红色
+    @ApiParam(value ="背景显示颜色")
+    private Integer backgroundColor;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 大跨度订单
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+public class LargeSpanOrder {
+    @ApiParam(value ="订单编码")
+    private String orderCode;
+
+    @ApiParam(value ="订单名称")
+    private String orderName;
+
+    @ApiParam(value ="物料编码")
+    private String materialCode;
+
+    @ApiParam(value ="物料名称")
+    private String materialName;
+
+    @ApiParam(value ="订单数量")
+    private Double count;
+
+    @ApiParam(value ="最晚结束时间")
+    private Date let;
+
+    @ApiParam(value ="计划开始时间")
+    private Date planStart;
+
+    @ApiParam(value ="计划结束时间")
+    private Date planEnd;
+
+    @ApiParam(value ="总跨度时间")
+    private String overTime;
+
+    @ApiParam(value ="总生产时间")
+    private String productTime;
+
+    @ApiParam(value ="跨度时间")
+    private String spanTime;
+
+    // 0正常显示，1显示黄色，2显示红色
+    @ApiParam(value ="背景显示颜色")
+    private Integer backgroundColor;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 物料交期分析表
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+public class MaterialDeliveryAnalyze {
+
+    private String orderCode;
+
+    private String orderName;
+
+    private String materialCode;
+
+    private String materialName;
+
+    private String labelName;
+
+    private String labelColor;
+
+    private Date requireDate;
+
+    private Date arrivalDate;
+
+    private Double requireCount;
+
+    private Double count;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 过早生产
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+public class PrematureProduct {
+    @ApiParam(value ="订单编码")
+    private String orderCode;
+
+    @ApiParam(value ="订单名称")
+    private String orderName;
+
+    @ApiParam(value ="物料编码")
+    private String materialCode;
+
+    @ApiParam(value ="物料名称")
+    private String materialName;
+
+    @ApiParam(value ="订单编码")
+    private Double count;
+
+    @ApiParam(value ="最晚结束时间")
+    private Date let;
+
+    @ApiParam(value ="计划开始时间")
+    private Date planStart;
+
+    @ApiParam(value ="计划结束时间")
+    private Date planEnd;
+
+    @ApiParam(value ="提前完成时间")
+    private String times;
+
+    // 0正常显示，1显示红色
+    @ApiParam(value ="背景显示颜色")
+    private Integer backgroundColor;
+
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialDeliveryPromiseRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.MaterialDeliveryPromise;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MaterialDeliveryPromiseRepository extends CrudRepository<MaterialDeliveryPromise, Long> {
+}

modules/i3plus-pojo-aps/src/main/resources/relations/MaterialDeliveryPromise.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="MaterialDeliveryPromise">
+    <Relation field="Material" name="Material" type="MULTI_TO_ONE">
+    </Relation>
+</Class>

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

@@ -1110,4 +1110,33 @@ public class ApsEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 订单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_STATUS {
+        NOPLAN("NOPLAN", "未计划"),
+        PLANDONE("PLANDONE", "计划完毕"),
+        INDICATIONDONE("INDICATIONDONE", "指示完毕"),
+        CONFIRM("CONFIRM", "确认"),
+        STARTPRODUCT("STARTPRODUCT", "开始生产"),
+        FINISH("FINISH", "完成");
+
+        private String value;
+        private String description;
+
+        ORDER_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -1234,4 +1234,47 @@ public class ImppEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 密码策略
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_TEXT {
+        PASSWORD_VERIFY(1, "保存策略"),
+        PASSWORD_LOGIN(2, "登录策略");
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private CHECK_TEXT(int value, String description) {
+            this.value = value;
+            this.description = 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 CHECK_TEXT valueOfEnum(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
 }

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

@@ -123,7 +123,7 @@ public class MdmEnumUtil {
     public enum MDM_SYNC_TYPE{
         INSERT(1,  "新增"),
         UPDATE(2,  "修改"),
-        DELETE(2,  "删除");
+        DELETE(3,  "删除");
 
         private int value;
         private String description;

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

@@ -70,8 +70,9 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_MODULE_TYPE {
         MONITOR_MODULE(10, "监听组件"),
-        REVEAL_MODULE(10, "展示组件"),
-        BUTTON_MODULE(30, "按钮组件");
+        REVEAL_MODULE(20, "展示组件"),
+        BUTTON_MODULE(30, "按钮组件"),
+        TIMING_MODULE(40, "定时组件");
 
         private int value;
         private String description;
@@ -1903,7 +1904,8 @@ public class MesEnumUtil {
         MES_KPSN_RULE(410, "kpsnRuleExcelService", "关键件条码校验规则，支持编辑"),
         MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"),
         MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"),
-        MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑");
+        MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"),
+        MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装");
 
         private int value;
         private String service;
@@ -3830,7 +3832,8 @@ public class MesEnumUtil {
         QUALIFIED(10, "number", "数字"),
         DEFECTED(20, "text", "字符串"),
         SCRAPED(30, "select", "可选值"),
-        BUTTON(40, "button", "按钮");
+        BUTTON(40, "button", "按钮"),
+        WINDOW(50, "window", "开窗");
 
         private int value;
         private String code;
@@ -6278,4 +6281,50 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 停机类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOP_MACHINE_TYPE {
+        TIMER_TIME_OUT(10, "计时器超时停机"),
+        DELAY_HELP(20, "延时帮助停机"),
+        URGENT_STOP(30, "急停停机");
+
+        private int value;
+        private String description;
+
+        STOP_MACHINE_TYPE(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;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -18,8 +18,9 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_MODULE_TYPE {
         MONITOR_MODULE(10, "监听组件"),
-        REVEAL_MODULE(10, "展示组件"),
-        BUTTON_MODULE(30, "按钮组件");
+        REVEAL_MODULE(20, "展示组件"),
+        BUTTON_MODULE(30, "按钮组件"),
+        TIMING_MODULE(40, "定时组件");
 
         private int value;
         private String description;

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

@@ -7635,4 +7635,480 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 策略等级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRACTICS_GRADE {
+        ONE_TRACTICS_GRADE(10, "ONE_TRACTICS_GRADE", "1级策略"),
+        TWO_TRACTICS_GRADE(20, "TWO_TRACTICS_GRADE", "2级策略"),
+        THREE_TRACTICS_GRADE(30, "THREE_TRACTICS_GRADE", "3级策略");
+
+        private int value;
+        private String code;
+        private String description;
+
+        TRACTICS_GRADE(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 TRACTICS_GRADE 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;
+        }
+    }
+
+    /**
+     * 策略组
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRACTICS_GROUP {
+        INSTOCK(10, "INSTOCK", "上架"),
+        PICKING(20, "PICKING", "拣货");
+
+        private int value;
+        private String code;
+        private String description;
+
+        TRACTICS_GROUP(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 TRACTICS_GROUP 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;
+        }
+    }
+
+    /**
+     * 上架:策略项:1级策略
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum INSTOCK_TRACTICS_ITEM_ONE {
+        COI_RECOMMEND(10, "COI_RECOMMEND", "COI推荐"),
+        ADJACENT_RECOMMEND(20, "ADJACENT_RECOMMEND", "高频推荐(相邻)"),
+        AREA_RECOMMEND(30, "AREA_RECOMMEND", "区域随机推荐"),
+        INERTIA_RECOMMEND(40, "INERTIA_RECOMMEND", "惯性推荐"),
+        ARTIFICIAL_RECOMMEND(50, "ARTIFICIAL_RECOMMEND", "人工指定");
+
+        private int value;
+        private String code;
+        private String description;
+
+        INSTOCK_TRACTICS_ITEM_ONE(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 INSTOCK_TRACTICS_ITEM_ONE 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;
+        }
+    }
+
+    /**
+     * 上架:策略项:2级策略
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum INSTOCK_TRACTICS_ITEM_TWO {
+        FULL_RECOMMEND(10, "FULL_RECOMMEND", "放满推荐"),
+        EMPTY_RECOMMEND(20, "EMPTY_RECOMMEND", "空位推荐");
+
+        private int value;
+        private String code;
+        private String description;
+
+        INSTOCK_TRACTICS_ITEM_TWO(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 INSTOCK_TRACTICS_ITEM_TWO 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;
+        }
+    }
+
+    /**
+     * 上架:策略项:3级策略
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum INSTOCK_TRACTICS_ITEM_THREE {
+        FCL_RECOMMEND(10, "FCL_RECOMMEND", "整箱推荐"),
+        EMPTY_BOX_RECOMMEND(20, "EMPTY_BOX_RECOMMEND", "零箱推荐"),
+        WHOLE_BOX_RECOMMEND(30, "WHOLE_BOX_RECOMMEND", "整零箱推荐");
+
+        private int value;
+        private String code;
+        private String description;
+
+        INSTOCK_TRACTICS_ITEM_THREE(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 INSTOCK_TRACTICS_ITEM_THREE 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;
+        }
+    }
+
+    /**
+     * 拣货:策略项:1级策略
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PICKING_TRACTICS_ITEM_ONE {
+        ABSOLUTE_PATH(10, "ABSOLUTE_PATH", "绝对路径"),
+        RELATIVE_PATH(20, "RELATIVE_PATH", "相对路径"),
+        LOCATE_ORDER_BY(30, "LOCATE_ORDER_BY", "库位编号排序");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PICKING_TRACTICS_ITEM_ONE(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 PICKING_TRACTICS_ITEM_ONE 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;
+        }
+    }
+
+    /**
+     * 库位坐标是否允许偏移
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DOWN_OR_UP {
+
+        IS_TRUE(10, "IS_TRUE", "允许"),
+        IS_FALSE(20, "IS_FALSE", "不允许");
+
+        private int value;
+        private String codeValue;
+        private String description;
+
+        DOWN_OR_UP(int value, String codeValue, String description) {
+            this.value = value;
+            this.codeValue = codeValue;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCodeValue() {
+            return codeValue;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -76,6 +76,10 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否编辑")
     private Integer isObjectEdit;
 
+    @Column(name = "IS_READ_ONLY_SHOW")
+    @ApiParam(value = "是否只读显示")
+    private Integer isReadOnlyShow;
+
     @Column(name = "IS_OBJECT_DEL")
     @ApiParam(value = "是否删除")
     private Integer isObjectDel;

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java

@@ -30,12 +30,13 @@ public abstract class BaseMdmBean extends BaseBean {
 
     @Transient
     @ApiModelProperty("是否主数据")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
     public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
 
     @Column(name = "MDM_VERSION")
     @ApiModelProperty("mdm数据版本")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
     private Long mdmVersion;
 
     public long getMdmVersionVal() {
@@ -50,21 +51,26 @@ public abstract class BaseMdmBean extends BaseBean {
 
     @Column(name = "IS_MDM_PUBLISHED")
     @ApiModelProperty("是否发布")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
     private Integer isMdmPublished;
 
     @Column(name = "MDM_OPERATE_TYPE")
     @ApiModelProperty("操作类型")
-    @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class)
+    @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class,hidden = true)
     private Integer mdmOperateType;
 
     public Integer getMdmOperateTypeVal() {
         return mdmOperateType == null ? MdmEnumUtil.MDM_OPERATE_TYPE.INSERT.getValue() : mdmOperateType;
     }
 
+    public String getMdmOperateTypeTxt(){
+        return MdmEnumUtil.MDM_OPERATE_TYPE.valueOfDescription(getMdmOperateTypeVal());
+    }
+
     @Column(name = "MDM_REF_ID")
     @ApiModelProperty("关联id")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
     private Long mdmRefId;
 
     //排序方式

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java

@@ -28,22 +28,22 @@ public class BaseMdmBusiExtdBean extends BaseMdmBean {
 
     @Transient
     @ApiModelProperty("是否主数据")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
     public static Integer isMdmMaster  = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 
     @Transient
     @ApiModelProperty("主数据Class")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
-    public static Class<BaseMdmBean> mdmMasterClass  = BaseMdmBean.class;
+    @AnnoOutputColumn(hidden = true)
+    protected static Class<BaseMdmBean> mdmMasterClass  = BaseMdmBean.class;
 
     @Transient
     @ApiModelProperty("软件模块")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
-    public static Integer mdmSoftType;
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true)
+    protected static Integer mdmSoftType;
 
     @Column(name = "MDM_MASTER_ID")
     @ApiModelProperty("主数据id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long mdmMasterId;
+    public Long mdmMasterId;
 
 }

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java

@@ -11,6 +11,11 @@ import io.swagger.annotations.ApiModelProperty;
  **/
 public abstract class BaseMdmBusiModelBean<M extends BaseMdmBean, B extends BaseMdmBusiExtdBean> {
 
+    public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) {
+        this.mdmMasterBean = mdmMasterBean;
+        this.mdmBusiBean = mdmBusiBean;
+    }
+
     @ApiModelProperty("主数据")
     private M mdmMasterBean;
 
@@ -20,11 +25,6 @@ public abstract class BaseMdmBusiModelBean<M extends BaseMdmBean, B extends Base
     public BaseMdmBusiModelBean() {
     }
 
-    public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) {
-        this.mdmMasterBean = mdmMasterBean;
-        this.mdmBusiBean = mdmBusiBean;
-    }
-
     /**
      * 获取主数据m
      *

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java

@@ -31,10 +31,18 @@ public class MdmSyncData implements Serializable {
         return syncType == null ? MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue() : syncType;
     }
 
+    public String getSyncTypeTxt(){
+        return syncType == null ? "无":MdmEnumUtil.MDM_SYNC_TYPE.valueOfDescription(syncType);
+    }
+
     @ApiModelProperty("同步模块")
     @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class)
     private Integer syncSoftType;
 
+    public String getSyncSoftTypeTxt(){
+        return syncSoftType == null ? "无":CommonEnumUtil.SOFT_TYPE.valueOfDescription(syncSoftType);
+    }
+
     @ApiModelProperty("是否是主数据")
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
     private Integer isMasterData;
@@ -43,6 +51,10 @@ public class MdmSyncData implements Serializable {
         return isMasterData == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isMasterData;
     }
 
+    public String getIsMasterDataTxt(){
+        return isMasterData == null ? "无":CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(isMasterData);
+    }
+
     @ApiModelProperty("同步数据class")
     private String syncDataClass;
 

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java

@@ -36,12 +36,12 @@ public class MdmGearCoreBusiExtd extends BaseMdmBusiExtdBean {
 
     @Transient
     @ApiModelProperty("主数据Class")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    @AnnoOutputColumn(hidden = true)
     public static Class mdmMasterClass  = MdmGear.class;
 
     @Transient
     @ApiModelProperty("软件模块")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true)
     public static Integer mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue();
 
     @Column(name = "CORE_NUM")

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean;
+import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd;
 import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
 
 import java.util.List;
@@ -43,7 +44,17 @@ public class MdmHqlPack {
 
         DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(mdmGear.getName(),"name",ddlPackBean);
-        DdlPreparedPack.timeBuilder(mdmGear.getCreateDatetime(),"createDatetime",ddlPackBean,false,true);
+        DdlPreparedPack.timeBuilder(mdmGear.getModifyDatetime(),"modifyDatetime",ddlPackBean,false,true);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlMdmGearCoreExtd(MdmGearCoreBusiExtd mdmGear) {
+        DdlPackBean ddlPackBean = getMdmPackBean(mdmGear);
+
+        DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(mdmGear.getMdmMasterId(),"mdmMasterId",ddlPackBean);
+        DdlPreparedPack.timeBuilder(mdmGear.getModifyDatetime(),"modifyDatetime",ddlPackBean,false,true);
 
         return ddlPackBean;
     }

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java

@@ -527,7 +527,7 @@ public class DdlMdmModelPreparedPack {
     public static void getInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
         if (data != null) {
             packBean.addColumnQuery(entityType, "in_"+columnName,
-                    " and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data);
+                    " and " + entityType.getAlias() + "." + columnName + " in ( :" + entityType.getAlias() + "_in_" + columnName + " ) ", data);
         }
     }
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -56,4 +57,15 @@ public class MesPartCheck extends BaseBean implements Serializable {
     @ApiParam("校验表达式描述")
     private String recordNumDesc;
 
+    @Transient
+    @ApiParam("复核结果")
+    private Integer reviewResult = 1;
+
+    @Transient
+    @ApiParam("对象名称")
+    private String objectCodeName;
+
+    @Transient
+    @ApiParam("产线")
+    private String workCenterCode;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -79,6 +80,7 @@ public class MesPcnTask extends BaseBean implements Serializable {
     @ApiParam("任务周期描述")
     private String taskCycleDescription;
 
+    @Lob
     @Column(name = "TASK_PARAM")
     @ApiParam("任务参数")
     private String taskParam;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java

@@ -11,7 +11,10 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description :工步参数
@@ -49,4 +52,32 @@ public class MesStepParam extends BaseBean implements Serializable {
     @Column(name = "PARAM_ATTRIBUTE")
     @ApiParam("参数属性 text select")
     private String paramAttribute;
+
+    @Column(name = "EXHIBITION_KEY")
+    @ApiParam("展示key")
+    private String exhibitionKey;
+
+    @Column(name = "EXHIBITION_VALUE")
+    @ApiParam("展示value")
+    private String exhibitionValue;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("参数对象")
+    private String objectCode;
+
+    @Column(name = "TYPE")
+    @ApiParam("type")
+    private Integer type = 0;
+
+    @Transient
+    @ApiParam("可选值的数据")
+    private List<Map<String, Object>> enumList;
+
+    @Transient
+    @ApiParam("key的值")
+    private Object geValue;
+
+    @Transient
+    @ApiParam("value的值")
+    private Object geDescription;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java

@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Api("数据复核model")
-public class DataReviewStepModel {
+public class DataReviewModel {
 
     @ApiParam("关键件")
     private String itemPartNo;
@@ -25,5 +25,4 @@ public class DataReviewStepModel {
     @ApiParam("对象代码")
     private String objectCode;
 
-
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java

@@ -138,6 +138,15 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步弹框状态")
     private Boolean stepDialogStatus = false;
 
+    @ApiParam("是否按时完成")
+    private Integer isOnTimeComplete;
+
+    @ApiParam("工位剩余时间")
+    private Long remainWorkTime;
+
+    @ApiParam("是否操作超时")
+    private Integer isTimeOut;
+
     @ApiParam("特殊展示数据")
     private Map<String, Object> specialDisplayMap  = new HashMap<>();
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2987,4 +2987,23 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * MES AGV停机记录信息条件查询
+     * @param stopRecord
+     * @return
+     */
+    public static DdlPackBean getMesAgvRecoredData(MesAgvStopRecord stopRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        DdlPreparedPack.getStringEqualPack(stopRecord.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(stopRecord.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getNumEqualPack(stopRecord.getStopType(), "stopType", packBean);
+        DdlPreparedPack.getStringLikerPack(stopRecord.getProductSn(), "productSn", packBean);
+        DdlPreparedPack.getStringEqualPack(stopRecord.getPartNo(), "partNo", packBean);
+        if (!StringUtils.isEmpty(stopRecord.getStopStartTime()) || !StringUtils.isEmpty(stopRecord.getStopEndTime())) {
+            DdlPreparedPack.timeBuilder(stopRecord.getCreateDateTimeStart(), stopRecord.getCreateDateTimeEnd(),
+                    "stopStartTime", packBean, true);
+        }
+        return packBean;
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java

@@ -54,10 +54,16 @@ public class SysUser extends BaseBean {
     @ApiParam(value ="工号")
     private String userEmpNo;
 
+    @Deprecated // 废弃密码新 , 使用ID作为密码信息, 改密码作为数据传输使用
     @Column(name="USER_LOGIN_PASSWORD")
     @ApiParam(value ="登陆密码")
     private String userLoginPassword;
 
+    @Column(name="USER_LOGIN_PASSWORD_ID")
+    @ApiParam(value ="密码ID" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userLoginPasswordId;
+
     @Column(name="USER_TYPE")
     @ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
     private Integer userType;
@@ -78,6 +84,7 @@ public class SysUser extends BaseBean {
     @ApiParam(value ="登录次数",example = "0")
     private Integer userLoginNum;
 
+    @Deprecated
     @Column(name="USER_LOGIN_LAST_DATE_TIME")
     @ApiParam(value ="账号最后登录时间")
     private String userLoginLastDateTime;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-6-4 下午3:38
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_USER_PASSWORD")
+@Api(value="账号密码")
+public class SysUserPassword extends BaseBean {
+    private static final long serialVersionUID = 4536854582252378921L;
+
+    @Column(name="USER_ID")
+    @ApiParam(value ="人员ID" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
+
+    @Column(name="USER_PASSWORD")
+    @ApiParam(value ="用户密码")
+    private String userPassword;
+
+    @Column(name="USER_LOGIN_LAST_DATE_TIME")
+    @ApiParam(value ="账号最后登录时间")
+    private String userLoginLastDateTime;
+
+    public SysUserPassword() {
+    }
+
+    public SysUserPassword(Long userId, String userPassword) {
+        this.userId = userId;
+        this.userPassword = userPassword;
+    }
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java

@@ -10,9 +10,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
@@ -23,7 +23,7 @@ import javax.persistence.Table;
  * @Modify:
  **/
 @Data
-@Entity
+@Document
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -23,7 +24,7 @@ import javax.persistence.Table;
  * @Modify      :
  **/
 @Data
-@Entity
+@Document
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java

@@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -26,7 +27,7 @@ import javax.persistence.Table;
  * @Modify      :
  **/
 @Data
-@Entity
+@Document
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java

@@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -26,7 +27,7 @@ import javax.persistence.Table;
  * @Modify      :
  **/
 @Data
-@Entity
+@Document
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java

@@ -12,9 +12,9 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
@@ -25,7 +25,7 @@ import javax.persistence.Table;
  * @Modify      :
  **/
 @Data
-@Entity
+@Document
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java

@@ -1,14 +0,0 @@
-package cn.estsh.i3plus.pojo.platform.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
-
-/**
- * @Description : 定时任务执行记录
- * @Reference   :
- * @Author      : wei.peng
- * @Date        : 2018-10-22 12:03:01.409
- * @Modify      :
- **/
-public interface SysTaskTimeRecordingRepository extends BaseRepository<SysLogTaskTime, Long> {
-}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysUserPassword;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-6-4 下午3:46
+ * @Modify:
+ **/
+public interface SysUserPasswordRepository extends BaseRepository<SysUserPassword, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -1051,6 +1051,7 @@ public class CoreHqlPack {
         DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(),"refClass",packBean);
         DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(),"versionMethodName",packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(),"pojoCompare",packBean);
+        DdlPreparedPack.timeBuilder(bean.getModifyDatetime(),"modifyDatetime",packBean,false,true);
 
         return packBean;
     }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java

@@ -1,122 +1,122 @@
-package cn.estsh.i3plus.pojo.report.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @Description :
- * @Reference :
- * @Author : Adair Peng
- * @CreateDate : 2019-01-18 11:32
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name="BR_POJO_ATTR")
-@Api(value="对象属性",description = "对象属性")
-public class BrPojoAttr extends BaseBean {
-
-    private static final long serialVersionUID = -9025365832485707583L;
-    @Column(name="TEMPLATE_ID")
-    @ApiParam(value ="模板编号" ,example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long templateId;
-
-    @Column(name="SERVER_ID")
-    @ApiParam(value ="服务ID",example = "-1")
-    private Integer serverId;
-
-    @Column(name="POJO_ID")
-    @ApiParam(value ="模板对象ID" ,example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long pojoId;
-
-    @Column(name="POJO_NAME")
-    @ApiParam(value ="对象名称")
-    private String pojoName;
-
-    @Column(name="PACKAGE_NAME_RDD")
-    @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称")
-    private String packageNameRdd;
-
-    @Column(name="POJO_TABLE_NAME_ALIAS")
-    @ApiParam(value ="对象别名")
-    private String pojoTableNameAlias;
-
-    @Column(name="ATTR_COLUMN_NAME")
-    @ApiParam(value ="属性别名")
-    private String attrColumnName;
-
-    @Column(name="ATTR_COLUMN_NAME_ALIAS")
-    @ApiParam(value ="属性别名")
-    private String attrColumnNameAlias;
-
-    @Column(name="PARENT_ID")
-    @ApiParam(value ="上级ID",example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long parentId;
-
-    @Column(name="ATTR_TYPE")
-    @ApiParam(value ="属性类型",example = "-1")
-    private Integer attrType;
-
-    @Column(name="ATTR_REF_TYPE")
-    @ApiParam(value ="关系类型",example = "-1")
-    private Integer attrRefType;
-
-    @Column(name="DATA_TYPE")
-    @ApiParam(value ="数据类型",example = "-1")
-    private Integer dataType;
-
-    @Column(name="CHART_ATTR_NAME")
-    @ApiParam(value ="图标属性名称")
-    private String chartAttrName;
-
-    @Column(name="AGGREGATION_TYPE")
-    @ApiParam(value ="聚合类型",example = "-1")
-    private Integer aggregationType;
-
-    @Column(name="AGGREGATION_ID")
-    @ApiParam(value ="聚合类型",example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long aggregationId;
-
-    @Column(name="ATTR_SORT")
-    @ApiParam(value ="字段排序")
-    private Integer attrSort;
-
-    @Column(name="ATTR_DATA_SORT")
-    @ApiParam(value ="字段排序")
-    private Integer attrDataSort;
-
-    @Column(name="ATTR_STYLE")
-    @ApiParam(value ="字段样式")
-    private Integer attrStyle;
-
-    @Column(name="ATTR_STYLE_RDD")
-    @ApiParam(value ="字段样式")
-    private String attrStyleRdd;
-
-    @Column(name="ATTR_DEFAULT_VALUE")
-    @ApiParam(value ="属性默认值")
-    private String attrDefaultValue;
-
-    @Column(name="ATTR_SHOW")
-    @ApiParam(value ="属性是否显示",example = "-1")
-    private Integer attrShow;
-
-}
+//package cn.estsh.i3plus.pojo.report.bean;
+//
+//import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+//import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiParam;
+//import lombok.Data;
+//import lombok.EqualsAndHashCode;
+//import org.hibernate.annotations.DynamicInsert;
+//import org.hibernate.annotations.DynamicUpdate;
+//
+//import javax.persistence.Column;
+//import javax.persistence.Entity;
+//import javax.persistence.Table;
+//
+///**
+// * @Description :
+// * @Reference :
+// * @Author : Adair Peng
+// * @CreateDate : 2019-01-18 11:32
+// * @Modify:
+// **/
+//@Data
+//@Entity
+//@DynamicInsert
+//@DynamicUpdate
+//@EqualsAndHashCode(callSuper = true)
+//@Table(name="BR_POJO_ATTR")
+//@Api(value="对象属性",description = "对象属性")
+//public class BrPojoAttr extends BaseBean {
+//
+//    private static final long serialVersionUID = -9025365832485707583L;
+//    @Column(name="TEMPLATE_ID")
+//    @ApiParam(value ="模板编号" ,example = "-1")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long templateId;
+//
+//    @Column(name="SERVER_ID")
+//    @ApiParam(value ="服务ID",example = "-1")
+//    private Integer serverId;
+//
+//    @Column(name="POJO_ID")
+//    @ApiParam(value ="模板对象ID" ,example = "-1")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long pojoId;
+//
+//    @Column(name="POJO_NAME")
+//    @ApiParam(value ="对象名称")
+//    private String pojoName;
+//
+//    @Column(name="PACKAGE_NAME_RDD")
+//    @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称")
+//    private String packageNameRdd;
+//
+//    @Column(name="POJO_TABLE_NAME_ALIAS")
+//    @ApiParam(value ="对象别名")
+//    private String pojoTableNameAlias;
+//
+//    @Column(name="ATTR_COLUMN_NAME")
+//    @ApiParam(value ="属性别名")
+//    private String attrColumnName;
+//
+//    @Column(name="ATTR_COLUMN_NAME_ALIAS")
+//    @ApiParam(value ="属性别名")
+//    private String attrColumnNameAlias;
+//
+//    @Column(name="PARENT_ID")
+//    @ApiParam(value ="上级ID",example = "-1")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long parentId;
+//
+//    @Column(name="ATTR_TYPE")
+//    @ApiParam(value ="属性类型",example = "-1")
+//    private Integer attrType;
+//
+//    @Column(name="ATTR_REF_TYPE")
+//    @ApiParam(value ="关系类型",example = "-1")
+//    private Integer attrRefType;
+//
+//    @Column(name="DATA_TYPE")
+//    @ApiParam(value ="数据类型",example = "-1")
+//    private Integer dataType;
+//
+//    @Column(name="CHART_ATTR_NAME")
+//    @ApiParam(value ="图标属性名称")
+//    private String chartAttrName;
+//
+//    @Column(name="AGGREGATION_TYPE")
+//    @ApiParam(value ="聚合类型",example = "-1")
+//    private Integer aggregationType;
+//
+//    @Column(name="AGGREGATION_ID")
+//    @ApiParam(value ="聚合类型",example = "-1")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long aggregationId;
+//
+//    @Column(name="ATTR_SORT")
+//    @ApiParam(value ="字段排序")
+//    private Integer attrSort;
+//
+//    @Column(name="ATTR_DATA_SORT")
+//    @ApiParam(value ="字段排序")
+//    private Integer attrDataSort;
+//
+//    @Column(name="ATTR_STYLE")
+//    @ApiParam(value ="字段样式")
+//    private Integer attrStyle;
+//
+//    @Column(name="ATTR_STYLE_RDD")
+//    @ApiParam(value ="字段样式")
+//    private String attrStyleRdd;
+//
+//    @Column(name="ATTR_DEFAULT_VALUE")
+//    @ApiParam(value ="属性默认值")
+//    private String attrDefaultValue;
+//
+//    @Column(name="ATTR_SHOW")
+//    @ApiParam(value ="属性是否显示",example = "-1")
+//    private Integer attrShow;
+//
+//}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java

@@ -1,15 +1,15 @@
-package cn.estsh.i3plus.pojo.report.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.report.bean.BrMenu;
-import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr;
-
-/**
- * @Description :
- * @Reference :
- * @Author : Adair Peng
- * @CreateDate : 2019-01-18 15:03
- * @Modify:
- **/
-public interface BrPojoAttrRepository extends BaseRepository<BrPojoAttr,Long> {
-}
+//package cn.estsh.i3plus.pojo.report.repository;
+//
+//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+//import cn.estsh.i3plus.pojo.report.bean.BrMenu;
+//import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr;
+//
+///**
+// * @Description :
+// * @Reference :
+// * @Author : Adair Peng
+// * @CreateDate : 2019-01-18 15:03
+// * @Modify:
+// **/
+//public interface BrPojoAttrRepository extends BaseRepository<BrPojoAttr,Long> {
+//}

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

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : COI对照表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-09 16:59
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_COI")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="COI对照表",description = "COI对照表")
+public class WmsCoi extends BaseBean {
+
+    private static final long serialVersionUID = -8298385889006722335L;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @Column(name = "PART_VOL")
+    @ApiParam(value = "体积")
+    private Double partVol;
+
+    @Column(name = "TRUNROUND_RATE")
+    @ApiParam(value = "周转率")
+    private Double trunroundRate;
+
+    @Column(name = "COI_VALUE")
+    @ApiParam(value = "COI值")
+    private Double coiValue;
+
+    @Column(name = "LAST_UPDATE_DATE")
+    @ApiParam(value = "末次更新日期")
+    private String lastUpdateDate;
+
+    @Column(name = "FREQUENCY")
+    @ApiParam(value = "频次")
+    private Double frequency;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位")
+    private String locateNo;
+}

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

@@ -165,6 +165,26 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
     @AnnoOutputColumn(refClass = WmsEnumUtil.BH_LOCATE_TYPE.class, refForeignKey = "value", value = "description")
     private Integer bhLocateType;
 
+    @Column(name = "DOWN_X")
+    @ApiParam(value = "X向下偏移", example = "-1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description")
+    private Integer downX;
+
+    @Column(name = "UP_X")
+    @ApiParam(value = "X向上偏移", example = "-1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description")
+    private Integer upX;
+
+    @Column(name = "DOWN_Y")
+    @ApiParam(value = "Y向下偏移", example = "-1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description")
+    private Integer downY;
+
+    @Column(name = "UP_Y")
+    @ApiParam(value = "Y向上偏移", example = "-1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description")
+    private Integer upY;
+
     // 导入用
     @ApiParam(value = "工厂")
     @Transient

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

@@ -226,6 +226,11 @@ public class WmsPart extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description")
     private Integer isValuable;
 
+    @Column(name = "PART_VOL", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "体积", example = "1")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Double partVol;
+
     @Transient
     @ApiParam("总数量")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@@ -290,6 +295,11 @@ public class WmsPart extends BaseBean {
     public WmsPart() {
     }
 
+    public Double getPartVol() {
+        return partVol == null ? 0 : partVol;
+    }
+
+
     public Double getQty() {
         return qty == null ? 0 : qty;
     }

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

@@ -0,0 +1,126 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description : 策略表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-09 16:45
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_TRACTICS")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="策略表",description = "策略表")
+public class WmsTractics extends BaseBean {
+
+    private static final long serialVersionUID = -8203200560604263871L;
+    @Column(name="TRACTICS_CODE")
+    @ApiParam(value ="策略代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String tracticsCode;
+
+    @Column(name="TRACTICS_NAME")
+    @ApiParam(value ="策略名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String tracticsName;
+
+    @Column(name="TRACTICS_DESC")
+    @ApiParam(value ="策略描述")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String tracticsDesc;
+
+    @Column(name="TRACTICS_GRADE")
+    @ApiParam(value ="策略等级")
+ //   @AnnoOutputColumn(refClass = WmsEnumUtil.TRACTICS_GRADE.class, refForeignKey = "value", value = "description")
+//    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "TRACTICS_GRADE")
+    private Integer tracticsGrade;
+
+    @Column(name="TRACTICS_GROUP")
+    @ApiParam(value ="策略组")
+//    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "TRACTICS_GROUP")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRACTICS_GROUP.class, refForeignKey = "value", value = "description")
+    private Integer tracticsGroup;
+
+    @Column(name="TRACTICS_ITEM")
+    @ApiParam(value ="策略项")
+//    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer tracticsItem;
+
+    @Column(name="TRACTICS_PART_GROUP")
+    @ApiParam(value ="策略适用物料组")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup",
+            searchColumnName = "partGroupNo,partGroupName", listColumnName = "partGroupNo,partGroupName", explicitColumnName = "partGroupNo")
+    private String tracticsPartGroup;
+
+    @Column(name="TRACTICS_ZONE")
+    @ApiParam(value ="策略适用存储区")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+            searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
+    private String tracticsZone;
+
+    @Column(name="TRACTICS_PARAM")
+    @ApiParam(value ="参数")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String tracticsParam;
+
+    @Column(name="TRACTICS_START_TIME")
+    @ApiParam(value ="策略生效日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
+    private String tracticsStartTime;
+
+    @Column(name="TRACTICS_END_TIME")
+    @ApiParam(value ="策略失效日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
+    private String tracticsEndTime;
+
+    @Column(name="LEV1_STRATEGY")
+    @ApiParam(value ="1级策略上架")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_ONE")
+    private Integer lev1Strategy;
+
+//    @Column(name="LEV1_STRATEGY")
+    @Transient
+    @ApiParam(value ="1级策略拣货")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PICKING_TRACTICS_ITEM_ONE")
+    private Integer lev1StrategyPicking;
+
+    @Column(name="LEV2_STRATEGY")
+    @ApiParam(value ="2级策略")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_TWO.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_TWO")
+    private Integer lev2Strategy;
+
+    @Column(name="LEV3_STRATEGY")
+    @ApiParam(value ="3级策略")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_THREE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_THREE")
+    private Integer lev3Strategy;
+
+//    public String getIev1StrategyPicking (String lev1StrategyPicking) {
+//        return this.lev1Strategy = lev1StrategyPicking;
+//    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsTractics;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-15 13:21
+ * @Modify:
+ **/
+@Data
+@Api("策略返回model")
+public class WmsStrategyModel {
+
+    @ApiParam(value = "物料编号")
+    private String partNo;
+
+    @ApiParam(value = "数量")
+    private Double qty;
+
+    @ApiParam(value = "工厂代码")
+    private String organizeCode;
+
+    @ApiParam("策略对象")
+    public WmsTractics wmsTractics;
+
+    @ApiParam("List结果集")
+    public List<Object> resultList;
+
+    @ApiParam("List结果集")
+    public List<Object> strategyList;
+
+    @ApiParam("返回错误信息")
+    public String errorMsg;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCoiRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsCoi;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : COI对照表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-10 10:24
+ * @Modify:
+ **/
+@Repository
+public interface WmsCoiRepository extends BaseRepository<WmsCoi,Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTracticsRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTractics;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 策略表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-10 10:24
+ * @Modify:
+ **/
+@Repository
+public interface WmsTracticsRepository extends BaseRepository<WmsTractics,Long>{
+}