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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java

@@ -51,10 +51,12 @@ public class AndonCellAlarmCause extends BaseBean  implements Serializable {
     @ApiParam(value = "事件描述")
     private String acCode;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "安灯类型名称")
     private String alarmCodeName;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "呼叫原因描述")
     private String acName;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java

@@ -45,4 +45,7 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
     private boolean errorInnerAction = false;
 
+    @ApiModelProperty("默认异常入库")
+    private boolean errorInsertFlag = true;
+
 }

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

@@ -66,7 +66,7 @@ public class Material extends BaseAPS {
     private String purchaseLeadTime;
 
     @Column(name="MANUF_LEAD_TIME")
-    @ApiParam(value ="制造提前期")
+    @ApiParam(value ="生产提前期")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String manufLeadTime;
 
@@ -80,7 +80,7 @@ public class Material extends BaseAPS {
     private Integer unitPurchase;
 
     @Column(name="UNIT_MANUF")
-    @ApiParam(value ="单位制造量")
+    @ApiParam(value ="单位生产量")
     private Integer unitManuf;
 
     @Column(name="UNIT_SHIPMENT")
@@ -99,16 +99,16 @@ public class Material extends BaseAPS {
     private Boolean autoFixPegging;
 
     @Column(name="MAX_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="最大制造批量")
+    @ApiParam(value ="最大生产批量")
     private Double maxProductBatch;
 
     @Column(name="MIN_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="最小制造批量")
+    @ApiParam(value ="最小生产批量")
     @FieldAnnotation(defaultValue = "0.0")
     private Double minProductBatch;
 
     @Column(name="UNIT_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="制造批量单位")
+    @ApiParam(value ="生产批量单位")
     private Double UnitProductBatch;
 
     @Column(name="MAX_PUR_BATCH", columnDefinition = "decimal(18,8)")
@@ -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

@@ -195,7 +195,7 @@ public class ApsEnumUtil {
     public enum MATERIAL_ASSIGN_LIMIT {
         INVENTORY(1, "库存制约"),
         PURCHASE(2, "采购制约"),
-        PRODUCT(4, "制造制约");
+        PRODUCT(4, "生产制约");
 
         private int value;
         private String description;
@@ -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/BlockSoftSwitchEnumUtil.java

@@ -876,7 +876,8 @@ public class BlockSoftSwitchEnumUtil {
         SUIT_MESSAGE(10, "适配信息"),
         REQUEST_ORGIN_PARAM(20,  "请求原始参数"),
         ORIGINAL_MESSAGE(30,  "原始报文"),
-        CONVERTED_MESSAGE(40,  "转换报文");
+        CONVERTED_MESSAGE(40,  "转换报文"),
+        SUIT_SEND_MESSAGE(50,  "适配发送报文");
 
         private int value;
         private String description;

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

@@ -1903,7 +1903,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;
@@ -3482,6 +3483,7 @@ public class MesEnumUtil {
         PACKAGE_SCAN(35, "打包扫描"),
         INSTOCKED(40, "入库"),
         SHIPING(50, "发运"),
+        REDO(60, "重做"),
         CLOSE(90, "关闭"),
         ;
 
@@ -3829,7 +3831,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;
@@ -5742,16 +5745,18 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PLC_DATA_TYPE {
-
+        STRING("10", "String", "字符串"),
-        INT("int", "数字"),
+        BOOLEAN("20","Boolean",  "布尔"),
-        STRING("string", "字符串"),
+        WORD("30", "Word", "整形-Word"),
-        BOOLEAN("boolean", "布尔");
+        DWORD("40","Dword",  "整形-DWord");
 
         private String value;
+        private String code;
         private String description;
 
-        PLC_DATA_TYPE(String value, String description) {
+        PLC_DATA_TYPE(String value, String code,String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -6240,4 +6245,85 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 扭矩采集 黄枪规则(10-继续采集扭矩，20-发送下一个组合码)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum YELLOW_GUN_RULE {
+        COLLECT_TORQUE(10, "继续采集扭矩"),
+        SEND_NEXT_GROUP_CODE(20, "发送下一个组合码");
+
+        private int value;
+        private String description;
+
+        YELLOW_GUN_RULE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 停机类型
+     */
+    @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

@@ -2376,6 +2376,7 @@ public class MesPcnEnumUtil {
         PACKAGE_SCAN(35, "打包扫描"),
         INSTOCKED(40, "入库"),
         SHIPPING(50, "发运"),
+        REDO(60, "重做"),
         CLOSE(90, "关闭");
 
         private int value;
@@ -2520,7 +2521,9 @@ public class MesPcnEnumUtil {
         STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
         RUNNING_INFO("runningInfo", "执行信息"),
         STOP_PCS_CTL("stopPcsCtl", "停止监控"),
-        RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
+        RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"),
+        PROCESS_CONTENT("processContent", "过程组件内容"),
+        TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容");
 
         private String value;
         private String description;
@@ -3396,6 +3399,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FSM_STATE_TYPE {
         BEGIN(10, "begin", "开始状态点"),
+        BACK(20, "back", "回退状态点"),
         END(40, "end", "结束状态点");
 
         private int value;
@@ -3598,7 +3602,8 @@ public class MesPcnEnumUtil {
         START(10, "START", "开始状态"),
         EXECUTING(20, "EXECUTING", "执行中状态"),
         TERMINATE(30, "TERMINATE", "中断状态"),
-        FINISH(40, "FINISH", "完成状态");
+        FINISH(40, "FINISH", "完成状态"),
+        BACK(99, "BACK", "回退状态");
 
         private int value;
         private String code;
@@ -3770,40 +3775,6 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * 扭矩采集 黄枪规则(10-继续采集扭矩，20-发送下一个组合码)
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum YELLOW_GUN_RULE {
-        COLLECT_TORQUE(10, "继续采集扭矩"),
-        SEND_NEXT_GROUP_CODE(20, "发送下一个组合码");
-
-        private int value;
-        private String description;
-
-        YELLOW_GUN_RULE(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        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;
-        }
-    }
-    /**
      * 界面类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -4102,18 +4073,18 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * 停机类型
+     * plc状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STOP_MACHINE_TYPE {
+    public enum MES_PLC_STATUS {
-        TIMER_TIME_OUT(10, "计时器超时停机"),
+
-        DELAY_HELP(20, "延时帮助停机"),
+        UN_CONNECT(0, "断开"),
-        URGENT_STOP(30, "急停停机");
+        CONNECT(1, "连接");
 
         private int value;
         private String description;
 
-        STOP_MACHINE_TYPE(int value, String description) {
+        MES_PLC_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }

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

@@ -11,6 +11,31 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class PtlEnumUtil {
 
     /**
+     * 方法类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PTL_METHOD_TYPE {
+        INTERFACE(10, "界面方法"),
+        MONITOR(20, "监听方法");
+
+        private int value;
+        private String description;
+
+        PTL_METHOD_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 流程状态-触发类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -3,8 +3,6 @@ package cn.estsh.i3plus.pojo.base.enumutil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.util.StringUtils;
 
-import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_MESSAGE_TYPE.*;
-
 /**
  * @author Wynne.Lu
  * @date 2020/2/12 17:41
@@ -732,164 +730,6 @@ public class PtlPcnEnumUtil {
     }
 
     /**
-     * 监听消息类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MONITOR_PROCESS_MESSAGE_TYPE {
-        CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
-        DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
-        EXCEPTION_DISCONNECT_CONTROL_CMD(25, "EXCEPTION_DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
-        LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"),
-        LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"),
-        CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"),
-        INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回"),
-        REFRESH_CONTROL_CMD(70, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新");
-
-        private int value;
-        private String code;
-        private String callClass;
-        private String description;
-
-        MONITOR_PROCESS_MESSAGE_TYPE(int value, String code, String callClass, String description) {
-            this.value = value;
-            this.code = code;
-            this.callClass = callClass;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public String getCallClass() {
-            return callClass;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static MONITOR_PROCESS_MESSAGE_TYPE getTypeByValue(String code) {
-            if (StringUtils.isEmpty(code)) {
-                return null;
-            }
-            for (MONITOR_PROCESS_MESSAGE_TYPE enums : values()) {
-                if (enums.getCode().equals(code)) {
-                    return enums;
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
-     * 界面消息类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum INTERFACE_SIGNAL_MESSAGE_TYPE {
-        CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
-        DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
-        REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"),
-        SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"),
-        INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面");
-//        UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"),
-//        LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"),
-//        LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细");
-
-        private int value;
-        private String code;
-        private String callClass;
-        private String description;
-
-        INTERFACE_SIGNAL_MESSAGE_TYPE(int value, String code, String callClass, String description) {
-            this.value = value;
-            this.code = code;
-            this.callClass = callClass;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getCallClass() {
-            return callClass;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) {
-            if (StringUtils.isEmpty(code)) {
-                return null;
-            }
-            for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) {
-                if (enums.getCode().equals(code)) {
-                    return enums;
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
-     * 任务消息类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum GEN_TASK_MESSAGE_TYPE {
-        GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务");
-
-        private int value;
-        private String code;
-        private String callClass;
-        private String description;
-
-        GEN_TASK_MESSAGE_TYPE(int value, String code, String callClass, String description) {
-            this.value = value;
-            this.code = code;
-            this.callClass = callClass;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getCallClass() {
-            return callClass;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) {
-            if (StringUtils.isEmpty(code)) {
-                return null;
-            }
-            for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) {
-                if (enums.getCode().equals(code)) {
-                    return enums;
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
      * websocket业务类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -1441,7 +1281,7 @@ public class PtlPcnEnumUtil {
     }
 
     /**
-     * mes-pcn定时任务同步结果状态
+     * ptl-pcn定时任务同步结果状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PTL_PCN_TASK_SYNC_STATUS {
@@ -1743,4 +1583,40 @@ public class PtlPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 同步标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SYNC_FLAG {
+
+        UNSYNC(1, "未同步"),
+        SYNCED(2, "已同步");
+
+        private int value;
+        private String description;
+
+        SYNC_FLAG(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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/SwebEnumUtil.java

@@ -589,7 +589,8 @@ public class SwebEnumUtil {
         UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
         TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
         EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
-        LOADING_ORDER(530, "LOADING_ORDER", "装车单");
+        LOADING_ORDER(530, "LOADING_ORDER", "装车单"),
+        SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途");
         private int value;
         private String code;
         private String description;
@@ -646,4 +647,97 @@ public class SwebEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 单据条码状态（PO/DOC_MOVE）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_SN_STATUS {
+        CREATE(10, "N", "创建"),
+        RECEIPTED(20, "R", "已完成"),
+        CANCEL(30, "C", "行取消"),
+        PRINTED(40, "C", "已打印");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ORDER_SN_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=实物条码，20=虚拟条码
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_STOCK_TYPE {
+        SOURCE(10, "实物条码"),
+        TARGET(20, "虚拟条码"),
+        CUST_SN(30, "客户条码");
+
+        private int value;
+        private String description;
+
+        ORDER_STOCK_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) {
+            return valueOf(val);
+        }
+    }
 }

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

@@ -725,7 +725,8 @@ public class WmsEnumUtil {
         UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
         TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
         EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
-        LOADING_ORDER(530, "LOADING_ORDER", "装车单");
+        LOADING_ORDER(530, "LOADING_ORDER", "装车单"),
+        SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途");
         private int value;
         private String code;
         private String description;
@@ -7472,4 +7473,642 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+    /**
+     * BH同步标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_SUMMARY_IS_SYNC {
+        INIT(10, "INIT", "初始化"),
+        WAIT_SYNC(20, "WAIT_SYNC", "待同步"),
+        FINISH_SYNC(30, "FINISH_SYNC", "已同步");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BH_SUMMARY_IS_SYNC(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 BH_SUMMARY_IS_SYNC 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 SCAN_CATEGORY {
+        ASN(10, "wmsDoMovementMasterRepository", "ASN"),
+        PO(20, "wmsDoMovementMasterRepository", "PO"),
+        SO(30, "wmsDoMovementMasterRepository", "SO"),
+        MOVE(40, "wmsDoMovementMasterRepository", "移库单"),
+        IN_STOCK(50, "wmsDoMovementMasterRepository", "入库单"),
+        SHIPPING(60, "wmsDoMovementMasterRepository", "发运单"),
+        QC(70, "wmsDoMovementMasterRepository", "质检单"),
+        CS(80, "wmsCSOrderMasterRepository", "盘点单"),
+        SN(90, "wmsStockSnRepository", "条码"),
+        PO_SN(100, "wmsPoSnRepository", "收货条码");
+
+        private int value;
+        private String code;
+        private String description;
+
+        SCAN_CATEGORY(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 SCAN_CATEGORY getByDesc(String desc) {
+            SCAN_CATEGORY tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+
+        public static SCAN_CATEGORY 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_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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java

@@ -98,4 +98,8 @@ public class IfQcOrder extends BaseBean  implements Serializable {
     @ApiParam("检测类型")
     private Integer checkType;
 
+    @Column(name = "CUST_DELIERY_LOCATION")
+    @ApiParam("客户发运地")
+    private String custDelieryLocation;
+
 }

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

@@ -88,6 +88,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @ApiParam("是否允许让步")
     private Integer isConcession = 0;
 
+    @Column(name = "NUMBER_FLAG")
+    @ApiParam("数量标识")
+    private String numberFlag;
+
     @Transient
     @ApiParam("检测类型名称")
     private String checkTypeName;

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

@@ -100,6 +100,10 @@ public class MesQcOrder extends BaseBean  implements Serializable {
     @ApiParam("发运时间")
     private String deliveryDate;
 
+    @Column(name = "CUST_DELIERY_LOCATION")
+    @ApiParam("客户发运地")
+    private String custDelieryLocation;
+
     @ApiParam(value = "检测结果")
     @Transient
     private String reulstStatus;

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

@@ -82,7 +82,7 @@ public class MesQcOrderDetail extends BaseBean  implements Serializable {
 
     @ApiParam(value = "已完成数量")
     @Transient
-    private Integer finishQty;
+    private Integer finishQty = 0;
 
     @ApiParam(value = "检测项类型名称")
     @Transient

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

@@ -88,35 +88,35 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
 
     @Column(name = "PEST1")
     @ApiParam("PEST编码1")
-    private Integer pest1;
+    private String pest1;
 
     @Column(name = "PEST2")
     @ApiParam("PEST编码2")
-    private Integer pest2;
+    private String pest2;
 
     @Column(name = "PEST3")
     @ApiParam("PEST编码3")
-    private Integer pest3;
+    private String pest3;
 
     @Column(name = "PEST4")
     @ApiParam("PEST编码4")
-    private Integer pest4;
+    private String pest4;
 
     @Column(name = "PEST5")
     @ApiParam("PEST编码5")
-    private Integer pest5;
+    private String pest5;
 
     @Column(name = "PEST6")
     @ApiParam("PEST编码6")
-    private Integer pest6;
+    private String pest6;
 
     @Column(name = "PEST7")
     @ApiParam("PEST编码7")
-    private Integer pest7;
+    private String pest7;
 
     @Column(name = "PEST8")
     @ApiParam("PEST编码8")
-    private Integer pest8;
+    private String pest8;
 
     @Column(name = "TORQUE_NO")
     @ApiParam("扭矩枪编号")
@@ -161,4 +161,8 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
     @Column(name = "IS_END_SEQ")
     @ApiParam("是否截至顺序号")
     private Integer isEndSeq;
+
+    @Column(name = "MULTIMEDIA_PLUG_QTY")
+    @ApiParam("多媒体插头数量")
+    private Double multimediaPlusQty;
 }

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

@@ -78,6 +78,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     @ApiParam("状态类型 10=初始化状态")
     private Integer statusType;
 
+    @Column(name = "SEQ")
+    @ApiParam("状态点顺序")
+    private Integer seq;
+
     @Transient
     @ApiParam("状态点是否完成")
     private boolean isComplete;

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/bean/MesSubPart.java

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/7 15:20
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SUB_PART")
+@Api("数据同步死信")
+public class MesSubPart extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 4636507477301700549L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name = "SUB_PART_NO")
+    @ApiParam("替代料")
+    private String subPartNo;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java

@@ -99,7 +99,7 @@ public class MesInterfaceDataMapper extends BaseBean {
 
     /**
      * 接口分组名称
-     * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS
+     * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS,WMS2MES
      */
     @Column(name = "GROUP_NAME")
     public String groupName;

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,16 @@ public class DataReviewStepModel {
     @ApiParam("对象代码")
     private String objectCode;
 
+    @ApiParam("对象名称")
+    private String objectCodeName;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("复核结果")
+    private Integer reviewResult;
+
+    @ApiParam("补录操作")
+    private Integer supplementaryOperate;
 
 }

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

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class PlcEquStatusModel implements Serializable {
+
+    // 主站/从站
+    @ApiParam("站位")
+    private String stationPosition;
+
+    // 站位IP
+    @ApiParam("IP地址")
+    private String ipAddress;
+
+    // IP状态 -- 连接/断开
+    @ApiParam("IP状态")
+    private Integer ipStatus;
+
+    // 电检设备名称
+    @ApiParam("电检设备名称")
+    private String electricalEqu;
+
+    // 电检设备状态哦 -- 连接/断开
+    @ApiParam("电检设备状态")
+    private Integer electricalEquStatus;
+
+    // 产线状态
+    @ApiParam("产线状态")
+    private Integer workCenterStatus;
+
+    @ApiParam("停机类型")
+    private Integer stopType;
+
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("停机开始时间")
+    private String stopStartTime;
+
+    @ApiParam("停机结束时间")
+    private String stopEndTime;
+
+    @ApiParam("停机原因")
+    private String stopReason;
+}

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

@@ -54,4 +54,39 @@ public class ProductInfoManageModel {
 
     @ApiParam("切换时间")
     private String switchTime;
+
+    @ApiParam("工厂")
+    private String organizeCode;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("队列类型")
+    private Integer queueType;
+
+    @ApiParam("工单类型")
+    private String workType;
+
+    @ApiParam("待生产序列")
+    private Integer prodNum;
+
+    @ApiParam("主队列序列")
+    private Double queueSeq;
+
+    @ApiParam("明细队列序列")
+    private Double queDetailSeq;
+
+    public ProductInfoManageModel() {
+    }
+
+    public ProductInfoManageModel(String vinCode, String prodCfgTypeCode, String gradeCode, String produceColor, Double queDetailSeq) {
+        this.vinCode = vinCode;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.gradeCode = gradeCode;
+        this.produceColor = produceColor;
+        this.queDetailSeq = queDetailSeq;
+    }
 }

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

@@ -0,0 +1,89 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/6/8 1:22 下午
+ * @Modify:
+ */
+@Data
+public class ScatterPartProdCfgModel {
+
+    private Long id;
+
+    private String organizeCode;
+
+    @ApiParam("配置编号")
+    private String cfgId;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("车型标志值")
+    private String modelFalgValue;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("等级代码")
+    private String gradeCode;
+
+    @ApiParam("颜色代码")
+    private String colorCode;
+
+    @ApiParam("标志位")
+    private Integer partFlagLocation;
+
+    @ApiParam("标志值")
+    private String partFlagValue;
+
+    @ApiParam("防错码")
+    private String pokeYokeFix;
+
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @ApiParam("确认扫描次数")
+    private Integer checkScanCount;
+
+    @ApiParam("组合码发送顺序")
+    private Integer sendSeq;
+
+    @ApiParam("黄枪规则")
+    private Integer yellowGunRule;
+
+    @ApiParam("是否截至顺序号")
+    private Integer isEndSeq;
+
+    @ApiParam("多媒体插头数量")
+    private Double multimediaPlusQty;
+
+    public ScatterPartProdCfgModel() {}
+
+    public ScatterPartProdCfgModel(Long id, String workCenterCode, String workCellCode, String partNo, String partName
+            , String gradeCode, String colorCode, String prodCfgTypeCode, String produceCtgyCode, Double multimediaPlusQty) {
+        this.id = id;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.gradeCode = gradeCode;
+        this.colorCode = colorCode;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.produceCtgyCode = produceCtgyCode;
+        this.multimediaPlusQty = multimediaPlusQty;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EquOperationStatusMonitorRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipment;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface EquOperationStatusMonitorRepository extends BaseRepository<MesEquipment, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesSubPart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/7 15:23
+ * @desc
+ */
+@Repository
+public interface MesSubPartRepository extends BaseRepository<MesSubPart, Long> {
+}

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

@@ -2937,4 +2937,68 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 物料校验项
+     * @param partCheck
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesPartCheck(MesPartCheck partCheck, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(partCheck, organizeCode);
+        if (!StringUtils.isEmpty(partCheck.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(partCheck.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(partCheck.getObjectCode())) {
+            DdlPreparedPack.getStringEqualPack(partCheck.getObjectCode(), "objectCode", packBean);
+        }
+        return packBean;
+    }
+
+
+    /**
+     * 过程质量检测数据
+     *
+     * @param qcOrderDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesQcOrderDetailData(MesQcOrderDetail qcOrderDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode);
+        if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
+            DdlPreparedPack.getStringRightLikerPack(qcOrderDetail.getOrderNo(), "orderNo", packBean);
+        }
+        if (qcOrderDetail.getCheckType() != null) {
+            DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean);
+        }
+        if (!StringUtils.isEmpty(qcOrderDetail.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(qcOrderDetail.getSerialNumber(), "serialNumber", packBean);
+        }
+        if (!StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    qcOrderDetail.getCreateDateTimeStart(),
+                    qcOrderDetail.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java

@@ -91,7 +91,7 @@ public class MesPcnHqlPack {
      * @param mesLabelTemplate
      * @return
      */
-    public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) {
+    public static DdlPackBean getLabelTemplate(MesLabelTemplate mesLabelTemplate) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean();
         DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
         return packBean;
@@ -119,17 +119,17 @@ public class MesPcnHqlPack {
      * @param rawPartSn
      * @return
      */
-    public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) {
+    public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) {
         DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean);
         DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean);
-        DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean);
+        DdlPreparedPack.getStringEqualPack(rawPartNo, "itemPartNo", packBean);
         return packBean;
     }
 
-    public static DdlPackBean getStationBom(String org,String workCenter,String workCell,String partNo) {
+    public static DdlPackBean getStationBom(String org, String workCenter, String workCell, String partNo) {
         DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(workCenter, "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(workCell, "workCellCode", packBean);
@@ -183,7 +183,7 @@ public class MesPcnHqlPack {
         }
 
         // 工单管理，查询下达，启动，暂停状态
-        if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())){
+        if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())) {
             DdlPreparedPack.getInPackList(mesWorkOrder.getStatusList(), "workOrderStatus", packBean);
         }
 
@@ -319,6 +319,7 @@ public class MesPcnHqlPack {
 
     /**
      * 按条件分页查询产品条码补打印数据
+     *
      * @param mesProduceSn
      * @return
      */
@@ -358,6 +359,7 @@ public class MesPcnHqlPack {
 
     /**
      * 按条件分页查询包装条码补打印数据
+     *
      * @param mesPackage
      * @return
      */
@@ -420,9 +422,9 @@ public class MesPcnHqlPack {
     }
 
 
-
     /**
      * 按条件分页查询类型信息数据
+     *
      * @param typeCfg
      * @return
      */
@@ -454,8 +456,8 @@ public class MesPcnHqlPack {
         DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getCheckType(), "checkType", packBean);
         DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getCheckItemType(), "checkItemType", packBean);
-        if(mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()){
+        if (mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()) {
-            DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty()+1, "itemNo", packBean);
+            DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty() + 1, "itemNo", packBean);
         }
         return packBean;
     }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java

@@ -56,6 +56,12 @@ public class SuitClientModel implements Serializable {
     private String suitMessage;
 
     /**
+     * 适配发送报文信息
+     */
+    @XStreamCDATA
+    private String suitSendMessage;
+
+    /**
      * 请求来源
      */
     private Integer requestSource;

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

@@ -62,11 +62,36 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam(value = "关联单据类型")
     public String refType;
 
+    @ApiParam(value = "erp单号")
+    public String erpSrcNo;
+
+    @ApiParam(value = "工厂代码")
+    public String organizeCode;
+
     public WmsTaskInfoModel() {
     }
 
     public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
                             String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo,
+                            String createDatetime, String srcZoneNo, String createUser, String organizeCode) {
+        this.orderNo = orderNo;
+        this.taskStatus = taskStatus;
+        this.opTypeName = opTypeName;
+        this.transTypeCode = transTypeCode;
+        this.refSrc = refSrc;
+        this.busiTypeCode = busiTypeCode;
+        this.zdate = zdate;
+        this.ztime = ztime;
+        this.custNo = custNo;
+        this.vendorNo = vendorNo;
+        this.createDatetime = createDatetime;
+        this.srcZoneNo = srcZoneNo;
+        this.createUser = createUser;
+        this.organizeCode = organizeCode;
+    }
+
+    public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
+                            String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo,
                             String createDatetime, String srcZoneNo, String createUser) {
         this.orderNo = orderNo;
         this.taskStatus = taskStatus;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.ptl.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;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "IF_PICK_DATA")
+@EqualsAndHashCode(callSuper = true)
+@Api("IF_拣货数据")
+public class IfPickData extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1057633269490937118L;
+
+    @Column(name = "AREA_NO")
+    @ApiParam("区域代码")
+    private String areaNo;
+
+    @Column(name = "SECTION_NO")
+    @ApiParam("区段编号")
+    private String sectionNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编号")
+    private String partNo;
+
+    @Column(name = "QTY")
+    @ApiParam("拣货数量")
+    private Integer qty;
+
+    @Column(name = "SYNC_FLAG")
+    @ApiParam("同步标识")
+    private Integer syncFlag;
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.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;
 
 /**
@@ -47,7 +48,11 @@ public class PtlAreaActorAction extends BaseBean implements Serializable {
     @ApiParam("特定条件")
     private String otherWhere;
 
-    @Column(name = "AMG_ID")
+    @Column(name = "METHOD_CODE")
-    @ApiParam("组件集编号")
+    @ApiParam("方法代码")
-    private Long amgId;
+    private String methodCode;
+
+    @Transient
+    @ApiParam("实现类")
+    private String callClass;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.ptl.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;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/2/14 11:18
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "PTL_METHOD")
+@EqualsAndHashCode(callSuper = true)
+@Api("方法清单")
+public class PtlMethod extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1208980343927922927L;
+
+    @Column(name = "METHOD_CODE")
+    @ApiParam("方法代码")
+    private String methodCode;
+
+    @Column(name = "METHOD_NAME")
+    @ApiParam("方法描述")
+    private String methodName;
+
+    @Column(name = "CALL_CLASS")
+    @ApiParam("实现类")
+    private String callClass;
+
+    @Column(name = "METHOD_TYPE")
+    @ApiParam("方法类型")
+    private Integer methodType;
+
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java

@@ -51,4 +51,7 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
     private boolean errorInnerAction = false;
 
+    @ApiModelProperty("默认异常入库")
+    private boolean errorInsertFlag = true;
+
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/IfPickDataRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.IfPickData;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+public interface IfPickDataRepository extends BaseRepository<IfPickData, Long> {
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaActorActionRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaActorAction;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+public interface PtlAreaActorActionRepository extends BaseRepository<PtlAreaActorAction, Long> {
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMethodRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlMethod;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+public interface PtlMethodRepository extends BaseRepository<PtlMethod, Long> {
+
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -9,6 +11,7 @@ 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;
@@ -41,15 +44,21 @@ public class BsSuitCaseDataSourceTable extends BaseBean {
 
     @Column(name = "OPERATE_TYPE_ID")
     @ApiParam(value = "操作类型")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.DATABASE_OPERATE_TYPE.class)
     private Integer operateTypeId;
 
-    public int getOperateTypeIdVal(){
+    public int getOperateTypeIdVal() {
-        if(operateTypeId == null){
+        if (operateTypeId == null) {
             return -1;
         }
         return operateTypeId.intValue();
     }
 
+
+    public String getOperateTypeIdTxt() {
+        return operateTypeId == null ? "无" : BlockSoftSwitchEnumUtil.DATABASE_OPERATE_TYPE.valueOfDescription(operateTypeId);
+    }
+
     @Column(name = "EXECUTE_SQL")
     @ApiParam(value = "执行sql")
     private String executeSql;
@@ -62,8 +71,8 @@ public class BsSuitCaseDataSourceTable extends BaseBean {
     @ApiParam(value = "是否有返回")
     private Integer isReturn;
 
-    public int getIsReturnVal(){
+    public int getIsReturnVal() {
-        if(isReturn == null){
+        if (isReturn == null) {
             return -1;
         }
         return isReturn.intValue();

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java

@@ -46,12 +46,20 @@ public class BsSuitCaseREST extends BaseBean {
     @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class)
     private Integer requestMethodId;
 
+    public String getRequestMethodIdTxt(){
+        return requestMethodId == null ? "无" : CommonEnumUtil.HTTP_METHOD_TYPE.valueOfDescription(requestMethodId);
+    }
+
     //CommonEnumUtil.TRUE_OR_FALSE
     @Column(name = "IS_REQUEST_BODY")
     @ApiParam(value = "是否使用requestBody")
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
     private Integer isRequestBody;
 
+    public int getIsRequestBodyVal() {
+        return isRequestBody == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isRequestBody;
+    }
+
     @Transient
     @ApiParam(value = "请求头转换")
     private List<BsSuitCaseParam> requestHeaderList;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -120,6 +120,11 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "适配信息 longDataId")
     private String suitMessage;
 
+    // 移动至记录数据表
+    @Column(name = "SUIT_SEND_MESSAGE")
+    @ApiParam(value = "适配发送报文")
+    private String suitSendMessage;
+
     @Column(name = "PROCESS_STATE")
     @ApiParam(value = "处理状态")
     private Integer processState;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java

@@ -132,6 +132,14 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @ApiParam("是否为钢卷料")
     private Integer isSteel;
 
+    @Column(name = "PLAN_DATE")
+    @ApiParam("计划交货日期")
+    private String planDate;
+
+    @Column(name = "PLAN_TIME")
+    @ApiParam("计划交货时间")
+    private String planTime;
+
     /**
      * 不冗余主表数据
      */

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -179,6 +179,7 @@ public class SwebHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(master, result);
     }

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

@@ -118,7 +118,36 @@ public class SapDocFgSum extends BaseBean {
     @Transient
     public Long wdfdId;
 
+    @Column(name = "BOM_VERSION")
+    @ApiParam(value = "BOM版本号")
+    private String bomVersion;
+
+    @Column(name = "FG_ORDER_NO")
+    @ApiParam(value = "产品报工orderNo")
+    private String fGOrderNo;
+
     public SapDocFgSum(){}
+
+    public SapDocFgSum(Long wdfdId, Double qty, String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo,
+                       String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, String effStartTime, String bomVersion, String fGOrderNo) {
+        this.wdfdId = wdfdId;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.unit = unit;
+        this.erpWorkCenter = erpWorkCenter;
+        this.inAreaNo = inAreaNo;
+        this.itemPartNo = itemPartNo;
+        this.itemPartName = itemPartName;
+        this.itemUnit = itemUnit;
+        this.outAreaNo = outAreaNo;
+        this.itemQty = itemQty;
+        this.src = src;
+        this.isLock = isLock;
+        this.effStartTime = effStartTime;
+        this.bomVersion = bomVersion;
+        this.fGOrderNo = fGOrderNo;
+    }
     public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo,
                        String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) {
         this.wdfdId = wdfdId;

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

@@ -113,6 +113,16 @@ public class WmsBom extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String terminalNo;
 
+    @Column(name = "SEQ_NO")
+    @ApiParam(value = "父位置号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String seqNo;
+
+    @Column(name = "ITEM_SEQ_NO")
+    @ApiParam(value = "子位置号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String itemSeqNo;
+
 
     @Column(name = "BOM_TYPE")
     @ApiParam(value = "BOM类型")

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/WmsCsStrategy.java

@@ -44,7 +44,7 @@ public class WmsCsStrategy extends BaseBean implements Serializable {
     @Column(name = "part_type")
     @ApiParam(value = "物料分类")
     @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_ABC")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PART_ABC")
     private String partType;
 
     @Column(name = "STRATEGY_TYPE")

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

@@ -104,7 +104,6 @@ public class WmsDocFgDetail extends BaseBean {
     @Column(name="SID")
     @ApiParam("SID")
     public String sid;
-
     /**
      * 状态:10=新建,20=已处理,30=处理出错
      */
@@ -150,4 +149,8 @@ public class WmsDocFgDetail extends BaseBean {
     @Column(name = "BATCH_NO")
     @ApiParam("批号")
     private String batchNo;
+
+    @Column(name = "BOM_VERSION")
+    @ApiParam(value = "BOM版本号")
+    private String bomVersion;
 }

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

@@ -1,7 +1,9 @@
 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;
@@ -119,6 +121,11 @@ public class WmsDocMovementDetails extends BaseBean {
     @Transient
     @ApiParam(value = "状态中文")
     private String itemStatusStr;
+
+    @Transient
+    @ApiParam(value = "ERP单号")
+    private String erpSrcNo;
+
     /**
      * 是否免费:0=计费,1=免费
      */
@@ -131,6 +138,9 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "操作原因")
     private String remark;
 
+    /**
+     * 配料数量
+     **/
     @Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam(value = "已拣货数量", example = "1")
@@ -156,6 +166,11 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "任务生成数量", example = "1")
     private Double taskGenerateQty;
 
+    @Column(name = "PRINT_GENERATE_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "已打印数量")
+    private Double printGenerateQty;
+
     @Column(name = "SRC_AREA_NO")
     @ApiParam("源库存地代码")
     public String srcAreaNo;
@@ -184,6 +199,38 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "销售单据号")
     private String soOrderNo;
 
+    @Column(name = "MEL_TYPE")
+    @ApiParam(value = "材料类型")
+    private String melType;
+
+    @Column(name = "PROJECT_NO")
+    @ApiParam(value = "项目号")
+    private String projectNo;
+
+    @Column(name = "PRODUCTION_GROUP")
+    @ApiParam(value = "生产小组")
+    private String productionGroup;
+
+    @Column(name = "CUST_PART_NO")
+    @ApiParam(value = "客户零件号")
+    private String custPartNo;
+
+    @Column(name = "MATERIAL_TYPE")
+    @ApiParam(value = "物料类型")
+    private String materialType;
+
+    @Column(name = "PART_SPEC")
+    @ApiParam(value = "简称")
+    private String partSpec;
+
+    @Column(name = "WORK_ORDER_CODE")
+    @ApiParam(value = "工单码")
+    private String workOrderCode;
+
+    @Column(name = "SEQ_NO")
+    @ApiParam(value = "父位置号")
+    private String seqNo;
+
     @Transient
     @ApiParam(value = "替代物料编码")
     private String subPartNo;
@@ -273,6 +320,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("执行")
     private Integer isMakeUp;
 
+    @Transient
+    @ApiParam(value = "子位置号")
+    private String itemSeqNo;
+
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
     }
@@ -324,6 +375,12 @@ public class WmsDocMovementDetails extends BaseBean {
     public Integer isSn;
 
 
+    @Column(name = "REF_SRC")
+    @ApiParam("关联单号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String refSrc;
+
+
     public WmsDocMovementDetails () {
 
     }

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

@@ -188,30 +188,6 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "QAD发运单据类型")
     private String erpSrcType;
 
-    @Transient
-    @ApiParam(value = "发运单号")
-    private String shipOrderNo;
-
-    @Transient
-    @ApiParam(value = "打印时间")
-    private String printDate;
-
-    @Transient
-    @ApiParam("类型名称")
-    public String busiTypeName;
-
-    @Transient
-    @ApiParam("物料编号")
-    public String partNo;
-
-    @ApiParam(value = "标题")
-    @Transient
-    public String title;
-
-    @Transient
-    @ApiParam("物料编号组")
-    public String[] partNos;
-
     @ApiParam("是否正常运输")
     @Column(name = "IS_NORMAL_TRANSPORTATION")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
@@ -230,7 +206,7 @@ public class WmsDocMovementMaster extends BaseBean {
 
     //正常运输 和非正常运输
     @Column(name = "BUSINESS_TYPE")
-    @ApiParam(value = "业务类型")
+    @ApiParam(value = "运输方式")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
     @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
     private Integer businessType;
@@ -242,11 +218,39 @@ public class WmsDocMovementMaster extends BaseBean {
     private Integer isTransportationCreation;
 
     @Column(name = "IS_GOOD_PRODUCT")
-    @ApiParam(value = "运输信息创建")
+    @ApiParam(value = "是否良品")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
     private Integer isGoodProduct;
 
+    @Transient
+    @ApiParam(value = "发运单号")
+    private String shipOrderNo;
+
+    @Transient
+    @ApiParam(value = "打印时间")
+    private String printDate;
+
+    @Transient
+    @ApiParam("类型名称")
+    public String busiTypeName;
+
+    @Transient
+    @ApiParam("物料编号")
+    public String partNo;
+
+    @ApiParam(value = "标题")
+    @Transient
+    public String title;
+
+    @Transient
+    @ApiParam("物料编号组")
+    public String[] partNos;
+
+    @Transient
+    @ApiParam("工厂集合")
+    private List<String> organizeCodeList;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }

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/WmsLogisticExpenseRecords.java

@@ -78,6 +78,7 @@ public class WmsLogisticExpenseRecords extends BaseBean {
     public WmsLogisticExpenseRecords(WmsDocMovementMaster docMovementMaster) {
 //        this.organizeName = docMovementMaster.getorganizeName;
         this.orderNo = docMovementMaster.getOrderNo();
+        this.organizeCode = docMovementMaster.getOrganizeCode();
         this.shippingFlag = docMovementMaster.getFlagNo();
         this.busiType = docMovementMaster.getBusiType();
         this.transportType = docMovementMaster.getTransportType();

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

@@ -1,8 +1,10 @@
 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;
@@ -51,6 +53,11 @@ public class WmsLogisticExpenseRecordsDetails extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String partName;
 
+    @Column(name = "PART_UNIT")
+    @ApiParam(value = "物料单位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partUnit;
+
     @Column(name = "unit")
     @ApiParam(value = "计量单位")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
@@ -77,5 +84,11 @@ public class WmsLogisticExpenseRecordsDetails extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String endTime;
 
-
+    /**
+     * 状态:N=正常,C=行取消
+     */
+    @Column(name = "ITEM_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer itemStatus;
 }

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

@@ -64,7 +64,7 @@ public class WmsLogisticsCosts extends BaseBean {
     private String salesUnit;
 
     @Column(name = "TRANSPORT_TYPE")
-    @ApiParam(value = "运输类型")
+    @ApiParam(value = "运输方式")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
     @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
     private Integer transportType;

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

@@ -102,6 +102,29 @@ public class WmsLogisticsFreightApproval extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer isUrgent;
 
+    @Column(name = "SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String assignSrcWhNo;
+
+    @Column(name = "REMAKE")
+    @ApiParam("备注")
+    public String remake;
+
+    @Column(name = "DEST_WH_NO")
+    @ApiParam("目标仓库代码")
+    public String assignDestWhNo;
+
+    @Column(name = "FLAG_NO")
+    @ApiParam(value = "客户发往地编号")
+    private String flagNo;
+
+    //正常运输 和非正常运输
+    @Column(name = "BUSINESS_TYPE")
+    @ApiParam(value = "运输方式")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
+    private Integer businessType;
+
     public WmsLogisticsFreightApproval(WmsDocMovementMaster docMovementMaster) {
         this.orderNo = docMovementMaster.getOrderNo();
         this.organizeCode = docMovementMaster.getOrganizeCode();
@@ -114,10 +137,12 @@ public class WmsLogisticsFreightApproval extends BaseBean {
         this.logisticsVendorNo = docMovementMaster.getLogisticsVendorNo();
         this.transportType = docMovementMaster.getTransportType();
         this.placeOfOriginCode = docMovementMaster.getFlagNo();
-//        this.placeOfOriginDesc = placeOfOriginDesc;
         this.custDeliveryCode = docMovementMaster.getAssignSrcWhNo();
-//        this.custDeliveryDesc = custDeliveryDesc;
         this.isUrgent = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+        this.assignSrcWhNo = docMovementMaster.getAssignSrcWhNo();
+        this.assignDestWhNo = docMovementMaster.getAssignDestWhNo();
+        this.flagNo = docMovementMaster.getFlagNo();
+        this.businessType = docMovementMaster.getBusinessType();
     }
 
     public WmsLogisticsFreightApproval() {

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

@@ -1,10 +1,8 @@
 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;
@@ -45,8 +43,17 @@ public class WmsModeTransport extends BaseBean {
 
     @Column(name = "TRANSPORT_TYPE")
     @ApiParam(value = "运输方式")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, dataSrc = "TRANSPORT_TYPE")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
+    private String transportType;
-    private Integer transportType;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam(value = "序号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String serialNumber;
+
+    @Column(name = "remake")
+    @ApiParam(value = "说明")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String remake;
 
 }

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

@@ -13,7 +13,12 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 /**
  * @Description : 库存移动单明细信息
@@ -145,7 +150,7 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     public String destLocateNo;
 
     /**
-     * 状态:1=创建,10=待处理,20=已处理
+     * 状态:10:创建,20:待处理,30:已处理,40:处理出错
      */
     @Column(name = "ITEM_STATUS")
     @ApiParam(value = "状态", example = "0")
@@ -176,6 +181,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String groupNo;
 
+    @Column(name = "BOM_VERSION")
+    @ApiParam(value = "BOM版本号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String bomVersion;
+
     @ApiParam(value = "待出库数量", example = "0")
     @Transient
     private Long waitingCounts;

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

@@ -233,6 +233,31 @@ public class WmsMoveMaster extends BaseBean {
         this.modifyDatetime = modifyDatetime;
     }
 
+    public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus,
+                         String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode,
+                         String createDatetime, String createUser, String modifyUser, String modifyDatetime) {
+        this.orderNo = orderNo;
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.itemStatus = itemStatus;
+        this.unit = unit;
+        this.srcWhNo = srcWhNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destWhNo = destWhNo;
+        this.destZoneNo = destZoneNo;
+        this.transQty = transQty;
+        this.rejectQty = rejectQty;
+        this.fixId = fixId;
+        this.busiTypeCode = busiTypeCode;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+
     public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){
         this.itemQty = itemQty;
         this.transTypeCode = transTypeCode;

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

@@ -10,7 +10,11 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 库存移动单处理成功后的记录，通过监听交易成功队列写入
@@ -191,6 +195,10 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("是否预收货")
     public Integer priorRC = 2;
 
+    @Column(name = "ERP_SRC_NO")
+    @ApiParam(value = "ERP单号")
+    private String erpSrcNo;
+
 
     @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''")
     @ApiParam(value = "QAD发运单据类型")

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/WmsPickingMovement.java

@@ -56,5 +56,7 @@ public class WmsPickingMovement extends BaseBean {
     @AnnoOutputColumn
     private String planTime;
 
-
+    @ApiParam(value = "ERP单号")
+    @AnnoOutputColumn
+    private String erpSrcNo;
 }

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

@@ -41,6 +41,7 @@ public class WmsSerialSnTrans extends BaseBean {
 
     @Column(name="SERIAL_SN")
     @ApiParam("产品条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String serialSn;
 
     @Column(name="BH_TYPE")
@@ -65,15 +66,17 @@ public class WmsSerialSnTrans extends BaseBean {
 
     @Column(name="SRC_STOCK_SN")
     @ApiParam("源库存条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String srcStockSn;
 
     @Column(name="DEST_STOCK_SN")
     @ApiParam("目标库存条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String destStockSn;
 
     @Column(name="TRANS_TYPE")
     @ApiParam("操作类型")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BACTH_TRANS_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1, dataSrc = "BACTH_TRANS_TYPE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description")
     private Integer transType;
 

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

@@ -69,7 +69,7 @@ public class WmsShortLogisticsCosts extends BaseBean {
     private String logisticsVendorNo;
 
     @Column(name = "TRANSPORT_TYPE")
-    @ApiParam(value = "运输类型")
+    @ApiParam(value = "运输方式")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
     @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
     private Integer transportType;

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

@@ -458,6 +458,47 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("挑选状态")
     public Integer pickResult;
 
+    @Transient
+    @ApiParam("位置号-打印用")
+    public String positionNo;
+
+    @Transient
+    @ApiParam("父位置号")
+    public String parentPositionNo;
+
+
+    @Transient
+    @ApiParam(value = "材料类型")
+    private String melType;
+
+    @Transient
+    @ApiParam(value = "项目号")
+    private String projectNo;
+
+    @Transient
+    @ApiParam(value = "生产小组")
+    private String productionGroup;
+
+    @Transient
+    @ApiParam(value = "客户零件号")
+    private String custPartNo;
+
+    @Transient
+    @ApiParam(value = "物料类型")
+    private String materialType;
+
+    @Transient
+    @ApiParam(value = "工单码")
+    private String workOrderCode;
+
+    @Transient
+    @ApiParam(value = "ERP单号")
+    private String erpSrcNo;
+
+    @Transient
+    @ApiParam(value = "检测结果ID")
+    private Long summaryId;
+
     public WmsStockSn() {
     }
 
@@ -678,7 +719,7 @@ public class WmsStockSn extends BaseBean {
     }
 
     public WmsStockSn(String organizeCode, String batchNo, Integer bhType, String locateNo, String partNo,
-                      String partNameRdd, String workCenterCode, String createUser, String createDatetime,
+                      String partNameRdd, Long summaryId, String workCenterCode, String createUser, String createDatetime,
                       String modifyUser, String modifyDatetime) {
         this.organizeCode = organizeCode;
         this.batchNo = batchNo;
@@ -686,6 +727,7 @@ public class WmsStockSn extends BaseBean {
         this.locateNo = locateNo;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
+        this.summaryId = summaryId;
         this.workCenterCode = workCenterCode;
         this.createUser = createUser;
         this.createDatetime = createDatetime;
@@ -694,5 +736,63 @@ public class WmsStockSn extends BaseBean {
 
     }
 
+    public WmsStockSn(String organizeCode, Long id, String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
+                      Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo,
+                      String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd,
+                      String qualityDate, String custNo, String custSn, String sn2d,
+                      String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser,
+                      String parentPositionNo, Date pdate, Integer printed, String refSrc, String refType,
+                      String shippingFlag, String workCenterCode, Integer snType,
+                      String packagePartNo, Integer useCount, Integer seqNo,
+                      String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc,
+                      String prodCfgTypeName, String custNameRdd) {
+        this.organizeCode = organizeCode;
+        this.id = id;
+        this.sn = sn;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.snStatus = snStatus;
+        this.qcStatus = qcStatus;
+        this.qty = qty;
+        this.locateNo = locateNo;
+        this.zoneNo = zoneNo;
+        this.whNo = whNo;
+        this.lotNo = lotNo;
+        this.dateCode = dateCode;
+        this.leftCode = leftCode;
+        this.fixLotNo = fixLotNo;
+        this.vendorNo = vendorNo;
+        this.vendorNameRdd = vendorNameRdd;
+        this.qualityDate = qualityDate;
+        this.custNo = custNo;
+        this.custSn = custSn;
+        this.sn2d = sn2d;
+        this.packageNo = packageNo;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+        this.parentPositionNo = parentPositionNo;
+        this.pdate = pdate;
+        this.printed = printed;
+        this.refSrc = refSrc;
+        this.refType = refType;
+        this.shippingFlag = shippingFlag;
+        this.workCenterCode = workCenterCode;
+        this.snType = snType;
+        this.packagePartNo = packagePartNo;
+        this.useCount = useCount;
+        this.seqNo = seqNo;
+
+        this.whNameRdd = whNameRdd;
+        this.locateNameRdd = locateNameRdd;
+        this.zoneNameRdd = zoneNameRdd;
+        this.partTypeDesc = partTypeDesc;
+        this.prodCfgTypeName = prodCfgTypeName;
+        this.custNameRdd = custNameRdd;
+        this.vendorNameRdd = vendorNameRdd;
+    }
+
 
 }

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

@@ -10,7 +10,11 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -104,6 +108,10 @@ public class WmsTaskInfo extends BaseBean {
     @ApiParam(value = "供应商编号")
     private String vendorNo;
 
+    @Transient
+    @ApiParam("工厂集合")
+    private List<String> organizeCodeList;
+
     public WmsTaskInfo(){};
 
     public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){

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

@@ -79,6 +79,10 @@ public class WmsTestResultSummary extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer pickResult;
 
+    @Column(name = "IS_SYNC", nullable = false)
+    @ApiParam("是否同步")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_SUMMARY_IS_SYNC.class, refForeignKey = "value", value = "description")
+    public Integer isSync = WmsEnumUtil.BH_SUMMARY_IS_SYNC.INIT.getValue();
 
     @Transient
     @ApiParam("BH类型")
@@ -128,8 +132,6 @@ public class WmsTestResultSummary extends BaseBean {
         this.bhType = bhType;
     }
 
-    public WmsTestResultSummary() {
+    public WmsTestResultSummary() { }
-
-    }
 
 }

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

@@ -106,10 +106,6 @@ public class WmsTmsShippingExt extends BaseBean {
     @ApiParam("物料编码")
     private String partNo;
 
-    @Transient
-    @ApiParam("关联单号")
-    private String refOrderNo;
-
     @Column(name="PATH_URL")
     @ApiParam("回执单地址")
     private String pathUrl;

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

@@ -1,358 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.bean;
-
-
-import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-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.ColumnDefault;
-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;
-import javax.persistence.Version;
-
-/**
- * @Description : 车辆信息明细
- * @Reference :
- * @Author : qianhuasheng
- * @CreateDate : 2019-12-06 15:58
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_TMS_SHIPPING_EXT_DETAIL")
-@Api("装车单信息明细")
-public class WmsTmsShippingExtDetail extends BaseBean {
-	private static final long serialVersionUID = -4800308354250386102L;
-
-	@Column(name="MOVE_NO")
-	@ApiParam("装车单")
-	public String moveNo;
-
-	@Column(name = "PART_NO")
-	@ApiParam("物料编码")
-	public String partNo;
-
-	@Column(name = "PART_NAME_RDD")
-	@ApiParam("物料名称")
-	public String partNameRdd;
-
-	@Column(name = "ITEM")
-	@ApiParam("行号")
-	public String item;
-
-	@Column(name = "QTY", columnDefinition = "decimal(18,8)")
-	@ColumnDefault("0")
-	@ApiParam(value = "需求数量", example = "0")
-	public Double qty;
-
-	@Column(name = "UNIT")
-	@ApiParam("单位")
-	public String unit;
-
-	@Column(name = "ORDER_NO")
-	@ApiParam("订单号")
-	public String orderNo;
-
-	@Column(name = "SRC_WH_NO")
-	@ApiParam("源仓库代码")
-	public String srcWhNo;
-
-	@Column(name = "SRC_ZONE_NO")
-	@ApiParam("源存储区代码")
-	public String srcZoneNo;
-
-	@Column(name = "SRC_LOCATE_NO")
-	@ApiParam("源库位代码")
-	public String srcLocateNo;
-
-	@Column(name = "DEST_WH_NO")
-	@ApiParam("目标仓库代码")
-	public String destWhNo;
-
-	@Column(name = "DEST_ZONE_NO")
-	@ApiParam("目标存储区代码")
-	public String destZoneNo;
-
-	@Column(name = "DEST_LOCATE_NO")
-	@ApiParam("目标库位代码")
-	public String destLocateNo;
-
-	@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
-	@ColumnDefault("0")
-	@ApiParam(value = "条码打印数量", example = "1")
-	private Double printQty;
-
-	@Column(name = "PLAN_DATE")
-	@ApiParam(value = "计划日期")
-	private String planDate;
-
-	@Column(name = "PLAN_TIME")
-	@ApiParam(value = "计划时间")
-	private String planTime;
-
-	@Column(name = "SRC_NO")
-	@ApiParam(value = "源单号")
-	private String srcNo;
-	/**
-	 * 状态:N=正常,C=行取消
-	 */
-	@Column(name = "ITEM_STATUS")
-	@ApiParam(value = "状态", example = "1")
-	@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
-	private Integer itemStatus;
-
-	/**
-	 * 是否免费:0=计费,1=免费
-	 */
-	@Column(name = "IS_FREE")
-	@ApiParam(value = "是否免费", example = "1")
-	@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
-	public Integer isFree;
-
-	@Column(name = "REMARK")
-	@ApiParam(value = "操作原因")
-	private String remark;
-
-	@Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)")
-	@ColumnDefault("0")
-	@ApiParam(value = "已拣货数量", example = "1")
-	private Double pickQty;
-
-	@Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)")
-	@ColumnDefault("0")
-	@ApiParam(value = "已出库数量", example = "1")
-	private Double outQty;
-
-	@Column(name = "REC_QTY", columnDefinition = "decimal(18,8)")
-	@ColumnDefault("0")
-	@ApiParam(value = "已收货数量", example = "1")
-	private Double recQty;
-
-	@Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)")
-	@ColumnDefault("0")
-	@ApiParam(value = "已移库数量", example = "1")
-	private Double moveQty;
-
-	@Column(name = "TASK_GENERATE_QTY", columnDefinition = "decimal(18,8)")
-	@ColumnDefault("0")
-	@ApiParam(value = "任务生成数量", example = "1")
-	private Double taskGenerateQty;
-
-	@Column(name = "SRC_AREA_NO")
-	@ApiParam("源库存地代码")
-	public String srcAreaNo;
-
-	@Column(name = "DEST_AREA_NO")
-	@ApiParam("目的库存地代码")
-	public String destAreaNo;
-
-	@Column(name = "LOT_NO")
-	@ApiParam("批次")
-	public String lotNo;
-
-	@Column(name="SRC_ITEM", columnDefinition="varchar(50) default ''",nullable=false)
-	@ApiParam("源单行号")
-	public String srcItem;
-
-	@Column(name = "CUST_ORDER_NO")
-	@ApiParam("客户订单号")
-	public String custOrderNo;
-
-	@Column(name = "ASSIGN_DATE_CODE")
-	@ApiParam(value = "指定生产日期")
-	private String assignDateCode;
-
-	@Transient
-	@ApiParam("实际批次")
-	private String actualLot;
-
-	@Transient
-	@ApiParam("实际数量")
-	private Double actualQty;
-
-	@Transient
-	@ApiParam("推荐批次")
-	private String recommondLot;
-
-	@Transient
-	@ApiParam("推荐库位")
-	private String recommondLocateNo;
-
-	@Transient
-	@ApiParam("前端表格编辑使用")
-	private Boolean isSet = false;
-
-	@Transient
-	@ApiParam("生产日期")
-	public String dateCode;
-
-	@ApiParam(value = "散件移库输入移库数量")
-	@Transient
-	public Double inputMoveQty;
-
-	@Transient
-	@ApiParam(value = "标准包装", example = "1")
-	private Double snp;
-
-	@Transient
-	@ApiParam(value = "条码总数量", example = "1")
-	private Double detailsSnCount;
-
-	@Transient
-	@ApiParam(value = "余数", example = "1")
-	private Double restQty;
-
-	@Transient
-	@ApiParam("任务状态")
-	@AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
-	private Integer isTask;
-
-	@Transient
-	@ApiParam("主表单据状态")
-	@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
-	private Integer orderMasterStatus;
-
-	@Transient
-	@ApiParam("打印状态")
-	@AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
-	private Integer printStatus;
-
-	@Transient
-	@ApiParam("优先级")
-	private Integer priority;
-
-	@Transient
-	@ApiParam(value = "汇总需求数量", example = "0")
-	public Double sumQty;
-
-	@Transient
-	@ApiParam(value = "汇总拣货数量", example = "0")
-	public Double sumPickQty;
-
-	@Transient
-	@ApiParam("执行状态")
-	@AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description")
-	private Integer executeStatus;
-
-	@Version
-	@Column(name = "LOCK_VERSION")
-	@ApiParam(value = "乐观锁", example = "1")
-	public transient Integer lockVersion;
-
-	@Transient
-	@ApiParam("移动类型")
-	public Integer moveType;
-
-	@Transient
-	@ApiParam("业务类型")
-	@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
-	public Integer busiType;
-
-	@Column(name = "IS_SN")
-	@ApiParam(value = "条码生成状态", example = "20")
-	public Integer isSn;
-
-
-	public WmsTmsShippingExtDetail () {
-
-	}
-
-
-	public String getRecommondLot() {
-		return recommondLot == null ? "无" : this.recommondLot;
-	}
-
-	public Double getQty() {
-		return qty == null ? 0D : this.qty.doubleValue();
-	}
-
-	public Double getOutQty() {
-		return outQty == null ? 0D : this.outQty.doubleValue();
-	}
-
-	public Double getPickQty() {
-		return pickQty == null ? 0D : this.pickQty.doubleValue();
-	}
-
-	public Double getActualQty() {
-		return actualQty == null ? 0D : this.actualQty.doubleValue();
-	}
-
-	public Double getRecQty() {
-		return recQty == null ? 0D : this.recQty.doubleValue();
-	}
-
-	public Integer getIsTaskVal() {
-		return isTask == null ? 0 : this.isTask.intValue();
-	}
-
-	public Integer getOrderMasterStatus() {
-		return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue();
-	}
-
-	public WmsTmsShippingExtDetail(WmsDocMovementDetails docMovementDetails,String moveNo) {
-		this.moveNo = moveNo;
-		this.partNo = docMovementDetails.getPartNo();
-		this.partNameRdd = docMovementDetails.getPartNameRdd();
-		this.item = docMovementDetails.getItem();
-		this.qty =docMovementDetails.getQty();
-		this.unit = docMovementDetails.getUnit();
-		this.orderNo = docMovementDetails.getOrderNo();
-		this.srcWhNo = docMovementDetails.getSrcWhNo();
-		this.srcZoneNo = docMovementDetails.getSrcZoneNo();
-		this.srcLocateNo = docMovementDetails.getSrcLocateNo();
-		this.destWhNo = docMovementDetails.getDestWhNo();
-		this.destZoneNo = docMovementDetails.getDestZoneNo();
-		this.destLocateNo = docMovementDetails.getDestLocateNo();
-		this.printQty = docMovementDetails.getPrintQty();
-		this.planDate = docMovementDetails.getPlanDate();
-		this.planTime = docMovementDetails.getPlanTime();
-		this.srcNo = docMovementDetails.getSrcNo();
-		this.itemStatus = docMovementDetails.getItemStatus();
-		this.isFree = docMovementDetails.getIsFree();
-		this.remark = docMovementDetails.getRemark();
-		this.pickQty = docMovementDetails.getPickQty();
-		this.outQty = docMovementDetails.getOutQty();
-		this.recQty = docMovementDetails.getRecQty();
-		this.moveQty = docMovementDetails.getMoveQty();
-		this.taskGenerateQty = docMovementDetails.getTaskGenerateQty();
-		this.srcAreaNo = docMovementDetails.getSrcAreaNo();
-		this.destAreaNo = docMovementDetails.getDestAreaNo();
-		this.lotNo = docMovementDetails.getLotNo();
-		this.srcItem = docMovementDetails.getSrcItem();
-		this.custOrderNo = docMovementDetails.getCustOrderNo();
-		this.assignDateCode = docMovementDetails.getAssignDateCode();
-		this.actualLot = docMovementDetails.getActualLot();
-		this.actualQty = docMovementDetails.getActualQty();
-		this.recommondLot = docMovementDetails.getRecommondLot();
-		this.recommondLocateNo = docMovementDetails.getRecommondLocateNo();
-		this.isSet = docMovementDetails.getIsSet();
-		this.dateCode = docMovementDetails.getDateCode();
-		this.inputMoveQty = docMovementDetails.getInputMoveQty();
-		this.snp = docMovementDetails.getSnp();
-		this.detailsSnCount = docMovementDetails.getDetailsSnCount();
-		this.restQty = docMovementDetails.getRestQty();
-		this.isTask = docMovementDetails.getIsTask();
-		this.orderMasterStatus = docMovementDetails.getOrderMasterStatus();
-		this.printStatus = docMovementDetails.getPrintStatus();
-		this.priority = docMovementDetails.getPriority();
-		this.sumQty = docMovementDetails.getSumQty();
-		this.sumPickQty = docMovementDetails.getSumPickQty();
-		this.executeStatus = docMovementDetails.getExecuteStatus();
-		this.lockVersion = docMovementDetails.getLockVersion();
-		this.moveType = docMovementDetails.getMoveType();
-		this.busiType = docMovementDetails.getBusiType();
-		this.isSn = docMovementDetails.getIsSn();
-	}
-}

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

@@ -1,175 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.bean;
-
-
-import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-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.ColumnDefault;
-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 : qianhuasheng
- * @CreateDate : 2019-12-06 15:58
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_TMS_SHIPPING_EXT_SN")
-@Api("装车单条码明细")
-public class WmsTmsShippingExtSn extends BaseBean {
-
-    private static final long serialVersionUID = 5704546384179442907L;
-
-    @Column(name="MOVE_NO")
-    @ApiParam("装车单")
-    public String moveNo;
-
-    @Column(name="ORDER_NO")
-    @ApiParam("订单号")
-    public String orderNo;
-
-    @Column(name="ITEM")
-    @ApiParam("行号")
-    public String item;
-
-    @Column(name="PART_NO")
-    @ApiParam("物料编码")
-    public String partNo;
-
-    @Column(name="PART_NAME_RDD")
-    @ApiParam("物料名称")
-    public String partNameRdd;
-
-    @Column(name="QTY", columnDefinition = "decimal(18,8)")
-    @ColumnDefault("0")
-    @ApiParam(value = "数量", example = "0")
-    public Double qty;
-
-
-    @Column(name="UNIT")
-    @ApiParam("单位")
-    public String unit;
-
-    /**
-     * 状态：操作状态  itemStatus
-     */
-    @Column(name="SN_STATUS")
-    @ApiParam(value = "操作状态", example = "10")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_SN_STATUS.class,refForeignKey = "value",value = "description")
-    public Integer snStatus;
-
-    @Column(name="SN")
-    @ApiParam("条码")
-    public String sn;
-
-    @Column(name = "VENDOR_NO")
-    @ApiParam(value = "供应商编码")
-    public String vendorNo;
-
-    @Column(name = "SN_TYPE")
-    @ApiParam(value = "条码类型")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")
-    private Integer snType;
-
-    @Transient
-    @ApiParam("前端表格编辑使用")
-    private Boolean isSet = false;
-
-    @Transient
-    @ApiParam("目标库位代码")
-    public String destLocateNo;
-
-    @Transient
-    @ApiParam("源库位代码")
-    public String srcLocateNo;
-
-    @Transient
-    @ApiParam("生产日期")
-    public String dateCode;
-
-    @ApiParam(value = "散件移库输入移库数量")
-    @Transient
-    public Double inputMoveQty;
-
-    @Transient
-    @ApiParam("计划交货日期")
-    private String planDate;
-
-    @Transient
-    @ApiParam("计划交货时间")
-    private String planTime;
-
-    @Transient
-    @ApiParam("ERP库存地")
-    private String erpWhNo;
-
-    @Transient
-    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
-    public Integer itemStatus;
-
-    @Transient
-    @ApiParam("客户零件号")
-    private String customerPartNo;
-
-    @Transient
-    @ApiParam("父层级packcode对应的可回用零件号")
-    private String parentReturnPart;
-
-
-    @Transient
-    @ApiParam("打印模板")
-    private String templateNo;
-
-    @Transient
-    @ApiParam("剩余箱数量")
-    private Long countBox;
-
-    public WmsTmsShippingExtSn(){}
-
-    public WmsTmsShippingExtSn(Long countBox,String partNo) {
-        this.countBox = countBox;
-        this.partNo = partNo;
-    }
-
-    public WmsTmsShippingExtSn(String moveNo,WmsDocMovementSn docMovementSn) {
-        this.moveNo = moveNo;
-        this.orderNo  = docMovementSn.getOrderNo();
-        this.item  = docMovementSn.getItem();
-        this.partNo  = docMovementSn.getPartNo();
-        this.partNameRdd  = docMovementSn.getPartNameRdd();
-        this.qty  = docMovementSn.getQty();
-        this.unit  = docMovementSn.getUnit();
-        this.snStatus  = docMovementSn.getSnStatus();
-        this.sn  = docMovementSn.getSn();
-        this.vendorNo  = docMovementSn.getVendorNo();
-        this.snType  = docMovementSn.getSnType();
-        this.isSet  = docMovementSn.getIsSet();
-        this.destLocateNo  = docMovementSn.getDestLocateNo();
-        this.srcLocateNo  = docMovementSn.getSrcLocateNo();
-        this.dateCode  = docMovementSn.getDateCode();
-        this.inputMoveQty  = docMovementSn.getInputMoveQty();
-        this.planDate  = docMovementSn.getPlanDate();
-        this.planTime  = docMovementSn.getPlanTime();
-        this.erpWhNo  = docMovementSn.getErpWhNo();
-        this.itemStatus  = docMovementSn.getItemStatus();
-        this.customerPartNo  = docMovementSn.getCustomerPartNo();
-        this.parentReturnPart  = docMovementSn.getParentReturnPart();
-        this.templateNo  = docMovementSn.getTemplateNo();
-        this.countBox  = docMovementSn.getCountBox();
-    }
-}

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 String 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 String 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 String 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 String lev3Strategy;
+
+//    public String getIev1StrategyPicking (String lev1StrategyPicking) {
+//        return this.lev1Strategy = lev1StrategyPicking;
+//    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -104,7 +104,7 @@ public class WmsInterfaceDataMapper extends BaseBean {
 
     /**
      * 接口分组名称
-     * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS
+     * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS,WMS2MES
      */
     @Column(name = "GROUP_NAME")
     public String groupName;

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

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -18,26 +20,38 @@ public class WmsMoveInfoModel {
 
     @ApiParam(value = "操作时间")
     private String modifyDateTime;
+
     @ApiParam(value = "物料号")
     private String partNo;
+
     @ApiParam(value = "物料名称")
     private String partNameRdd;
+
     @ApiParam(value = "交易类型")
     private String transTypeCode;
+
     @ApiParam(value = "交易类型名称")
     private String transTypeName;
+
     @ApiParam(value = "业务类型")
-    private String busiTypeCode;
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer busiTypeCode;
+
     @ApiParam(value = "处理数量")
     private String sumQty;
+
     @ApiParam(value = "工厂代码")
     private String organizeCode;
+
+
     @ApiParam(value = "操作状态")
-    private String itemStatus;
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer itemStatus;
+
     public WmsMoveInfoModel() {
     }
 
-    public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, String busiTypeCode, String sumQty, String organizeCode) {
+    public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer busiTypeCode, String sumQty, String organizeCode) {
         this.modifyDateTime = modifyDateTime;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

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

@@ -52,10 +52,10 @@ public class WmsReportTransDetailModel extends BaseBean {
     @ApiParam(value = "数量")
     private Double qty;
 
-    @ApiParam(value = "包规")
+    @ApiParam(value = "供应商批次")
     private String dateCode;
 
-    @ApiParam(value = "供应商批次")
+    @ApiParam(value = "包规")
     private Double snp;
 
     @ApiParam(value = "收货批次")

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

@@ -127,7 +127,6 @@ public class WmsTmsShippingExtModel {
 		this.shippingTime=wmsTmsShippingExt.getCreateDatetime();
 		this.shippingUser=wmsTmsShippingExt.getCreateUser();
 		this.defectiveAllocation=wmsTmsShippingExt.getDefectiveAllocation();
-		this.refOrderNo=wmsTmsShippingExt.getRefOrderNo();
 		this.orderDate=wmsTmsShippingExt.getCreateDatetime();
 	}
 }

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

@@ -1,17 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtDetail;
-import org.springframework.stereotype.Repository;
-
-/**
-* @Description : 装车单明细
-* @Reference :
-* @author: qianhuasheng
-* @date: 2019/9/19 14:22
-* @Modify:
-*/
-
-@Repository
-public interface IWmsTmsShippingExtDetailRepository extends BaseRepository<WmsTmsShippingExtDetail,Long> {
-}

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

@@ -1,17 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtSn;
-import org.springframework.stereotype.Repository;
-
-/**
-* @Description : 装车单条码明细
-* @Reference :
-* @author: qianhuasheng
-* @date: 2019/9/19 14:22
-* @Modify:
-*/
-
-@Repository
-public interface IWmsTmsShippingExtSnRepository extends BaseRepository<WmsTmsShippingExtSn,Long> {
-}

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>{
+}

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

@@ -14,6 +14,7 @@ import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin;
 import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate;
 import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails;
 import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
+import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipDto;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
@@ -55,7 +56,11 @@ public class WmsHqlPack {
             DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
         }
         // 封装有效状态、删除状态、创建人和创建时间
-        DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
+        if (StringUtil.isEmpty(bean.getIsValid())) {
+            DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", hqlStr);
+        } else {
+            DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
+        }
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
 
         return hqlStr;
@@ -219,7 +224,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
-
+        DdlPreparedPack.getInPackList(wmsDocMovementMaster.getOrganizeCodeList(), "organizeCode", packBean);
         getStringBuilderPack(wmsDocMovementMaster, packBean);
 
         return packBean;
@@ -3371,6 +3376,22 @@ public class WmsHqlPack {
         return packBean;
     }
 
+    /**
+     * 装车单 传输类
+     *
+     * @param model
+     * @return
+     */
+    public static DdlPackBean packHqlTmsShip(WmsTmsShipDto model) {
+
+        DdlPackBean packBean = WmsHqlPack.packHqlWms(model.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(model.getOrderStatus(), "orderStatus", packBean);
+        DdlPreparedPack.getStringEqualPack(model.getMoveNo(), "moveNo", packBean);
+        DdlPreparedPack.getOrderByPack(
+                new Object[]{CommonEnumUtil.FALSE},
+                new String[]{"createDatetime"}, packBean);
+        return packBean;
+    }
 
     /**
      * BH检测大类表查询条件

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-DEV-SNAPSHOT
+sonar.projectVersion=1.0-PROD-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./