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

.gitignore

@@ -12,4 +12,5 @@ target
 *.class
 .md
 *.log
-*.properties
+*.properties
+.DS_Store

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

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.andon.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;
+
+/**
+ * @Description : 系统参数配置
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-03-07 09:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="ANDON_PLC_COLOR_CFG")
+@Api(value="PLC三色灯控制")
+public class AndonPlcColorCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3284234821448131212L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name="RED_PLC_CODE")
+    @ApiParam(value ="红灯PLC代码")
+    private String redPlcCode;
+
+    @Column(name="YELLOW_PLC_CODE")
+    @ApiParam(value ="黄灯PLC代码")
+    private String yellowPlcCode;
+
+    @Column(name="GREEN_PLC_CODE")
+    @ApiParam(value ="绿灯PLC代码")
+    private String greenPlcCode;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule;
+import cn.estsh.i3plus.pojo.andon.bean.AndonPlcColorCfg;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonPlcColorCfgRepository extends BaseRepository<AndonPlcColorCfg, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -1100,4 +1100,17 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringLikerPack(areaAlarmType.getAlarmCode(), "alarmCode", packBean);
         return packBean;
     }
+
+    /**
+     * 安灯 PLC三色灯控制信息查询条件封装
+     * @param andonPlcColorCfg
+     * @return
+     */
+    public static DdlPackBean getAndonPlcColorCfg(AndonPlcColorCfg andonPlcColorCfg) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(andonPlcColorCfg.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringLikerPack(andonPlcColorCfg.getWorkCellCode(), "workCellCode", result);
+        getStringBuilderPack(andonPlcColorCfg, result);
+        return result;
+    }
 }

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

