新增控制计划相关接口

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

@@ -7588,4 +7588,118 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 过程检测检测对象数据类型
+     */
+    @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;
+        }
+    }
+
+    /**
+     * 过程检测数据源类型
+     */
+    @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;
+        }
+    }
+
+    /**
+     * 控制计划审核状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CONTROL_PLAN_AUDIT_TYPE {
+        WAIT_AUDIT(10, "待审核"),
+        AUDIT_PASS(20, "审核通过"),
+        AUDIT_NON_PASS(30, "审核驳回");
+
+        private int value;
+        private String description;
+
+        CONTROL_PLAN_AUDIT_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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java

@@ -26,30 +26,39 @@ import java.io.Serializable;
 @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")
+    @Column(name = "PART_NO")
-//    @ApiParam("工作单元代码")
+    @ApiParam("物料编码")
-//    private String workCellCode;
+    private String partNo;
 
-    @Column(name = "product_name")
+    @Column(name = "PART_NAME")
-    @ApiParam("产品名称")
+    @ApiParam("物料名称")
-    private String productName;
+    private String partName;
 
     @Column(name = "CUST_CODE")
     @ApiParam("客户代码")
     private String custCode;
 
+    @Column(name = "CUST_NAME")
+    @ApiParam("客户名称")
+    private String custName;
+
     @Column(name = "VERSION")
     @ApiParam("版本号")
-    private String version;
+    private Integer version;
+
+    @Column(name = "AUDIT_TYPE")
+    @ApiParam("审核状态")
+    private Integer auditType;
+
+    @Column(name = "IS_ENABLE")
+    @ApiParam("是否启用")
+    private Integer isEnable;
 
-    @Column(name = "EDIT_TYPE")
-    @ApiParam("编辑状态")
-    private Integer editType;
 }

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

@@ -34,18 +34,18 @@ public class MesQualityStandard extends BaseBean implements Serializable {
     @ApiParam("控制计划表主键ID")
     private Long controlPlanId;
 
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
     @Column(name = "VERSION")
     @ApiParam("版本")
-    private String version;
+    private Integer version;
-
-    @Column(name = "PART_NO")
-    @ApiParam("物料编码")
-    private String partNo;
 
     //检测类型：10=首检，20=巡检，30=终检，40=发运检
     @Column(name = "CHECK_TYPE")
     @ApiParam("检测类型")
-    private Integer CHECK_TYPE;
+    private Integer checkType;
 
     @Column(name = "CHECK_ITEM_TYPE")
     @ApiParam("检测项类型")
@@ -87,17 +87,17 @@ public class MesQualityStandard extends BaseBean implements Serializable {
     //任务单类型,动态枚举
     @Column(name = "CHECK_ORDER_TYPE")
     @ApiParam("任务单类型")
-    private String CHECK_ORDER_TYPE;
+    private String checkOrderType;
 
     //数据来源：10=手工录入，20=PLC，30=DB
     @Column(name = "DATA_SOURCE")
     @ApiParam("数据来源")
-    private String DATA_SOURCE;
+    private String dataSource;
 
     //检验值类型：10=字符串，20=数值
     @Column(name = "CHECK_VALUE_TYPE")
     @ApiParam("检验值类型")
-    private String CHECK_VALUE_TYPE;
+    private String checkValueType;
 
     @Column(name = "DIFFERENCE_MAX_LIMIT")
     @ApiParam("公差上限")
@@ -109,10 +109,10 @@ public class MesQualityStandard extends BaseBean implements Serializable {
 
     @Column(name = "IS_KEY_CHECK_ITEM")
     @ApiParam("是否关键检测项")
-    private Integer IS_KEY_CHECK_ITEM;
+    private Integer isKeyCheckItem;
 
     @Column(name = "CHECK_CFG_NO")
     @ApiParam("检测值配置编号")
-    private String CHECK_CFG_NO;
+    private String checkCfgNo;
 
 }

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @CreateDate: 2020/9/29
+ * @Author: simon.song
+ */
+@Data
+public class MesControlPlanModel {
+
+    @ApiParam("控制计划主键ID")
+    private Long id;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @ApiParam("客户名称")
+    private String custName;
+
+    @ApiParam("版本号")
+    private Integer version;
+
+    @ApiParam("审核状态")
+    private Integer auditType;
+
+    @ApiParam("是否启用")
+    private Integer isEnable;
+
+    @ApiParam("质量标准数组")
+    private List<MesQualityStandardModel> standardList;
+
+}

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

