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

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

@@ -1796,58 +1796,58 @@ public class MesEnumUtil {
      * mes导入模块
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_INSERT_EXCEL {
+    public enum MES_EXCEL {
-
+
-        MES_PLAN_ORDER(10, "planOrderExcelImportService", "生产计划"),
+        MES_PLAN_ORDER(10, "planOrderExcelService", "生产计划"),
-        MES_EQUIPMENT(20, "equipmentExcelImportService", "设备台账，支持编辑"),
+        MES_EQUIPMENT(20, "equipmentExcelService", "设备台账，支持编辑"),
-        MES_EQU_TASK_STANDARD(30, "equTaskStandardExcelImportService", "设备作业要求，支持编辑"),
+        MES_EQU_TASK_STANDARD(30, "equTaskStandardExcelService", "设备作业要求，支持编辑"),
-        MES_CUST_ORDER(40, "custOrderExcelImportService", "客户订单"),
+        MES_CUST_ORDER(40, "custOrderExcelService", "客户订单"),
-        MES_PCN_SYNC_CFG(50, "pcnSyncCfgExcelImportService", "PCN同步配置"),
+        MES_PCN_SYNC_CFG(50, "pcnSyncCfgExcelService", "PCN同步配置"),
-        MES_PART(60, "partExcelImportService", "物料表，支持编辑"),
+        MES_PART(60, "partExcelService", "物料表，支持编辑"),
-        MES_PRODUCE_CATEGORY(70, "produceCategoryExcelImportService", "产品类型"),
+        MES_PRODUCE_CATEGORY(70, "produceCategoryExcelService", "产品类型"),
-        MES_PACK_SPEC(80, "packSpecExcelImportService", "包装规格，支持编辑"),
+        MES_PACK_SPEC(80, "packSpecExcelService", "包装规格，支持编辑"),
-        MES_PROD_PACK(90, "prodPackExcelImportService", "产品包装关系"),
+        MES_PROD_PACK(90, "prodPackExcelService", "产品包装关系"),
-        MES_PRODUCT_ENCODE_CFG(100, "productEncodeCfgExcelImportService", "产品编码配置"),
+        MES_PRODUCT_ENCODE_CFG(100, "productEncodeCfgExcelService", "产品编码配置"),
-        MES_BOM(110, "bomExcelImportService", "物料清单，支持编辑"),
+        MES_BOM(110, "bomExcelService", "物料清单，支持编辑"),
-        MES_PROD_CFG_TYPE(120, "prodCfgTypeExcelImportService", "产品配置类型"),
+        MES_PROD_CFG_TYPE(120, "prodCfgTypeExcelService", "产品配置类型"),
-        MES_CUSTOMER(130, "customerExcelImportService", "客户表，支持编辑"),
+        MES_CUSTOMER(130, "customerExcelService", "客户表，支持编辑"),
-        MES_CUSTOMER_PART(140, "customerPartExcelImportService", "客户零件关系表，支持编辑"),
+        MES_CUSTOMER_PART(140, "customerPartExcelService", "客户零件关系表，支持编辑"),
-        MES_WORK_CENTER(150, "workCenterExcelImportService", "生产线，支持编辑"),
+        MES_WORK_CENTER(150, "workCenterExcelService", "生产线，支持编辑"),
-        MES_WORK_CELL(160, "workCellExcelImportService", "工位，支持编辑"),
+        MES_WORK_CELL(160, "workCellExcelService", "工位，支持编辑"),
-        MES_WC_EQUIPMENT(170, "wcEquipmentExcelImportService", "工位设备关系表"),
+        MES_WC_EQUIPMENT(170, "wcEquipmentExcelService", "工位设备关系表"),
-        MES_SHIFT(180, "shiftExcelImportService", "班次，支持编辑"),
+        MES_SHIFT(180, "shiftExcelService", "班次，支持编辑"),
-        MES_SHIFT_GROUP(190, "shiftGroupExcelImportService", "班组，支持编辑"),
+        MES_SHIFT_GROUP(190, "shiftGroupExcelService", "班组，支持编辑"),
-        MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelImportService", "工作单元参数配置"),
+        MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelService", "工作单元参数配置"),
-        MES_STATION_BOM(210, "stationBomExcelImportService", "工位BOM表"),
+        MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表"),
-        MES_DATA_OBJECT(220, "dataObjectExcelImportService", "数据对象"),
+        MES_DATA_OBJECT(220, "dataObjectExcelService", "数据对象"),
-        MES_OBJECT_CFG(230, "objectCfgExcelImportService", "对象结构"),
+        MES_OBJECT_CFG(230, "objectCfgExcelService", "对象结构"),
-        MES_WC_CHECK(240, "wcCheckExcelImportService", "开线检查，支持编辑"),
+        MES_WC_CHECK(240, "wcCheckExcelService", "开线检查，支持编辑"),
-        MES_QC_CHECK_STANDARD(250, "qcCheckStandardExcelImportService", "质量检测标准，支持编辑"),
+        MES_QC_CHECK_STANDARD(250, "qcCheckStandardExcelService", "质量检测标准，支持编辑"),
-        MES_FAULT_CAUSE(260, "faultCauseExcelImportService", "设备故障原因，支持编辑"),
+        MES_FAULT_CAUSE(260, "faultCauseExcelService", "设备故障原因，支持编辑"),
-        MES_FAULT_METHOD(270, "faultMethodExcelImportService", "设备故障处理措施，支持编辑"),
+        MES_FAULT_METHOD(270, "faultMethodExcelService", "设备故障处理措施，支持编辑"),
-        MES_FAULT_PHENOMENON(280, "faultPhenomenonExcelImportService", "设备故障现象，支持编辑"),
+        MES_FAULT_PHENOMENON(280, "faultPhenomenonExcelService", "设备故障现象，支持编辑"),
-        MES_DEFECT(290, "defectExcelImportService", "缺陷，支持编辑"),
+        MES_DEFECT(290, "defectExcelService", "缺陷，支持编辑"),
-        MES_DEFECT_CAUSE(300, "defectCauseExcelImportService", "缺陷原因，支持编辑"),
+        MES_DEFECT_CAUSE(300, "defectCauseExcelService", "缺陷原因，支持编辑"),
-        MES_SCRAP(310, "scrapExcelImportService", "报废原因，支持编辑"),
+        MES_SCRAP(310, "scrapExcelService", "报废原因，支持编辑"),
-        MES_REPAIR(320, "repairExcelImportService", "质量数据处理措施，支持编辑"),
+        MES_REPAIR(320, "repairExcelService", "质量数据处理措施，支持编辑"),
-        MES_EQU_TASK_PLAN(330, "equTaskPlanExcelImportService", "设备作业周期计划，支持编辑"),
+        MES_EQU_TASK_PLAN(330, "equTaskPlanExcelService", "设备作业周期计划，支持编辑"),
-        MES_PART_OJBECT(340, "partObjectExcelImportService", "物料对象"),
+        MES_PART_OJBECT(340, "partObjectExcelService", "物料对象"),
-        MES_ROUTE_PROCESS_WORK_CELL(350, "routeProcessWorkCellExcelImportService", "工序工作单元"),
+        MES_ROUTE_PROCESS_WORK_CELL(350, "routeProcessWorkCellExcelService", "工序工作单元"),
-        MES_DATASOURCE(360, "datasourceExcelImportService", "DB地址清单"),
+        MES_DATASOURCE(360, "datasourceExcelService", "DB地址清单"),
-        MES_EQU_TASK_NOTIFY_CFG(370, "equTaskNotifyCfgExcelImportService", "设备通知配置"),
+        MES_EQU_TASK_NOTIFY_CFG(370, "equTaskNotifyCfgExcelService", "设备通知配置"),
-        MES_EQU_NOTIFY_OBJECT_CFG(380, "equNotifyObjectCfgExcelImportService", "设备通知对象"),
+        MES_EQU_NOTIFY_OBJECT_CFG(380, "equNotifyObjectCfgExcelService", "设备通知对象"),
-        MES_PLC(390, "plcExcelImportService", "PLC地址清单，支持编辑"),
+        MES_PLC(390, "plcExcelService", "PLC地址清单，支持编辑"),
-        MES_PROCESS(400, "processExcelImportService", "工序信息"),
+        MES_PROCESS(400, "processExcelService", "工序信息"),
-        MES_KPSN_RULE(410, "kpsnRuleExcelImportService", "关键件条码校验规则，支持编辑"),
+        MES_KPSN_RULE(410, "kpsnRuleExcelService", "关键件条码校验规则，支持编辑"),
-        MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelImportService", "客户JIT生产队列"),
+        MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"),
-        MES_PART_BOM_IMPORT(430, "partBomExcelImportService", "散件BOM导入"),
+        MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"),
-        MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelImportService", "生产计划批量编制");
+        MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑");
 
         private int value;
         private String service;
         private String description;
 
-        MES_INSERT_EXCEL(int value, String service, String description) {
+        MES_EXCEL(int value, String service, String description) {
             this.value = value;
             this.service = service;
             this.description = description;
@@ -1865,10 +1865,10 @@ public class MesEnumUtil {
             return description;
         }
 
-        public static MES_INSERT_EXCEL getByValue(int value) {
+        public static MES_EXCEL getByValue(int value) {
-            for (MES_INSERT_EXCEL mesInsertExcel : values()) {
+            for (MES_EXCEL excel : values()) {
-                if (mesInsertExcel.getValue() == value) {
+                if (excel.getValue() == value) {
-                    return mesInsertExcel;
+                    return excel;
                 }
             }
             return null;
@@ -5174,4 +5174,226 @@ public class MesEnumUtil {
         }
     }
 
+
+    /**
+     * 	运算对象属性 运算类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OPERATE_TYPE {
+        OEE(10, "OEE"),
+        MTBF(20, "MTBF平均故障间隔"),
+        MTTR(30, "MTTR平均修理时间");
+
+        private int value;
+        private String description;
+
+        OPERATE_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 ATTRIBUTE_TYPE {
+        STANDARD_ATTRIBUTE(10, "标准属性"),
+        CUSTOM_ATTRIBUTE(20, "自定义属性");
+
+        private int value;
+        private String description;
+
+        ATTRIBUTE_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 VALUE_TYPE {
+        MANUAL_ASSIGNMENT(10, "手工赋值"),
+        SPEL_EXPRESSION(20, "spel表达式"),
+        FUNCTION_ASSIGNMENT(30, "函数赋值"),
+        JOB_ASSIGNMENT(40, "job赋值");
+
+        private int value;
+        private String description;
+
+        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 OBJECT_CODE {
+        ORGANIZE_OEE(10, "工厂OEE"),
+        WORK_CENTER_OEE(20, "产线OEE"),
+        WORK_CELL_CEE(30, "工位OEE"),
+        EQU_OEE(40, "设备OEE");
+
+        private int value;
+        private String description;
+
+        OBJECT_CODE(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;
+        }
+    }
+
+    /**
+     * 	脚本类型（组件、表单、报表、JOB、其他）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SCRIPT_TYPE {
+        ORGANIZE_OEE(10, "组件"),
+        WORK_CENTER_OEE(20, "表单"),
+        WORK_CELL_CEE(30, "报表"),
+        JOB(40, "JOB"),
+        OTHER(50, "其他");
+
+        private int value;
+        private String description;
+
+        SCRIPT_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;
+        }
+    }
+
+    /**
+     * 	语言类型（Groovy、Python、JavaScript、Scala、Ruby）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SCRIPT_LANGUAGE {
+        GROOVY(10, "Groovy"),
+        PYTHON(20, "Python"),
+        JAVA_SCRIPT(30, "JavaScript"),
+        SCALA(40, "Scala"),
+        RUBY(50, "Ruby");
+
+        private int value;
+        private String description;
+
+        SCRIPT_LANGUAGE(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/WmsEnumUtil.java

@@ -6508,6 +6508,53 @@ public class WmsEnumUtil {
     }
 
     /**
+     * BatchHold 值类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FG_INSTOCK_SN_TYPE {
+        NORMAL(10, "NORMAL", "实物条码(正常)"),
+        FIRST_PIECE(20, "FIRST_PIECE", "首件"),
+        MIDDLE_PIECE(30, "MIDDLE_PIECE", "中件"),
+        TAIL_PIECE(40, "TAIL_PIECE", "末件");
+
+        private int value;
+        private String code;
+        private String description;
+
+        FG_INSTOCK_SN_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
      * 返修、挑选状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -0,0 +1,112 @@
+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/28 4:19 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OEE")
+@Api("MES_OEE数据")
+public class MesOee extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -9163026983140909748L;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("运算对象代码")
+    private String objectCode;
+
+    @Column(name = "STATUS")
+    @ApiParam("运算状态")
+    private Integer status;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @Column(name = "OEE_DATE")
+    @ApiParam("日期")
+    private String oeeDate;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始时段")
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("结束时段")
+    private String endTime;
+
+    @Column(name = "TOTAL_RUN_TIME")
+    @ApiParam("总生产时间")
+    private String totalRunTime;
+
+    @Column(name = "TOTAL_STOP_TIME")
+    @ApiParam("总停机时间")
+    private String totalStopTime;
+
+    @Column(name = "TOTAL_QTY")
+    @ApiParam("总生产数")
+    private Integer totalQty;
+
+    @Column(name = "QUALIFIED_QTY")
+    @ApiParam("一次合格数")
+    private Integer qualifiedQty;
+
+    @Column(name = "PLAN_TAKT")
+    @ApiParam("计划节拍")
+    private Integer planTakt;
+
+    @Column(name = "ACTUAL_TAKT")
+    @ApiParam("实际节拍")
+    private Integer actualTakt;
+
+    @Column(name = "TIME_RATE")
+    @ApiParam("时间开动率")
+    private String timeRate;
+
+    @Column(name = "TAKT_RATE")
+    @ApiParam("性能开动率")
+    private String taktRate;
+
+    @Column(name = "QUALIFIED_RATE")
+    @ApiParam("良品率")
+    private String qualifiedRate;
+
+    @Column(name = "OEE")
+    @ApiParam("OEE")
+    private String oee;
+
+    @Column(name = "BUSI_DATA")
+    @ApiParam("自定义数据")
+    private String busiData;
+}

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

@@ -0,0 +1,45 @@
+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/28 4:04 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OPERATE_OBJECT")
+@Api("MES_运算对象")
+public class MesOperateObject extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 7829216855303543146L;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name = "OPERATE_TYPE")
+    @ApiParam("运算类型")
+    private Integer operateType;
+
+}

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

@@ -0,0 +1,48 @@
+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/28 4:08 下午
+ * @Modify:MES_OPERATE_OBJECT_CFG
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OPERATE_OBJECT_ATTRIBUTE")
+@Api("MES_运算对象属性")
+public class MesOperateObjectAttribute extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3916105499867386686L;
+
+    @Column(name = "ATTRIBUTE_CODE")
+    @ApiParam("属性代码")
+    private String attributeCode;
+
+    @Column(name = "ATTRIBUTE_NAME")
+    @ApiParam("属性名称")
+    private String attributeName;
+
+    @Column(name = "ATTRIBUTE_TYPE")
+    @ApiParam("属性类型")
+    private Integer attributeType;
+
+    @Column(name = "OPERATE_TYPE")
+    @ApiParam("运算类型")
+    private Integer operateType;
+}

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

@@ -0,0 +1,65 @@
+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/28 4:12 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OPERATE_OBJECT_ATTRIBUTE")
+@Api("MES_运算对象属性配置")
+public class MesOperateObjectCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8066603810736365082L;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "ATTRIBUTE_CODE")
+    @ApiParam("属性代码")
+    private String attributeCode;
+
+    @Column(name = "VALUE_TYPE")
+    @ApiParam("赋值类型")
+    private String valueType;
+
+    @Column(name = "METHOD_CODE")
+    @ApiParam("函数方法")
+    private String methodCode;
+
+    @Column(name = "JOB_ID")
+    @ApiParam("job编号")
+    private String jobId;
+
+    @Column(name = "SPEL_CONTENT")
+    @ApiParam("spel表达式")
+    private String spelContent;
+
+    @Column(name = "SEQ")
+    @ApiParam("运算顺序")
+    private Integer seq;
+
+    @Transient
+    @ApiParam("属性名称")
+    private String attributeName;
+}

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

@@ -0,0 +1,56 @@
+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/28 4:58 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SCRIPT_PERSISTENCE")
+@Api("动态脚本")
+public class MesScriptPersistence extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1941422535481564572L;
+
+    @Column(name = "SCRIPT_NO")
+    @ApiParam("脚本编号")
+    private String scriptNo;
+
+    @Column(name = "SCRIPT_NAME")
+    @ApiParam("脚本名称")
+    private String scriptName;
+
+    @Column(name = "SCRIPT_REMARK")
+    @ApiParam("脚本描述")
+    private String scriptRemark;
+
+    @Column(name = "SCRIPT_TYPE")
+    @ApiParam("脚本类型")
+    private Integer scriptType;
+
+    @Column(name = "LANGUAGE_TYPE")
+    @ApiParam("语言类型")
+    private Integer languageType;
+
+    @Column(name = "SCRIPT_CONTENT")
+    @ApiParam("脚本内容")
+    private String scriptContent;
+}

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

@@ -162,11 +162,11 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     private String reserved2;
 
     @Column(name = "RESERVED3")
-    @ApiParam("预留字段13")
+    @ApiParam("预留字段3")
     private String reserved3;
 
     @Column(name = "RESERVED4")
-    @ApiParam("预留字段14")
+    @ApiParam("预留字段4")
     private String reserved4;
 
     @Column(name = "RESERVED5")
@@ -178,18 +178,6 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam(value = "乐观锁", example = "1")
     public Integer lockVersion;
 
-    @Column(name = "CATEGORY_CODE1")
-    @ApiParam("类型1")
-    private String categoryCode1;
-
-    @Column(name = "CATEGORY_CODE2")
-    @ApiParam("类型2")
-    private String categoryCode2;
-
-    @Column(name = "CATEGORY_CODE3")
-    @ApiParam("类型3")
-    private String categoryCode3;
-
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")
@@ -272,6 +260,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("计划类型")
     private Integer planType;
 
+    @Transient
+    @ApiParam(value = "完成按钮编号")
+    public String comButtonCode;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -151,6 +151,26 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @ApiParam("首检生成数量")
     private Double fiGenerateQty;
 
+    @Column(name = "RESERVED1")
+    @ApiParam("预留字段1")
+    private String reserved1;
+
+    @Column(name = "RESERVED2")
+    @ApiParam("预留字段2")
+    private String reserved2;
+
+    @Column(name = "RESERVED3")
+    @ApiParam("预留字段3")
+    private String reserved3;
+
+    @Column(name = "RESERVED4")
+    @ApiParam("预留字段4")
+    private String reserved4;
+
+    @Column(name = "RESERVED5")
+    @ApiParam("预留字段5")
+    private String reserved5;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

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

@@ -16,23 +16,28 @@ import lombok.Data;
 @Api(value="生产工单导入",description = "生产工单导入")
 public class MesWorkOrderModel {
 
-    @ApiParam("工单号")
+    //工单号
+    @ApiParam("OrderCode")
     @AnnoOutputColumn
     private String orderNo;
 
-    @ApiParam("物料号")
+    //物料号
+    @ApiParam("ItemCode")
     @AnnoOutputColumn
     private String partNo;
 
-    @ApiParam("客户产线代码")
+    //客户产线代码
+    @ApiParam("ProductionLineID")
     @AnnoOutputColumn
     private String custProdLineCode;
 
-    @ApiParam("数量")
+    //数量
+    @ApiParam("DemandQty")
     @AnnoOutputColumn
     private Double qty;
 
-    @ApiParam("开始时间")
+    //开始时间
+    @ApiParam("ProductDate")
     @AnnoOutputColumn
     private String startTime;
 

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

@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description: 生产计划批量编制明细model
+ * @Author: wangjie
+ * @Date: 2020/4/21 6:55 下午
+ * @Modify:
+ */
+@Data
+public class ProdPlanBatchCompileDetailModel {
+
+    @ApiParam("日期")
+    private String date;
+
+    @ApiParam("日期对应到数量")
+    private Double qty;
+
+    @ApiParam("是否只读")
+    private Boolean readonly;
+
+    @ApiParam("完成数量")
+    private Double completeQty;
+
+    @ApiParam("完成数量的颜色")
+    private String color;
+
+    @ApiParam("工单号")
+    private String orderNo;
+
+}

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

@@ -0,0 +1,78 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 生产计划批量编制model
+ * @Author: wangjie
+ * @Date: 2020/4/21 6:55 下午
+ * @Modify:
+ */
+@Data
+public class ProdPlanBatchCompileModel {
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("预留字段1")
+    private String reserved1;
+
+    @ApiParam("预留字段2")
+    private String reserved2;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam(value = "班组名称")
+    public String shiftGroupName;
+
+    @ApiParam(value = "班次名称")
+    public String shiftName;
+
+    @ApiParam("班组")
+    private String shiftGroup;
+
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @ApiParam("客户名称")
+    private String custCodeName;
+
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
+    @ApiParam("预留字段3")
+    private String reserved3;
+
+    @ApiParam("预留字段4")
+    private String reserved4;
+
+    @ApiParam("单位")
+    private String unit;
+
+    @ApiParam("日期数量集合")
+    private List<ProdPlanBatchCompileDetailModel> detailList;
+
+    @ApiParam("合计")
+    private Double amount;
+
+    @ApiParam("完成合计")
+    private Double completeAmount;
+
+    @ApiParam("计划类型")
+    private Integer planType;
+
+    @ApiParam("计划类型名称")
+    private String planTypeName;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOeeRepository.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.MesOee;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 5:04 下午
+ * @Modify:
+ */
+@Repository
+public interface MesOeeRepository extends BaseRepository<MesOee, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectAttributeRepository.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.MesOperateObjectAttribute;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 5:05 下午
+ * @Modify:
+ */
+@Repository
+public interface MesOperateObjectAttributeRepository extends BaseRepository<MesOperateObjectAttribute, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectCfgRepository.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.MesOperateObjectCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 5:04 下午
+ * @Modify:
+ */
+@Repository
+public interface MesOperateObjectCfgRepository extends BaseRepository<MesOperateObjectCfg, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectRepository.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.MesOperateObject;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 5:05 下午
+ * @Modify:
+ */
+@Repository
+public interface MesOperateObjectRepository extends BaseRepository<MesOperateObject, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScriptPersistenceRepository.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.MesScriptPersistence;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 5:03 下午
+ * @Modify:
+ */
+@Repository
+public interface MesScriptPersistenceRepository extends BaseRepository<MesScriptPersistence, Long> {
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java

@@ -19,4 +19,8 @@ public class ExportDataModel {
 
     private String exportCol;
 
+    private String title;
+
+    private Integer module;
+
 }

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

@@ -71,7 +71,7 @@ public class WmsFGInStock extends BaseBean {
     public String remark;
 
     /**
-     * 来源：MNU=手工,MES=MES接口
+     * 来源：BH:BatchHold,MNU=手工,MES=MES接口
      */
     @Column(name = "SRC")
     @ApiParam("单据来源")
@@ -100,4 +100,19 @@ public class WmsFGInStock extends BaseBean {
     @Column(name = "MFG_LOG_NO")
     @ApiParam("生产批次")
     public String mfgLogNo;
+
+    @Column(name = "BATCH_NO")
+    @ApiParam("batch号")
+    private String batchNo;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("箱条码")
+    private String packageNo;
+
+    /**
+     * 条码类型：10=实物条码(正常),20=首件,30=中件,40=末件
+     */
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型")
+    private Integer snType;
 }

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

@@ -2877,6 +2877,39 @@ public class WmsHqlPack {
     }
 
     /**
+     * 库区物料信息分页查询条件
+     *
+     * @param itemCheck
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPartItemCheck(WmsPartItemCheck itemCheck) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(itemCheck.getPartNo(), "partNo", result);
+
+        getStringBuilderPack(itemCheck, result);
+
+        return result;
+    }
+
+    /**
+     * BH子检测项分页查询条件
+     *
+     * @param item
+     * @return
+     */
+    public static DdlPackBean packHqlWmsBhChildDetectionItem(WmsBhChildDetectionItem item) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(item.getItemCheckCode(), "itemCheckCode", result);
+        DdlPreparedPack.getStringLikerPack(item.getItemCheckName(), "itemCheckName", result);
+
+        getStringBuilderPack(item, result);
+
+        return result;
+    }
+
+    /**
      * 根据条件查询dataAuth
      *
      * @param wmsSnOperateRecord