@@ -12,6 +12,46 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MesEnumUtil {
 
+    /**
+     * MES_SPC关键数据
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SPC_KEY_DATA_OBJECT_TYPE{
+        POJO_OBJECT(10,"实体对象（单表）"),
+        DYNAMIC(20,"动态对象（生产数据表）");
+
+        private Integer value;
+        private String description;
+        SPC_KEY_DATA_OBJECT_TYPE(Integer value,String description ){
+            this.value = value;
+            this.description = description;
+        }
+        public static String valueOfDesc(String val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    return values()[i].description;
+                }
+            }
+            return null;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public void setValue(Integer value) {
+            this.value = value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+    }
+
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum HQL_EXPRESSION {
         GT(">", ">", "大于"),
@@ -69,16 +109,21 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_MODULE_TYPE {
-        MONITOR_MODULE(10, "监听组件"),
-        REVEAL_MODULE(20, "展示组件"),
-        BUTTON_MODULE(30, "按钮组件"),
-        TIMING_MODULE(40, "定时组件");
+        MONITOR_MODULE(10, "MONITOR_MODULE", "监听组件"),
+        REVEAL_MODULE(20, "REVEAL_MODULE", "展示组件"),
+        BUTTON_MODULE(30, "BUTTON_MODULE", "按钮组件"),
+        TIMING_MODULE(40, "TIMING_MODULE", "定时组件"),
+        PCS_BACK_MODULE(50, "PCS_BACK_MODULE", "工序后台组件"),
+        PLC_CALLBACK_MODULE(60, "PLC_CALLBACK_MODULE", "PLC回调工位参数"),
+        ASSIST_MODULE(70, "ASSIST_MODULE", "辅助组件");
 
         private int value;
+        private String data;
         private String description;
 
-        WORK_MODULE_TYPE(int value, String description) {
+        WORK_MODULE_TYPE(int value, String data, String description) {
             this.value = value;
+            this.data = data;
             this.description = description;
         }
 
@@ -86,6 +131,10 @@ public class MesEnumUtil {
             return value;
         }
 
+        public String getData() {
+            return data;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -102,6 +151,36 @@ public class MesEnumUtil {
     }
 
     /**
+     * 启用还是禁用
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IS_VALID{
+        YES(1,"启用"),
+        NO(2,"禁用");
+        private Integer isValid;
+        private String description;
+
+        IS_VALID(int isValid,String description){
+            this.isValid = isValid;
+            this.description = description;
+        }
+        public int getIsValid() {
+            return isValid;
+        }
+
+        public void setIsValid(int isValid) {
+            this.isValid = isValid;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+    }
+    /**
      * 排序方式
      */
     public enum ASC_OR_DESC {
@@ -708,7 +787,8 @@ public class MesEnumUtil {
         EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
         EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
         EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
-        BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值");
+        BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"),
+        WO_TYPE("WO_TYPE", "客户JIT队列工单类型");
 
         private String value;
         private String description;
@@ -4526,7 +4606,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
         NORMAL(10, "正常"),
-        EMPTYING(20, "放空");
+        EMPTYING(20, "放空"),
+        ERR_PERCH(30, "异常占位");
 
         private int value;
         private String description;
@@ -4778,7 +4859,8 @@ public class MesEnumUtil {
     public enum WORK_CELL_MONITOR_TYPE {
         MONITOR(10, "监听组件"),
         SHOW(20, "展示组件"),
-        BUTTON(30, "按钮组件");
+        BUTTON(30, "按钮组件"),
+        PROCESS_MONITOR(40, "工序监听组件");
 
         private int value;
         private String description;
@@ -5182,7 +5264,8 @@ public class MesEnumUtil {
         BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"),
         BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"),
         BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"),
-        BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板");
+        BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"),
+        BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板");
 
         private String code;
         private String description;
@@ -6659,8 +6742,7 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum GROUP_SIDE {
         POSITIVE(10, "A", "正面"),
-        REVERSE_SIDE(20, "B", "背面"),
-        SPECIAL_SIDE(30, "C", "特殊件");
+        REVERSE_SIDE(20, "B", "背面");
 
         private Integer value;
         private String code;
@@ -7470,4 +7552,117 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * mes 看板展示类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SHOW_TYPE {
+
+        PICTURE(10, "图片"),
+        VIDEO(20, "视频");
+
+        private int value;
+        private String description;
+
+        SHOW_TYPE(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;
+        }
+    }
+
+    /**
+     * mes 数据来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_CHECK_DATA_SOURCE {
+        MANUAL_INPUT(10, "10", "人工输入"),
+        DB(30, "30", "数据库"),
+        PLC(20, "20", "PLC");
+
+        private int value;
+        private String description;
+        private String code;
+
+        QC_CHECK_DATA_SOURCE(int value, String code, String description) {
+            this.value = value;
+            this.description = description;
+            this.code = code;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * mes 检验值类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_CHECK_VALUE_TYPE {
+        STRING(10, "字符串"),
+        INTEGER(20, "数值");
+
+        private int value;
+        private String description;
+
+        QC_CHECK_VALUE_TYPE(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/MesPcnEnumUtil.java

@@ -2165,6 +2165,16 @@ public class MesPcnEnumUtil {
         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;
+        }
     }
 
     /**
@@ -4781,6 +4791,24 @@ public class MesPcnEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_TYPE {
+        STANDARD(10, "标准"),
+        EQU_WORKING_SIGNAL(20, "设备作业信号");
+
+        private int value;
+        private String description;
+
+        PLC_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+    }
+
     /**
      * mes设备状态
      */
@@ -5381,8 +5409,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum GROUP_SIDE {
         POSITIVE(10, "A", "正面"),
-        REVERSE_SIDE(20, "B", "背面"),
-        SPECIAL_SIDE(30, "C", "特殊件");
+        REVERSE_SIDE(20, "B", "背面");
 
         private Integer value;
         private String code;
@@ -5428,6 +5455,26 @@ public class MesPcnEnumUtil {
     }
 
     /**
+     * 过程检测检测检测结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BOARD_MONITOR_OBJECT_TYPE {
+        ORGANIZE("10"),
+        WORK_SHOP("20"),
+        WORK_CENTER("30");
+
+        private String value;
+
+        BOARD_MONITOR_OBJECT_TYPE(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+
+    /**
      * 中航DB数据检查配置-DB复核项
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -5467,4 +5514,88 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 客户JIT生产队列特殊标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
+        NORMAL(10, "正常"),
+        EMPTYING(20, "放空"),
+        ERR_PERCH(30, "异常占位");
+
+        private int value;
+        private String description;
+
+        QUEUE_JIT_ACTUAL_SPECIAL_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;
+        }
+    }
+
+    /**
+     * 产品位置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_CATEGORY_NAME {
+
+        FL("FL", "前右"),
+        FR("FR", "前左"),
+        RL("RL", "后左"),
+        RR("RR", "后右");
+
+        private String description;
+        private String value;
+
+        PRODUCE_CATEGORY_NAME(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -865,7 +865,9 @@ public class WmsEnumUtil {
         OUT_RETURN_SOURCING(690, "OUT_RETURN_SOURCING", "委外返工发料"),
         OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回"),
         WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"),
-        WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库");
+        WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"),
+        OTHER_IN(730, "OTHER_IN", "其它入库"),
+        OTHER_OUT(740, "OTHER_OUT", "其它出库");
 
         private int value;
         private String code;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -1524,7 +1524,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public double findMaxByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) {
         if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) {
-            StringBuffer sb = new StringBuffer("select max(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 ");
+            StringBuffer sb = new StringBuffer("select max(CAST(model." + sumPropertyName + " as integer)) from " + persistentClass.getName() + " model where 1=1 ");
             appendQL(sb, paramName, paramValue);
             if(StringUtils.isNotBlank(groupByName)){
                 sb.append(" group by model." + groupByName);

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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.Index;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/9/23 18:47
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_ALARM_RECORD", indexes = {
+        @Index(columnList = "WORK_CENTER_CODE")
+})
+@Api("设备自动报警记录表")
+public class MesEquAlarmRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1675134362612851879L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "ALARM_LEVEL")
+    @ApiParam("报警等级")
+    private Integer alarmLevel;
+
+    @Column(name = "ALARM_START_TIME")
+    @ApiParam("报警开始时间")
+    private String alarmStartTime;
+
+    @Column(name = "ALARM_STOP_TIME")
+    @ApiParam("报警开始时间")
+    private String alarmStopTime;
+}

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

@@ -6,6 +6,7 @@ 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;
 
@@ -67,7 +68,8 @@ public class IfDefectData extends BaseBean implements Serializable {
     @ApiParam("不良处理类型")
     private String defectActionType;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -55,7 +56,8 @@ public class IfDismantleRecord extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String sn;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("产品数量")
     private Double qty;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -55,7 +56,8 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
     @ApiParam("包装批次")
     private String lotNo;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -54,7 +55,8 @@ public class IfPartPull extends BaseBean implements Serializable {
     @ApiParam("子物料编码")
     private String itemPartNo;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("拉动数量")
     private Double qty;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -42,7 +43,8 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @ApiParam("包装条码")
     private String packageNo;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty;
 
@@ -66,7 +68,8 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @ApiParam("原材料物料名称")
     private String itemPartName;
 
-    @Column(name = "ITEM_QTY")
+    @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("原材料用量")
     private Double itemQty;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -38,7 +39,8 @@ public class IfQcOrder extends BaseBean  implements Serializable {
     @ApiParam("物料号")
     private String partNo;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty = 0D;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -55,7 +56,8 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 	@ApiParam("产品条码")
 	private String productSn;
 
-	@Column(name = "QTY")
+	@Column(name = "QTY", columnDefinition = "decimal(18,8)")
+	@ColumnDefault("0")
 	@ApiParam("数量")
 	private Double qty;
 
@@ -115,7 +117,8 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 	@ApiParam("原材料物料名称")
 	private String itemPartName;
 
-	@Column(name = "ITEM_QTY")
+	@Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
+	@ColumnDefault("0")
 	@ApiParam("原材料物料用量")
 	private Double itemQty;
 
@@ -146,4 +149,8 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 	@Column(name = "VERSION")
 	@ApiParam("版本号")
 	private String version;
+
+	@Column(name = "SPECIAL_FLAG")
+	@ApiParam("特殊标识")
+	private Integer specialFlag;
 }

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

@@ -5,6 +5,7 @@ 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;
 
@@ -46,7 +47,8 @@ public class IfRawPartData  extends BaseBean implements Serializable {
     @ApiParam("原料条码")
     private String serialNumber;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty;
 

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

@@ -0,0 +1,44 @@
+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;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:47 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_CUSTOMER_DATA")
+@Api("MES_看板客户相关信息")
+public class MesBoardCustomerData extends BaseBean implements Serializable  {
+
+    private static final long serialVersionUID = 3871945569470777555L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "COMPLAIN_PLAN_QTY")
+    @ApiParam("客户抱怨目标数量")
+    private Integer complainPlanQty;
+
+    @Column(name = "COMPLAIN_ACTUAL_QTY")
+    @ApiParam("客户抱怨实际数量")
+    private Integer complainActualQty;
+}

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

@@ -11,6 +11,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;
 
 /**
@@ -45,4 +46,8 @@ public class MesBoardDisplay extends BaseBean implements Serializable {
     @Column(name = "ROLL_SPEED")
     @ApiParam("滚动速度")
     private Integer rollSpeed;
+
+    @Transient
+    @ApiParam("跑马灯字体颜色")
+    private String fontColor;
 }

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

@@ -6,6 +6,7 @@ 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;
 
@@ -44,11 +45,13 @@ public class MesBoardEquDetail extends BaseBean implements Serializable {
     @ApiParam("设备名称")
     private String equName;
 
-    @Column(name = "X_AXES")
+    @Column(name = "X_AXES", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam(value = "横坐标")
     private Double xAxes = 0d;
 
-    @Column(name = "Y_AXES")
+    @Column(name = "Y_AXES", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam(value = "纵坐标")
     private Double yAxes = 0d;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -64,7 +65,8 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable {
     @ApiParam("时段产能")
     private Integer hourCapacity;
 
-    @Column(name = "STOP_TIME")
+    @Column(name = "STOP_TIME", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("停机时间")
     private Double stopTime;
 

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

@@ -0,0 +1,64 @@
+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 javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:47 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_SUBMENU")
+@Api("MES_看板子菜单")
+public class MesBoardSubmenu extends BaseBean implements Serializable  {
+
+    private static final long serialVersionUID = 6544735793917822548L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "ITEM_NAME")
+    @ApiParam("子项名称")
+    private String itemName;
+
+    @Column(name = "ICON")
+    @ApiParam("ICO图标")
+    private String icon;
+
+    @Column(name = "SEQ")
+    @ApiParam("顺序号")
+    private Integer seq;
+
+    /**
+     * 10-图片  20-视频
+     */
+    @Column(name = "SHOW_TYPE")
+    @ApiParam("展示类型")
+    private Integer showType;
+
+    @Column(name = "PICTURE_URL")
+    @ApiParam("图片路径")
+    private String pictureUrl;
+
+    @Column(name = "VIDEO_URL")
+    @ApiParam("视频路径")
+    private String videoUrl;
+}

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

@@ -47,11 +47,13 @@ public class MesBoardWorkCell extends BaseBean implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
-    @Column(name = "X_AXES")
+    @Column(name = "X_AXES", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("横坐标")
     private Double xAxes = 0d;
 
-    @Column(name = "Y_AXES")
+    @Column(name = "Y_AXES", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("纵坐标")
     private Double yAxes = 0d;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -60,7 +61,8 @@ public class MesCellFeed extends BaseBean implements Serializable {
     @ApiParam("原材料条码")
     private String rawSn;
 
-    @Column(name = "RAW_QTY")
+    @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("原材料数量")
     private Double rawQty;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -59,7 +60,8 @@ public class MesCellFeedRecord extends BaseBean implements Serializable {
     @ApiParam("原材料条码")
     private String rawSn;
 
-    @Column(name = "RAW_QTY")
+    @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("原材料数量")
     private Double rawQty;
 

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

@@ -0,0 +1,55 @@
+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;
+
+/**
+ * @Description: MES控制计划-主表
+ * @CreateDate: 2020/9/27
+ * @Author: simon.song
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CONTROL_PLAN")
+@Api("中航控制计划主表")
+public class MesControlPlan extends BaseBean implements Serializable {
+    //1. 主表字段：“产线”、“产品”、“客户”、“版本号”、“是否生效”、“状态（编辑中、待审核、已审核）”组成。（主表命名“控制计划”）
+    private static final long serialVersionUID = 1454433409471781390L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+//    @Column(name = "WORK_CELL_CODE")
+//    @ApiParam("工作单元代码")
+//    private String workCellCode;
+
+    @Column(name = "product_name")
+    @ApiParam("产品名称")
+    private String productName;
+
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "VERSION")
+    @ApiParam("版本号")
+    private String version;
+
+    @Column(name = "EDIT_TYPE")
+    @ApiParam("编辑状态")
+    private Integer editType;
+}

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

@@ -6,6 +6,7 @@ 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;
 
@@ -50,7 +51,8 @@ public class MesCustomerPart extends BaseBean implements Serializable {
     @ApiParam("客户物料颜色")
     private String customerPartColor;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("用量")
     private Double qty;
 

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

@@ -45,7 +45,7 @@ public class MesDbCheckRecord extends BaseBean implements Serializable {
     //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。
     @Column(name = "DB_CHECK_ITEM")
     @ApiParam("DB复核项")
-    private String dbReview;
+    private String dbCheckItem;
 
     @Column(name = "ERROR_FILED_CODE")
     @ApiParam("异常取值字段")
@@ -57,7 +57,7 @@ public class MesDbCheckRecord extends BaseBean implements Serializable {
 
     @Column(name = "PRODUCT_DATA_ID")
     @ApiParam("生产记录表主键ID")
-    private String productDataId;
+    private Long productDataId;
 
     //是否停线：1=是，2=否
     @Column(name = "IS_STOP_LINE")

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

@@ -5,6 +5,7 @@ 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;
 
@@ -84,7 +85,8 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("不良处理类型")
     private String defectActionType;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty;
 
@@ -95,6 +97,10 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("后移数量")
     private Integer backwardNum;
 
+    @Transient
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }

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

@@ -5,6 +5,7 @@ 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;
 
@@ -60,7 +61,8 @@ public class MesDismantleRecord extends BaseBean implements Serializable {
     @ApiParam("生产工单号")
     private String workOrderNo;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("产品数量")
     private Double qty;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -41,7 +42,8 @@ public class MesFiCfg extends BaseBean implements Serializable {
     @ApiParam("客户代码")
     private String custCode;
 
-    @Column(name = "FI_QTY")
+    @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("首检数量")
     private Double fiQty;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -37,11 +38,13 @@ public class MesKeyData extends BaseBean implements Serializable {
     @ApiParam("关键数据名称")
     private String keyDataName;
 
-    @Column(name = "UPPER_LIMIT")
+    @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数据上限")
     private Double upperLimit;
 
-    @Column(name = "LOWER_LIMIT")
+    @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数据下限")
     private Double lowerLimit;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -47,11 +48,13 @@ public class MesKpData extends BaseBean implements Serializable {
     @ApiParam("关键数据数量")
     private Integer keyDataCount;
 
-    @Column(name = "UPPER_LIMIT")
+    @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数据上限")
     private Double upperLimit;
 
-    @Column(name = "LOWER_LIMIT")
+    @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数据下限")
     private Double lowerLimit;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -47,7 +48,8 @@ public class MesLocation extends BaseBean implements Serializable {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty = 0d;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -39,7 +40,8 @@ public class MesMouldPart extends BaseBean implements Serializable {
     @ApiParam("模具代码")
     private String mouldCode;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty = 0d;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -68,11 +69,13 @@ public class MesOee extends BaseBean implements Serializable {
     @ApiParam("结束时段")
     private String endTime;
 
-    @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,4)")
+    @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("总生产时间")
     private Double totalRunTime;
 
-    @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,4)")
+    @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("总停机时间")
     private Double totalStopTime;
 
@@ -92,27 +95,33 @@ public class MesOee extends BaseBean implements Serializable {
     @ApiParam("实际节拍")
     private Integer actualTakt;
 
-    @Column(name = "TIME_RATE", columnDefinition = "decimal(18,4)")
+    @Column(name = "TIME_RATE", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("时间开动率")
     private Double timeRate;
 
-    @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,4)")
+    @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("性能开动率")
     private Double taktRate;
 
-    @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,4)")
+    @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("良品率")
     private Double qualifiedRate;
 
-    @Column(name = "OEE", columnDefinition = "decimal(18,4)")
+    @Column(name = "OEE", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("OEE")
     private Double oee;
 
-    @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,3)")
+    @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("OEE目标值")
     private Double targetOee;
 
-    @Column(name = "MIN_OEE", columnDefinition = "decimal(18,3)")
+    @Column(name = "MIN_OEE", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("OEE警戒值")
     private Double minOee;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -55,7 +56,8 @@ public class MesOffLineRecord extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String serialNumber;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty;
 

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

@@ -40,22 +40,22 @@ public class MesPackSpec extends BaseBean implements Serializable {
     @ApiParam("包装规格名称")
     private String specName;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam(value = "包装数量", example = "0")
     private Double qty = 0d;
 
-    @Column(name = "QTY2")
+    @Column(name = "QTY2", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam(value = "包装数量2", example = "0")
     private Double qty2;
 
-    @Column(name = "QTY3")
+    @Column(name = "QTY3", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam(value = "包装数量3", example = "0")
     private Double qty3;
 
-    @Column(name = "QTY4")
+    @Column(name = "QTY4", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam(value = "包装数量4", example = "0")
     private Double qty4;

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

@@ -6,6 +6,7 @@ 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;
 
@@ -42,11 +43,13 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("物料名称")
     private String partNameRdd;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty;
 
-    @Column(name = "PACK_SPEC_QTY")
+    @Column(name = "PACK_SPEC_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("包装规格数量")
     private Double packSpecQty;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -43,7 +44,8 @@ public class MesPackageTrans extends BaseBean implements Serializable {
     @ApiParam("物料名称")
     private String partNameRdd;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty = 0d;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -48,7 +49,8 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("零件规格")
     private String partSpec;
 
-    @Column(name = "PART_SPEC_QTY")
+    @Column(name = "PART_SPEC_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("标准包规数量")
     private Double partSpecQty;
 
@@ -128,6 +130,11 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("是否小尺寸物料")
     private Integer isSmallSize = 1;
 
+    @Column(name = "QTY2", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "包装数量")
+    private Double qty2;
+
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;
@@ -151,4 +158,8 @@ public class MesPart extends BaseBean implements Serializable {
     @Transient
     @ApiParam("拉动数量")
     private Double pullQty;
+
+    @Transient
+    @ApiParam("BOM用量")
+    private Double bomQty = 0d;
 }

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

@@ -6,6 +6,7 @@ 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;
 
@@ -37,7 +38,8 @@ public class MesPartSample extends BaseBean implements Serializable {
     @ApiParam("物料号")
     private String partNo;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -37,7 +38,8 @@ public class MesPartScheduleBom extends BaseBean implements Serializable {
     @ApiParam("关联物料号")
     private String itemPartNo;
 
-    @Column(name = "ITEM_QTY")
+    @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("用量")
     private Double itemQty;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -52,11 +53,13 @@ public class MesPlanOrder extends BaseBean implements Serializable {
     @ApiParam("物料名称")
     private String partNameRdd;
 
-    @Column(name = "PLAN_QTY")
+    @Column(name = "PLAN_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("计划数量")
     private Double planQty;
 
-    @Column(name = "DECOMPOSE_QTY")
+    @Column(name = "DECOMPOSE_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("分解数量")
     private Double decomposeQty;
 

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

@@ -68,7 +68,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
     @ApiParam("原材料条码")
     private String kpSn;
 
-    @Column(name = "KP_QTY")
+    @Column(name = "KP_QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam(value = "原材料数量", example = "0")
     private Double kpQty;

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

@@ -8,10 +8,7 @@ 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;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -26,7 +23,11 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PROD_ROUTE_OPT_PARAM")
+@Table(name = "MES_PROD_ROUTE_OPT_PARAM", indexes = {
+        @Index(columnList = "ROUTE_CODE"),
+        @Index(columnList = "PROCESS_CODE"),
+        @Index(columnList = "STEP_CODE")
+})
 @Api("产品流程配置操作参数表")
 public class MesProdRouteOptParam extends BaseBean implements Serializable {
     private static final long serialVersionUID = -5043197912658757665L;

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

@@ -6,6 +6,7 @@ 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;
 
@@ -48,7 +49,8 @@ public class MesProdWorkCenter extends BaseBean implements Serializable {
     @ApiParam("料箱编号")
     private String rackNo;
 
-    @Column(name = "TARGET_PASS_RATE")
+    @Column(name = "TARGET_PASS_RATE", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("目标合格率")
     private Double targetPassRate;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -52,7 +53,8 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("物料名称")
     private String partNameRdd;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -53,7 +54,8 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
     @ApiParam("物料名称")
     private String partNameRdd;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -97,18 +98,20 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     private String dataSource;
 
     @Column(name = "CHECK_VALUE_TYPE")
-    @ApiParam("任务单类型")
+    @ApiParam("检测值类型")
     private String checkValueType;
 
     @Column(name = "CHECK_CFG_NO")
     @ApiParam("检测值配置编号")
     private String checkCfgNo;
 
-    @Column(name = "MAXIMUM")
+    @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("最大数")
     private Double maximum = 0d;
 
-    @Column(name = "MINIMUM")
+    @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("最小数")
     private Double minimum = 0d;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -49,11 +50,13 @@ public class MesQcOrder extends BaseBean implements Serializable {
     @ApiParam("物料名称")
     private String partName;
 
-    @Column(name = "FINISH_QTY")
+    @Column(name = "FINISH_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("已检数量")
     private Double finishQty = 0D;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty = 0D;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -45,7 +46,8 @@ public class MesQcOrderApprovalStatus extends BaseBean implements Serializable {
     @ApiParam("工单号")
     private String workOrderNo;
 
-    @Column(name = "PLAN_QTY")
+    @Column(name = "PLAN_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("计划数量")
     private Double planQty;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -80,11 +81,13 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
     @ApiParam("已检数量")
     private Integer finishQty;
 
-    @Column(name = "MAXIMUM")
+    @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("最大数")
     private Double maximum = 0d;
 
-    @Column(name = "MINIMUM")
+    @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("最小数")
     private Double minimum = 0d;
 

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

@@ -0,0 +1,118 @@
+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;
+import java.math.BigDecimal;
+
+/**
+ * @Description: MES质量标准-明细表（主表：控制计划MES_CONTROL_PLAN）
+ * @CreateDate: 2020/9/27
+ * @Author: simon.song
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUALITY_STANDARD")
+@Api("中航质量标准明细表")
+public class MesQualityStandard extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1454433409471781390L;
+
+    @Column(name = "CONTROL_PLAN_ID")
+    @ApiParam("控制计划表主键ID")
+    private Long controlPlanId;
+
+    @Column(name = "VERSION")
+    @ApiParam("版本")
+    private String version;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    //检测类型：10=首检，20=巡检，30=终检，40=发运检
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测类型")
+    private Integer CHECK_TYPE;
+
+    @Column(name = "CHECK_ITEM_TYPE")
+    @ApiParam("检测项类型")
+    private String checkItemType;
+
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检测项")
+    private String checkItem;
+
+    @Column(name = "CHECK_STANDARD")
+    @ApiParam("检测标准")
+    private String checkStandard;
+
+    @Column(name = "CHECK_GUIDE")
+    @ApiParam("检测指导")
+    private String checkGuide;
+
+    @Column(name = "CHECK_FREQUENCY")
+    @ApiParam("频率")
+    private String checkFrequency;
+
+    @Column(name = "IS_CONCESSION")
+    @ApiParam("是否允许让步")
+    private String isConcession;
+
+    @Column(name = "CHECK_INTERVAL")
+    @ApiParam("间隔时间")
+    private String checkInterval;
+
+    //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2
+    @Column(name = "NUMBER_FLAG")
+    @ApiParam("个数标识")
+    private String numberFlag;
+
+    @Column(name = "QTY")
+    @ApiParam("检测数量")
+    private Integer qty;
+
+    //任务单类型,动态枚举
+    @Column(name = "CHECK_ORDER_TYPE")
+    @ApiParam("任务单类型")
+    private String CHECK_ORDER_TYPE;
+
+    //数据来源：10=手工录入，20=PLC，30=DB
+    @Column(name = "DATA_SOURCE")
+    @ApiParam("数据来源")
+    private String DATA_SOURCE;
+
+    //检验值类型：10=字符串，20=数值
+    @Column(name = "CHECK_VALUE_TYPE")
+    @ApiParam("检验值类型")
+    private String CHECK_VALUE_TYPE;
+
+    @Column(name = "DIFFERENCE_MAX_LIMIT")
+    @ApiParam("公差上限")
+    private BigDecimal differenceMaxLimit;
+
+    @Column(name = "DIFFERENCE_MIN_LIMIT")
+    @ApiParam("公差下限")
+    private BigDecimal differenceMinLimit;
+
+    @Column(name = "IS_KEY_CHECK_ITEM")
+    @ApiParam("是否关键检测项")
+    private Integer IS_KEY_CHECK_ITEM;
+
+    @Column(name = "CHECK_CFG_NO")
+    @ApiParam("检测值配置编号")
+    private String CHECK_CFG_NO;
+
+}

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

@@ -6,6 +6,7 @@ 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;
 
@@ -48,7 +49,8 @@ public class MesQueueJis extends BaseBean implements Serializable {
     @ApiParam("车号")
     private String carNo;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("排序")
     private Double seq;
 

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.*;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -50,7 +51,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("客户标识号")
     private String custFlagNo;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("排序号")
     private Double seq;
 
@@ -170,4 +172,16 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam(value = "零件号")
     public String partNo;
 
+    @Transient
+    @ApiParam(value = "客户零件号")
+    public String custPartNo;
+
+    @Transient
+    @ApiParam(value = "qty")
+    public Integer qty;
+
+    @Transient
+    @ApiParam("工单类型")
+    private String woTypeName;
+
 }

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.*;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -52,7 +53,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable {
     @ApiParam("物料号")
     private String partNo;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("用量")
     private Double qty = 0d;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -53,7 +54,8 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
     @ApiParam("选配码")
     private String vehicleCode;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("计划排序号")
     private Double seq;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -51,7 +52,8 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable {
     @ApiParam("道口")
     private String dockNo;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("用量")
     private Double qty;
 }

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

@@ -5,6 +5,7 @@ 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;
 
@@ -52,7 +53,8 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("产品配置名称")
     private String prodCfgNameRdd;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("排序")
     private Double seq;
 
@@ -112,6 +114,14 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("等级代码")
     private String gradeCode;
 
+    @Column(name = "JIT_SEQ")
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+
+    @Column(name = "SPECIAL_FLAG")
+    @ApiParam("特殊标识")
+    private Integer specialFlag;
+
     @Transient
     @ApiParam("起始车号")
     private String custFlagNoStart;

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

@@ -5,6 +5,7 @@ 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;
 
@@ -51,7 +52,8 @@ public class MesQueueOrderBom extends BaseBean  implements Serializable {
     @ApiParam("物料号")
     private String partNo;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("用量")
     private Double qty = 0d;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -26,7 +27,7 @@ import java.io.Serializable;
 @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = {
         @Index(columnList = "ORDER_NO")
 }, uniqueConstraints = {
-        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"})
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO", "PRODUCE_CATEGORY_CODE"})
 })
 @Api("生产队列明细")
 public class MesQueueOrderDetail extends BaseBean implements Serializable {
@@ -48,11 +49,13 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String serialNumber;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("队列明细序号")
     private Double seq;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty;
 
@@ -64,7 +67,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("生产类型")
     private String workType;
 
-    @Column(name = "PRODUCE_CATEGORY_CODE")
+    @Column(name = "PRODUCE_CATEGORY_CODE", nullable = false)
     @ApiParam("产品位置")
     private String produceCategoryCode;
 
@@ -112,7 +115,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("队列序号")
     private Double queueSeq;
 
-    @Column(name = "FINSIH_QTY")
+    @Column(name = "FINSIH_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("已生产数量")
     private Double finsihQty;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -51,7 +52,8 @@ public class MesQueueShipping extends BaseBean implements Serializable {
     @ApiParam("客户标识号")
     private String custFlagNo;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("排序号")
     private Double seq;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -67,11 +68,13 @@ public class MesQueueShippingDetail extends BaseBean implements Serializable {
     @ApiParam("分组序号")
     private String groupSeq;
 
-    @Column(name = "qty")
+    @Column(name = "qty", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("队列明细序号")
     private Double seq;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -48,7 +49,8 @@ public class MesRawPartSn extends BaseBean implements Serializable {
     @ApiParam("原材料条码")
     private String rawSn;
 
-    @Column(name = "RAW_QTY")
+    @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double rawQty;
 

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

@@ -100,4 +100,8 @@ public class MesRepairRecord extends BaseBean implements Serializable {
     @Transient
     @ApiParam("缺陷集合")
     private List<MesDefect> mesDefectList;
+
+    @Transient
+    @ApiParam("质量状态")
+    private Integer qcStatus;
 }

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

@@ -64,7 +64,7 @@ public class MesScatterPartCfgBom extends BaseBean implements Serializable {
     @ApiParam("零件标志值")
     private String partFlagValue;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,3)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam(value = "用量", example = "0")
     public Double qty;

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

@@ -5,6 +5,7 @@ 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;
 
@@ -162,11 +163,13 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
     @ApiParam("是否截至顺序号")
     private Integer isEndSeq;
 
-    @Column(name = "MULTIMEDIA_PLUG_QTY")
+    @Column(name = "MULTIMEDIA_PLUG_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("多媒体插头数量")
     private Double multimediaPlusQty;
 
-    @Column(name = "QUALIFIED_COUNT")
+    @Column(name = "QUALIFIED_COUNT", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("应收合格数")
     private Double qualifiedCount;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -69,7 +70,8 @@ public class MesScrapRecord extends BaseBean implements Serializable {
     @ApiParam("工单编号")
     private String workOrderNo;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -51,7 +52,8 @@ public class MesShift extends BaseBean implements Serializable {
     @ApiParam("下班时间")
     private String endTime;
 
-    @Column(name = "WORK_TIMES")
+    @Column(name = "WORK_TIMES", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("作业时长")
     private Double workTimes;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -43,7 +44,8 @@ public class MesShiftRest extends BaseBean implements Serializable {
     @ApiParam("开始时间")
     private String startTime;
 
-    @Column(name = "REST_TIMES")
+    @Column(name = "REST_TIMES", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("休息时长")
     private Double restTimes;
 }

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

@@ -5,6 +5,7 @@ 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;
 
@@ -44,7 +45,8 @@ public class MesSpcControlCoefficient extends BaseBean implements Serializable {
     @ApiParam("系数描述")
     private String coefficientDesc;
 
-    @Column(name = "COEFFICIENT_VALUE")
+    @Column(name = "COEFFICIENT_VALUE", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("系数值")
     private Double coefficientValue;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -36,15 +37,18 @@ public class MesSpcKeyData extends BaseBean implements Serializable {
     @ApiParam("关键数据名称")
     private String kdName;
 
-    @Column(name = "NOMINAL_VALUE")
+    @Column(name = "NOMINAL_VALUE", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("公称值")
     private Double nominalValue;
 
-    @Column(name = "SPEC_USL")
+    @Column(name = "SPEC_USL", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("规格上限")
     private Double specUsl;
 
-    @Column(name = "SPEC_LSL")
+    @Column(name = "SPEC_LSL", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("规格下限")
     private Double specLsl;
 

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

@@ -102,7 +102,4 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
 //    @ApiParam("状态执行情况")
 //    private StepResult stepResult;
 
-    @Transient
-    @ApiParam("是否执行下个扫描信息")
-    private boolean execNextScan = false;
 }

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

@@ -57,7 +57,7 @@ public class MesStationBom extends BaseBean implements Serializable {
     @ApiParam("原材料物料名称")
     private String itemPartName;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam(value = "子零件数量", example = "0")
     private Double qty;
@@ -86,7 +86,8 @@ public class MesStationBom extends BaseBean implements Serializable {
     @ApiParam(value = "绑定物料类型")
     private Integer bindPartType = 20;
 
-    @Column(name = "FEED_WARNING_QTY")
+    @Column(name = "FEED_WARNING_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam(value = "投料预警值")
     private Double feedWarningQty;
 

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

@@ -6,6 +6,7 @@ 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;
 
@@ -35,15 +36,18 @@ public class MesTorqueDetail extends BaseBean implements Serializable {
     @ApiParam("过程条码")
     private String serialNumber;
 
-    @Column(name = "UPPER_LIMIT")
+    @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("最大值")
     private Double upperLimit;
 
-    @Column(name = "LOWER_LIMIT")
+    @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("最小值")
     private Double lowerLimit;
 
-    @Column(name = "TORQUE_DETAIL_VALUE")
+    @Column(name = "TORQUE_DETAIL_VALUE", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("扭矩值")
     private Double torqueValue;
 

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

@@ -7,6 +7,7 @@ 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;
 
@@ -70,7 +71,8 @@ public class MesWorkCell extends BaseBean implements Serializable {
     @ApiParam("工位等级")
     private Integer grade;
 
-    @Column(name = "TARGET_PASS_RATE")
+    @Column(name = "TARGET_PASS_RATE", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("目标合格率")
     private Double targetPassRate;
 

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

@@ -7,6 +7,7 @@ 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;
 
@@ -42,11 +43,13 @@ public class MesWorkCellPoint extends BaseBean implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
-    @Column(name = "QUEUE_SEQ")
+    @Column(name = "QUEUE_SEQ", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("队列主表序号")
     private Double queueSeq;
 
-    @Column(name = "QUEUE_DETAIL_SEQ")
+    @Column(name = "QUEUE_DETAIL_SEQ", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("队列明细表序号")
     private Double queueDetailSeq;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -51,11 +52,13 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable {
     @ApiParam("主队列编号")
     private String orderNo;
 
-    @Column(name = "QUEUE_SEQ")
+    @Column(name = "QUEUE_SEQ", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("队列主表序号")
     private Double queueSeq;
 
-    @Column(name = "QUEUE_DETAIL_SEQ")
+    @Column(name = "QUEUE_DETAIL_SEQ", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("队列明细表序号")
     private Double queueDetailSeq;
 
@@ -91,6 +94,14 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable {
     @ApiParam("产品位置代码")
     private String produceCategoryCode;
 
+    @Column(name = "JIT_SEQ")
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+
+    @Transient
+    @ApiParam("状态")
+    private String statusName;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0 : this.queueSeq;
     }

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

@@ -43,5 +43,13 @@ public class MesWorkCellStatus extends BaseBean implements Serializable {
     @ApiParam("超时状态")
     private Integer timeOutStatus;
 
+    @Column(name = "DELAY_HELP_STATUS")
+    @ApiParam("延迟帮助状态")
+    private Integer delayHelpStatus;
+
+    @Column(name = "EMERGENCY_STOP_STATUS")
+    @ApiParam("紧急停止状态")
+    private Integer emergencyStopStatus;
+
 
 }

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

@@ -6,6 +6,7 @@ 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;
 
@@ -50,23 +51,28 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("产品配置代码")
     private String prodCfgCode;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty;
 
-    @Column(name = "COMPLETE_QTY")
+    @Column(name = "COMPLETE_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("完成数量")
     private Double completeQty;
 
-    @Column(name = "REPAIR_QTY")
+    @Column(name = "REPAIR_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("返修数量")
     private Double repairQty;
 
-    @Column(name = "SCRAP_QTY")
+    @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("报废数量")
     private Double scrapQty;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("工单序号")
     private Double seq;
 
@@ -146,15 +152,18 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("客户订单号")
     private String custOrderNo;
 
-    @Column(name = "FI_QTY")
+    @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("首检数量")
     private Double fiQty;
 
-    @Column(name = "FI_COMPLETE_QTY")
+    @Column(name = "FI_COMPLETE_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("首检完成数量")
     private Double fiCompleteQty;
 
-    @Column(name = "FI_GENERATE_QTY")
+    @Column(name = "FI_GENERATE_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("首检生成数量")
     private Double fiGenerateQty;
 

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

@@ -5,6 +5,7 @@ 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;
 
@@ -47,23 +48,28 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @ApiParam("产品配置代码")
     private String prodCfgCode;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("数量")
     private Double qty;
 
-    @Column(name = "COMPLETE_QTY")
+    @Column(name = "COMPLETE_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("完成数量")
     private Double completeQty;
 
-    @Column(name = "REPAIR_QTY")
+    @Column(name = "REPAIR_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("返修数量")
     private Double repairQty;
 
-    @Column(name = "SCRAP_QTY")
+    @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("报废数量")
     private Double scrapQty;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("工单序号")
     private Double seq;
 
@@ -139,15 +145,18 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @ApiParam("客户订单号")
     private String custOrderNo;
 
-    @Column(name = "FI_QTY")
+    @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("首检数量")
     private Double fiQty;
 
-    @Column(name = "FI_COMPLETE_QTY")
+    @Column(name = "FI_COMPLETE_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("首检完成数量")
     private Double fiCompleteQty;
 
-    @Column(name = "FI_GENERATE_QTY")
+    @Column(name = "FI_GENERATE_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("首检生成数量")
     private Double fiGenerateQty;
 

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

@@ -35,4 +35,7 @@ public class BypassModel {
     @ApiParam("状态")
     private String status;
 
+    @ApiParam("颜色")
+    private String color;
+
 }

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @CreateDate: 2020/9/24
+ * @Author: simon.song
+ */
+@Data
+public class MesDbCheckRecordModel {
+    @ApiParam("主键")
+    private Long id;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("零件号")
+    private String partNo;
+
+    @ApiParam("零件名称")
+    private String partDesc;
+
+    @ApiParam("缺陷类型")
+    private String defectType;
+
+    @ApiParam("缺陷原因")
+    private String defectDesc;
+
+    @ApiParam("生产记录表主键ID")
+    private Long productDataId;
+
+    public MesDbCheckRecordModel(Long id, String serialNumber, String partNo, String partDesc, String defectDesc, Long productDataId) {
+        this.id = id;
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+        this.partDesc = partDesc;
+        this.defectDesc = defectDesc;
+        this.productDataId = productDataId;
+    }
+}

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @CreateDate: 2020/9/24
+ * @Author: simon.song
+ */
+@Data
+public class MesProductDataDefectModel {
+
+    @ApiParam("生产工单")
+    private String orderNo;
+
+    @ApiParam("产品编码")
+    private String partNo;
+
+    @ApiParam("产品名称")
+    private String partDesc;
+
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @ApiParam("缺陷类型")
+    private String defectType;
+
+    @ApiParam("缺陷原因")
+    private String defectDesc;
+
+    @ApiParam("下线时间")
+    private String offlineTime;
+
+    public MesProductDataDefectModel(String orderNo, String partNo, String partDesc, String productSn, String defectType, String defectDesc, String offlineTime) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.partDesc = partDesc;
+        this.productSn = productSn;
+        this.defectType = defectType;
+        this.defectDesc = defectDesc;
+        this.offlineTime = offlineTime;
+    }
+
+    public MesProductDataDefectModel(String orderNo, String partNo, String partDesc, String productSn, String defectDesc, String offlineTime) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.partDesc = partDesc;
+        this.productSn = productSn;
+        this.defectDesc = defectDesc;
+        this.offlineTime = offlineTime;
+    }
+}

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @CreateDate: 2020/9/22
+ * @Author: simon.song
+ */
+@Data
+public class MesProductDataModel {
+    @ApiParam("生产数据表主键ID")
+    private String id;
+
+    @ApiParam("工位代码")
+    private String workCellCode;
+
+    @ApiParam("工位名称")
+    private String workCellName;
+
+    @ApiParam("产品包装model")
+    private List<ProductDataModel> productDataModelList;
+
+}

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

@@ -36,6 +36,9 @@ public class QueueJitActualModel {
     public String workTypeName;
 
     @ApiParam("客户产线代码")
+    private String custPlantCode;
+
+    @ApiParam("客户产线代码")
     private String custProdLineCode;
 
     @ApiParam("产品位置代码")
@@ -73,13 +76,13 @@ public class QueueJitActualModel {
 
     }
 
-    public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custProdLineCode, String produceCtgyCode,
+    public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custPlantCode, String produceCtgyCode,
                                String productSn, Integer detailStatus, String createUser, String createDatetime) {
         this.id = id;
         this.vinCode = vinCode;
         this.jisActualNo = jisActualNo;
         this.workType = workType;
-        this.custProdLineCode = custProdLineCode;
+        this.custPlantCode = custPlantCode;
         this.produceCtgyCode = produceCtgyCode;
         this.productSn = productSn;
         this.detailStatus = detailStatus;
@@ -94,6 +97,7 @@ public class QueueJitActualModel {
         this.jisActualNo = jisActualNo;
         this.partNo = partNo;
         this.partName = partName;
+        this.produceCtgyCode = produceCtgyCode;
         this.qty = qty;
         this.createUser = createUser;
         this.createDatetime = createDatetime;

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

@@ -113,6 +113,8 @@ public class QueueOrderModel implements Serializable {
 
     @ApiParam("是否放空")
     private Integer isEmpty;
+    @ApiParam("特殊标识")
+    private Integer specialFlag;
 
     public QueueOrderModel() {
     }
@@ -199,7 +201,8 @@ public class QueueOrderModel implements Serializable {
 
     // getPrintSnQueueOrderModel
     public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo,
-                           String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber, String custProdLineCode) {
+                           String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq,
+                           String groupSeq, String serialNumber, String custProdLineCode, Integer specialFlag, String workType) {
         this.id = id;
         this.queDetailSeq = queDetailSeq;
         this.pgCode = pgCode;
@@ -216,6 +219,8 @@ public class QueueOrderModel implements Serializable {
         this.groupSeq = groupSeq;
         this.serialNumber = serialNumber;
         this.custProdLineCode = custProdLineCode;
+        this.specialFlag = specialFlag;
+        this.workType = workType;
     }
 
     public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
@@ -259,7 +264,7 @@ public class QueueOrderModel implements Serializable {
     //getWaitQueueOrderModelNoSnMgn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String prodCfgTypeCode,
-                           String vinCode, String formulaContent, String queueGroupNo) {
+                           String vinCode, String formulaContent, String queueGroupNo, String jitSeq) {
         this.serialNumber = serialNumber;
         this.id = id;
         this.queueSeq = queueSeq;
@@ -279,11 +284,13 @@ public class QueueOrderModel implements Serializable {
         this.vinCode = vinCode;
         this.formulaContent = formulaContent;
         this.queueGroupNo = queueGroupNo;
+        this.jitSeq = jitSeq;
     }
 
     //getAlreadyQueueOrderModelNoSnMgn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
-                           String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo, String produceCategoryCode) {
+                           String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent,
+                           String queueGroupNo, String produceCategoryCode, String jitSeq) {
         this.id = id;
         this.queueSeq = queueSeq;
         this.queDetailSeq = queDetailSeq;
@@ -300,6 +307,7 @@ public class QueueOrderModel implements Serializable {
         this.formulaContent = formulaContent;
         this.queueGroupNo = queueGroupNo;
         this.produceCategoryCode = produceCategoryCode;
+        this.jitSeq = jitSeq;
     }
 
     //getAlreadyQueueOrderModelNoSn

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

@@ -192,6 +192,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("创建时间")
     private String packageNo;
 
+    @ApiParam("密码")
+    private String password;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -44,6 +44,9 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("不良处理类型")
     private String defectType;
 
+    @ApiParam("反喷标识")
+    private String reverseSprayMark;
+
     @ApiParam("列名")
     private List<List<String>> headModelList;
 

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardCustomerData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 8:53 下午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardCustomerDataRepository extends BaseRepository<MesBoardCustomerData, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardSubmenu;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 8:53 下午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardSubMenuRepository extends BaseRepository<MesBoardSubmenu, Long> {
+}

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

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesControlPlan;
+
+/**
+ * @Description:
+ * @CreateDate: 2020/9/27
+ * @Author: simon.song
+ */
+public interface MesControlPlanRepository extends BaseRepository<MesControlPlan, Long> {
+}

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

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQualityStandard;
+
+/**
+ * @Description:
+ * @CreateDate: 2020/9/27
+ * @Author: simon.song
+ */
+public interface MesQualityStandardRepository extends BaseRepository<MesQualityStandard, Long> {
+}

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

@@ -870,6 +870,34 @@ public class MesHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getMesSpcKeyData(MesSpcKeyData keyData,String organizeCode){
+        DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode);
+        if (!StringUtils.isEmpty(keyData.getObjectCode())) {
+            DdlPreparedPack.getStringEqualPack(keyData.getObjectCode(), "objectCode", packBean);
+        }
+        if (!StringUtils.isEmpty(keyData.getFieldCode())) {
+            DdlPreparedPack.getStringEqualPack(keyData.getFieldCode(), "fieldCode", packBean);
+        }
+        if (keyData.getObjectType() != null && keyData.getObjectType() != 0) {
+            DdlPreparedPack.getNumEqualPack(keyData.getObjectType(), "objectType", packBean);
+        }
+        if (!StringUtils.isEmpty(keyData.getKdCondition())) {
+            DdlPreparedPack.getStringEqualPack(keyData.getKdCondition(), "kdCondition", packBean);
+        }
+        if (!StringUtils.isEmpty(keyData.getKdName())) {
+            DdlPreparedPack.getStringEqualPack(keyData.getKdName(), "kdName", packBean);
+        }
+        if (!StringUtils.isEmpty(keyData.getKdCode())) {
+            DdlPreparedPack.getStringEqualPack(keyData.getKdCode(), "kdCode", packBean);
+        }
+        if (keyData.getSpecLsl() != null) {
+            DdlPreparedPack.getNumEqualPack(keyData.getSpecLsl(), "specLsl", packBean);
+        }
+        if (keyData.getSpecUsl() != null) {
+            DdlPreparedPack.getNumEqualPack(keyData.getSpecUsl(), "specUsl", packBean);
+        }
+        return packBean;
+    }
     /**
      * MES 物料关键数据关系信息查询条件封装
      *
@@ -2299,6 +2327,25 @@ public class MesHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getMesSpcKeyData(MesSpcKeyData spcKeyData) {
+        DdlPackBean packBean = getAllBaseData(spcKeyData.getOrganizeCode());
+        if (!StringUtils.isEmpty(spcKeyData.getIsValid())) {
+            DdlPreparedPack.getNumEqualPack(spcKeyData.getIsValid(), "isValid", packBean);
+        }
+        if (!StringUtils.isEmpty(spcKeyData.getKdCode())) {
+            DdlPreparedPack.getStringEqualPack(spcKeyData.getKdCode(), "kdCode", packBean);
+        }
+        if (spcKeyData.getObjectType() != null) {
+            DdlPreparedPack.getNumEqualPack(spcKeyData.getObjectType(), "objectType", packBean);
+        }
+        if (!StringUtils.isEmpty(spcKeyData.getObjectCode())) {
+            DdlPreparedPack.getStringEqualPack(spcKeyData.getObjectCode(), "objectCode", packBean);
+        }
+        if (!StringUtils.isEmpty(spcKeyData.getFieldCode())) {
+            DdlPreparedPack.getStringEqualPack(spcKeyData.getFieldCode(), "fieldCode", packBean);
+        }
+        return packBean;
+    }
     /**
      * 监听任务查询条件封装
      *

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

@@ -341,6 +341,29 @@ public class MesPcnHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (!StringUtils.isEmpty(dbCheckRecord.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(dbCheckRecord.getSerialNumber(), "serialNumber", packBean);
+        }
+        if (!StringUtils.isEmpty(dbCheckRecord.getDbCheckItem())) {
+            DdlPreparedPack.getStringLikerPack(dbCheckRecord.getDbCheckItem(), "dbCheckItem", packBean);
+        }
+        if (!StringUtils.isEmpty(dbCheckRecord.getErrorFiledCode())) {
+            DdlPreparedPack.getStringLikerPack(dbCheckRecord.getErrorFiledCode(), "errorFiledCode", packBean);
+        }
+        if (!StringUtils.isEmpty(dbCheckRecord.getProductDataId())) {
+            DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getProductDataId(), "productDataId", packBean);
+        }
+        if (!StringUtils.isEmpty(dbCheckRecord.getIsStopLine())) {
+            DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getIsStopLine(), "isStopLine", packBean);
+        }
+        if (!StringUtils.isEmpty(dbCheckRecord.getStatus())) {
+            DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getStatus(), "status", packBean);
+        }
+        return packBean;
+    }
+
     /**
      * 按条件分页查询产品条码补打印数据
      *

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

@@ -57,7 +57,7 @@ public class WmsMessageStyleModel implements Serializable {
         } else if (actQty == transQty) {//处理完成
             this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue();
         } else if (transQty < actQty) {//处理中 处理数量可以大于需求数量
-            this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue();
+            this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue();
         }
     }
 }

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

@@ -39,4 +39,7 @@ public class WmsStockFifoModel {
 
     @ApiParam("默认规则")
     private String defaultRule;
+
+    @ApiParam("同批次")
+    private boolean fifoSameBatch;
 }