@@ -0,0 +1,136 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Description: 控制计划导入模板
+ * @CreateDate: 2020/9/29
+ * @Author: simon.song
+ */
+@Data
+@Api(value="控制计划导入模板",description = "控制计划导入模板")
+public class MesControlPlanTemplateModel extends BaseBean {
+
+    private static final long serialVersionUID = 6846982556729401884L;
+
+    @ApiParam("工作中心代码")
+    @AnnoOutputColumn
+    private String workCenterCode;
+
+    @ApiParam("物料编码")
+    @AnnoOutputColumn
+    private String partNo;
+
+    @ApiParam("物料名称")
+    @AnnoOutputColumn
+    private String partName;
+
+    @ApiParam("客户代码")
+    @AnnoOutputColumn
+    private String custCode;
+
+    @ApiParam("客户名称")
+    @AnnoOutputColumn
+    private String custName;
+
+    @ApiParam("控制计划版本号")
+    @AnnoOutputColumn
+    private Integer controlPlanVersion;
+
+    @ApiParam("是否启用")
+    @AnnoOutputColumn
+    private Integer isEnable;
+
+//    @Column(name = "IS_ENABLE")
+//    @ApiParam("是否启用")
+//    private Integer isEnable;
+
+    @ApiParam("工作单元代码")
+    @AnnoOutputColumn
+    private String workCellCode;
+
+    @ApiParam("质量标准版本")
+    @AnnoOutputColumn
+    private Integer qualityStandardVersion;
+
+    //检测类型：10=首检，20=巡检，30=终检，40=发运检
+    @ApiParam("检测类型")
+    @AnnoOutputColumn
+    private Integer checkType;
+
+    @ApiParam("检测项类型")
+    @AnnoOutputColumn
+    private String checkItemType;
+
+    @ApiParam("检测项")
+    @AnnoOutputColumn
+    private String checkItem;
+
+    @ApiParam("检测标准")
+    @AnnoOutputColumn
+    private String checkStandard;
+
+    @ApiParam("检测指导")
+    @AnnoOutputColumn
+    private String checkGuide;
+
+    @ApiParam("频率")
+    @AnnoOutputColumn
+    private String checkFrequency;
+
+    @ApiParam("是否允许让步")
+    @AnnoOutputColumn
+    private String isConcession;
+
+    @ApiParam("间隔时间")
+    @AnnoOutputColumn
+    private String checkInterval;
+
+    //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2
+    @ApiParam("个数标识")
+    @AnnoOutputColumn
+    private String numberFlag;
+
+    @ApiParam("检测数量")
+    @AnnoOutputColumn
+    private Integer qty;
+
+    //任务单类型,动态枚举
+    @ApiParam("任务单类型")
+    @AnnoOutputColumn
+    private String checkOrderType;
+
+    //数据来源：10=手工录入，20=PLC，30=DB
+    @ApiParam("数据来源")
+    @AnnoOutputColumn
+    private String dataSource;
+
+    //检验值类型：10=字符串，20=数值
+    @ApiParam("检验值类型")
+    @AnnoOutputColumn
+    private String checkValueType;
+
+    @ApiParam("公差上限")
+    @AnnoOutputColumn
+    private BigDecimal differenceMaxLimit;
+
+    @ApiParam("公差下限")
+    @AnnoOutputColumn
+    private BigDecimal differenceMinLimit;
+
+    @ApiParam("是否关键检测项")
+    @AnnoOutputColumn
+    private Integer isKeyCheckItem;
+
+    @ApiParam("检测值配置编号")
+    @AnnoOutputColumn
+    private String checkCfgNo;
+
+}

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

@@ -0,0 +1,83 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Description:
+ * @CreateDate: 2020/9/29
+ * @Author: simon.song
+ */
+@Data
+public class MesQualityStandardModel {
+
+    @ApiParam("质量标准主键ID")
+    private Long id;
+
+    @ApiParam("控制计划表主键ID")
+    private Long controlPlanId;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("版本")
+    private Integer version;
+
+    //检测类型：10=首检，20=巡检，30=终检，40=发运检
+    @ApiParam("检测类型")
+    private Integer checkType;
+
+    @ApiParam("检测项类型")
+    private String checkItemType;
+
+    @ApiParam("检测项")
+    private String checkItem;
+
+    @ApiParam("检测标准")
+    private String checkStandard;
+
+    @ApiParam("检测指导")
+    private String checkGuide;
+
+    @ApiParam("频率")
+    private String checkFrequency;
+
+    @ApiParam("是否允许让步")
+    private String isConcession;
+
+    @ApiParam("间隔时间")
+    private String checkInterval;
+
+    //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2
+    @ApiParam("个数标识")
+    private String numberFlag;
+
+    @ApiParam("检测数量")
+    private Integer qty;
+
+    //任务单类型,动态枚举
+    @ApiParam("任务单类型")
+    private String checkOrderType;
+
+    //数据来源：10=手工录入，20=PLC，30=DB
+    @ApiParam("数据来源")
+    private String dataSource;
+
+    //检验值类型：10=字符串，20=数值
+    @ApiParam("检验值类型")
+    private String checkValueType;
+
+    @ApiParam("公差上限")
+    private BigDecimal differenceMaxLimit;
+
+    @ApiParam("公差下限")
+    private BigDecimal differenceMinLimit;
+
+    @ApiParam("是否关键检测项")
+    private Integer isKeyCheckItem;
+
+    @ApiParam("检测值配置编号")
+    private String checkCfgNo;
+}

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

@@ -3389,4 +3389,27 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(mesSubPart.getIsValid(), "isValid", packBean);
         return packBean;
     }
+
+    public static DdlPackBean getControlPlan(MesControlPlan controlPlan) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(controlPlan.getOrganizeCode(), controlPlan.getIsValid());
+        if (!StringUtils.isEmpty(controlPlan.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(controlPlan.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+//        if (!StringUtils.isEmpty(controlPlan.getWorkCellCode())) {
+//            DdlPreparedPack.getStringEqualPack(controlPlan.getWorkCellCode(), "workCellCode", packBean);
+//        }
+        if (!StringUtils.isEmpty(controlPlan.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(controlPlan.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(controlPlan.getCustCode())) {
+            DdlPreparedPack.getStringEqualPack(controlPlan.getCustCode(), "custCode", packBean);
+        }
+        if (!StringUtils.isEmpty(controlPlan.getVersion())) {
+            DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getVersion(), "version", packBean);
+        }
+        if (!StringUtils.isEmpty(controlPlan.getAuditType())) {
+            DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getAuditType(), "auditType", packBean);
+        }
+        return packBean;
+    }
 }