Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -13,7 +13,234 @@ public class MesEnumUtil {
 
 
     /**
-     * mes设备作业要求-作业类型
+     * mes设备作业任务明细-执行状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_EQU_TASK_DETAIL_ACTION_STATUS {
+
+        PENDING(10, "待处理"),
+        COMPLETE(20, "已完成"),
+        CANCEL(30, "取消");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_DETAIL_ACTION_STATUS(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 MES_EQU_TASK_DETAIL_FINAL_RESULT {
+
+        YES(10, "合格"),
+        NO(20, "不合格");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_DETAIL_FINAL_RESULT(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 MES_EQU_TASK_DETAIL_REPAIR_FLAG {
+
+        FALSE(10, "否"),
+        TRUE(20, "是");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_DETAIL_REPAIR_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;
+        }
+
+    }
+
+    /**
+     * mes设备作业状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_EQU_TASK_STATUS {
+
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        OPEN(30, "开启"),
+        CLOSE(40, "关闭"),
+        CANCEL(50, "取消");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_STATUS(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 MES_EQU_TASK_SOURCE {
+
+        PLAN(10, "周期计划"),
+        CREATE(20, "手工创建"),
+        ANDON(30, "ANDON");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_SOURCE(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 MES_EQU_TASK_NOTIFY_FLAG {
+
+        FALSE(10, "未通知"),
+        TRUE(20, "已通知");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_NOTIFY_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;
+        }
+
+    }
+
+    /**
+     * mes导入模块
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_INSERT_EXCEL {
@@ -62,10 +289,10 @@ public class MesEnumUtil {
     }
 
     /**
-     * mes设备作业要求-作业类型
+     * mes设备-作业类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_EQU_TASK_STANDARD_TASK_TYPE {
+    public enum MES_EQU_TASK_TYPE {
 
         CHECK(10, "点检"),
         MAINTAIN(20, "保养"),
@@ -74,7 +301,7 @@ public class MesEnumUtil {
         private int value;
         private String description;
 
-        MES_EQU_TASK_STANDARD_TASK_TYPE(int value, String description) {
+        MES_EQU_TASK_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1242,6 +1469,7 @@ public class MesEnumUtil {
         CUSTOM_COMPONENT("customComponent", "定制内容"),
         TASK_COMPLETE("taskComplete", "整个扫描完成"),
         STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
+        RUNNING_INFO("runningInfo", "运行信息"),
         RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
 
 

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

@@ -621,7 +621,9 @@ public class WmsEnumUtil {
         AMPR(230, "AMPR", "AMPR"),
         FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"),
         VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"),
-        VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库");
+        VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"),
+        VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"),
+        VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料");
 
 
         private int value;
@@ -792,7 +794,10 @@ public class WmsEnumUtil {
         VDAINSTOCK("VDAINSTOCK", "VDA入库"),
         VDAMOVESTOCK("VDAMOVESTOCK", "VDA内部移库"),
         VDA_FAST_STOCK("VDA_FAST_STOCK", "VDA采购快速入库"),
-        VDAREPORT("VDAREPORT", "VDA生产报工");
+        VDAREPORT("VDAREPORT", "VDA生产报工"),
+        VDA_FINISH_GOODS("VDA_FINISH_GOODS", "VDA生产快速入库"),
+        VDA_PICKING_GOODS("VDA_PICKING_GOODS", "VDA生产领料"),
+        VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料");
 
         private String value;
         private String description;

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

@@ -14,10 +14,10 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description :mes系统业务动作
+ * @Description :工位投料信息
  * @Reference :
- * @Author : jack.jia
- * @CreateDate : 2019-04-12
+ * @Author : Wynne.Lu
+ * @CreateDate : 2019-09-17
  * @Modify:
  **/
 @Data
@@ -54,7 +54,7 @@ public class MesCellFeed extends BaseBean {
 
     @Column(name = "RAW_QTY")
     @ApiParam("特殊批次")
-    private Long rawQty;
+    private Double rawQty;
 
     @Column(name = "LOT_NO")
     @ApiParam("关联批次")
@@ -64,7 +64,7 @@ public class MesCellFeed extends BaseBean {
     @ApiParam("供应商代码")
     private String supplierCode;
 
-    public long getRawQtyVal() {
+    public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;
     }
 

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Author: Wynne.Lu
@@ -27,6 +28,7 @@ import javax.persistence.Table;
 @Api("PLC配置表")
 public class MesPlc extends BaseBean {
 
+
     @Column(name = "PLC_CODE")
     @ApiParam("PLC代码")
     private String plcCode;
@@ -63,23 +65,31 @@ public class MesPlc extends BaseBean {
     @ApiParam("分组名称")
     private String groupName;
 
-    @Column(name="EQUIPMENT_CODE")
+    @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")
     private String equipmentCode;
 
     @Column(name = "WORK_CENTER_CODE")
-    @ApiParam("工作中心")
+    @ApiParam("生产线")
     private String workCenterCode;
 
     @Column(name = "WORK_CELL_CODE")
-    @ApiParam("工作单元")
+    @ApiParam("工位")
     private String workCellCode;
 
-    @Column(name = "ENABLED")
-    @ApiParam("是否启用 0 false 1 true")
-    private Integer enabled;
-
     @Column(name = "PLC_CFG")
     @ApiParam("PLC的值的设定")
     private String plcCfg;
+
+    @Column(name = "ANALYSIS_RULE")
+    @ApiParam("解析规则")
+    private String analysisRule;
+
+    @Column(name = "IS_ANALYSIS")
+    @ApiParam("是否解析")
+    private String isAnalysis;
+
+    @Transient
+    @ApiParam("设备名称")
+    private String equipmentName;
 }

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

@@ -0,0 +1,95 @@
+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.Table;
+
+/**
+ * @Description :生产数据
+ * @Reference :
+ * @Author : Wynne.Lu
+ * @CreateDate : 2019-10-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PRODUCT_DATA")
+@Api("生产数据")
+public class MesProductData extends BaseBean {
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "WORK_CELL_NAME")
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_DESC")
+    @ApiParam("物料名称")
+    private String partDesc;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @Column(name = "EQU_NAME")
+    @ApiParam("设备名称")
+    private String equName;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name = "FIELD_CODE")
+    @ApiParam("字段代码")
+    private String fieldCode;
+
+    @Column(name = "FIELD_NAME")
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @Column(name = "FIELD_VALUE")
+    @ApiParam("字段值")
+    private String fieldValue;
+
+    @Column(name = "ROW_NO")
+    @ApiParam("数据行号")
+    private String rowNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("数据组号")
+    private String groupNo;
+
+}

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

@@ -46,7 +46,7 @@ public class MesRawPartSn extends BaseBean {
 
     @Column(name = "RAW_QTY")
     @ApiParam("数量")
-    private Long rawQty;
+    private Double rawQty;
 
     @Column(name = "LOT_NO")
     @ApiParam("生产批次")
@@ -64,7 +64,7 @@ public class MesRawPartSn extends BaseBean {
     @ApiParam("供应商代码")
     private String supplierCode;
 
-    public long getRawQtyVal() {
+    public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;
     }
 

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

@@ -0,0 +1,61 @@
+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.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/16 2:42 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_MONITOR_LOG")
+@Api("工位监控异常信息")
+public class MesWorkCellMonitorLog extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("工单")
+    private String workOrderNo;
+
+    @Column(name = "STEP_CODE")
+    @ApiParam("工步")
+    private String stepCode;
+
+    @Column(name = "PROCESS_CODE")
+    @ApiParam("工序")
+    private String processCode;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程")
+    private String routeCOde;
+
+    @Column(name="MESSAGE")
+    @ApiParam("异常信息")
+    private String message;
+}

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

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

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellMonitorLog;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/27 1:58 PM
+ * @Description:
+ **/
+public interface MesWorkCellMonitorLogRepository extends BaseRepository<MesWorkCellMonitorLog, Long> {
+}

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

@@ -14,10 +14,10 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description :mes系统业务动作
+ * @Description :工位投料信息
  * @Reference :
- * @Author : jack.jia
- * @CreateDate : 2019-04-12
+ * @Author : Wynne.Lu
+ * @CreateDate : 2019-09-17
  * @Modify:
  **/
 @Data
@@ -54,7 +54,7 @@ public class MesCellFeed extends BaseBean {
 
     @Column(name = "RAW_QTY")
     @ApiParam("特殊批次")
-    private Long rawQty;
+    private Double rawQty;
 
     @Column(name = "LOT_NO")
     @ApiParam("关联批次")
@@ -65,7 +65,7 @@ public class MesCellFeed extends BaseBean {
     private String supplierCode;
 
 
-    public long getRawQtyVal() {
+    public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;
     }
 

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

@@ -0,0 +1,86 @@
+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.util.List;
+
+/**
+ * @Description :设备作业任务
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_EQU_TASK")
+@Api("设备作业任务")
+public class MesEquTask extends BaseBean {
+
+    @Column(name="TASK_NO")
+    @ApiParam("作业任务编号")
+    private String taskNo;
+
+    @Column(name="TASK_TYPE")
+    @ApiParam("作业类型")
+    private Integer taskType;
+
+    @Column(name="TASK_STATUS")
+    @ApiParam("作业状态")
+    private Integer taskStatus;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam(value="生产线")
+    private String workCenterCode;
+
+    @Column(name="PLAN_TIME")
+    @ApiParam("计划日期")
+    private String planTime;
+
+    @Column(name="TASK_SOURCE")
+    @ApiParam("任务来源")
+    private Integer taskSource;
+
+    @Column(name="MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    @Column(name="NOTIFY_FLAG")
+    @ApiParam("通知标识")
+    private Integer notifyFlag;
+
+    @Column(name="RELATE_TASK")
+    @ApiParam("关联任务")
+    private String relateTask;
+
+    @Transient
+    @ApiParam(value = "设备代码")
+    private String equipmentCode;
+
+    @Transient
+    @ApiParam(value = "计划日期起始时间")
+    private String planTimeStart;
+
+    @Transient
+    @ApiParam(value = "计划日期结束时间")
+    private String planTimeEnd;
+
+    @Transient
+    @ApiParam(value ="明细列表")
+    private List<MesEquTaskDetail> mesEquTaskDetailList;
+
+}

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

@@ -0,0 +1,61 @@
+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;
+
+/**
+ * @Description :设备作业任务明细
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_EQU_TASK_DETAIL")
+@Api("设备作业任务明细")
+public class MesEquTaskDetail extends BaseBean {
+
+    @Column(name="TASK_NO")
+    @ApiParam("作业任务编号")
+    private String taskNo;
+
+    @Column(name="EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @Column(name="EQUIPMENT_NAME")
+    @ApiParam("设备名称")
+    private String equipmentName;
+
+    @Column(name="ACTION_STATUS")
+    @ApiParam("执行状态")
+    private Integer actionStatus;
+
+    @Column(name="FINAL_RESULT")
+    @ApiParam("整体结果")
+    private Integer finalResult;
+
+    @Column(name="MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    @Column(name="REPAIR_FLAG")
+    @ApiParam("维修标识")
+    private Integer repairFlag;
+
+
+}

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

@@ -61,4 +61,12 @@ public class MesEquTaskPlan extends BaseBean {
     @ApiParam(value="设备类别")
     private String equipmentCategory;
 
+    @Transient
+    @ApiParam("计划日期")
+    private String planTime;
+
+    @Transient
+    @ApiParam("作业任务编号")
+    private String taskNo;
+
 }

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

@@ -0,0 +1,95 @@
+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;
+
+/**
+ * @Description :生产数据
+ * @Reference :
+ * @Author : Wynne.Lu
+ * @CreateDate : 2019-10-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PRODUCT_DATA")
+@Api("生产数据")
+public class MesProductData extends BaseBean {
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "WORK_CELL_NAME")
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_DESC")
+    @ApiParam("物料名称")
+    private String partDesc;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @Column(name = "EQU_NAME")
+    @ApiParam("设备名称")
+    private String equName;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name = "FIELD_CODE")
+    @ApiParam("字段代码")
+    private String fieldCode;
+
+    @Column(name = "FIELD_NAME")
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @Column(name = "FIELD_VALUE")
+    @ApiParam("字段值")
+    private String fieldValue;
+
+    @Column(name = "ROW_NO")
+    @ApiParam("数据行号")
+    private String rowNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("数据组号")
+    private String groupNo;
+
+}

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

@@ -0,0 +1,61 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/16 2:42 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_MONITOR_LOG")
+@Api("工位监控异常信息")
+public class MesWorkCellMonitorLog extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "workOrderNo")
+    @ApiParam("工单")
+    private String workOrderNo;
+
+    @Column(name = "STEP_CODE")
+    @ApiParam("工步")
+    private String stepCode;
+
+    @Column(name = "PROCESS_CODE")
+    @ApiParam("工序")
+    private String processCode;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程")
+    private String routeCOde;
+
+    @Column(name="MESSAGE")
+    @ApiParam("异常信息")
+    private String message;
+}

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

@@ -0,0 +1,105 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MesEquTaskDetailModel implements Serializable {
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("作业任务编号")
+    private String taskNo;
+
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @ApiParam("设备名称")
+    private String equipmentName;
+
+    @ApiParam("执行状态")
+    private Integer actionStatus;
+
+    @ApiParam("整体结果")
+    private Integer finalResult;
+
+    @ApiParam("备注")
+    private String memo;
+
+    @ApiParam("维修标识")
+    private Integer repairFlag;
+
+    @ApiParam("作业类型")
+    private Integer taskType;
+
+    @ApiParam(value="生产线")
+    private String workCenterCode;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("有效性")
+    public Integer isValid;
+
+    @ApiParam("是否已删除")
+    public Integer isDeleted;
+
+    @ApiParam("创建用户")
+    public String createUser;
+
+    @ApiParam("创建日期")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改日期")
+    public String modifyDatetime;
+
+    @ApiParam("执行状态")
+    private String actionStatusName;
+
+    @ApiParam("整体结果")
+    private String finalResultName;
+
+    @ApiParam("维修标识")
+    private String repairFlagName;
+
+    @ApiParam("作业类型")
+    private String taskTypeName;
+
+
+    public MesEquTaskDetailModel() {
+
+    }
+
+    public MesEquTaskDetailModel(Long id, String taskNo, String equipmentCode, String equipmentName, String workCenterCode) {
+        this.id = id;
+        this.taskNo = taskNo;
+        this.equipmentCode = equipmentCode;
+        this.equipmentName = equipmentName;
+        this.workCenterCode = workCenterCode;
+    }
+
+    public MesEquTaskDetailModel(Long id, String taskNo, String equipmentCode, String equipmentName, Integer actionStatus, Integer finalResult, String memo, Integer repairFlag, Integer taskType, String workCenterCode, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+        this.id = id;
+        this.taskNo = taskNo;
+        this.equipmentCode = equipmentCode;
+        this.equipmentName = equipmentName;
+        this.actionStatus = actionStatus;
+        this.finalResult = finalResult;
+        this.memo = memo;
+        this.repairFlag = repairFlag;
+        this.taskType = taskType;
+        this.workCenterCode = workCenterCode;
+        this.organizeCode = organizeCode;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+}

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

@@ -0,0 +1,97 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MesEquTaskModel implements Serializable {
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("作业任务编号")
+    private String taskNo;
+
+    @ApiParam("作业类型")
+    private Integer taskType;
+
+    @ApiParam("作业状态")
+    private Integer taskStatus;
+
+    @ApiParam(value="生产线")
+    private String workCenterCode;
+
+    @ApiParam("计划日期")
+    private String planTime;
+
+    @ApiParam("任务来源")
+    private Integer taskSource;
+
+    @ApiParam("备注")
+    private String memo;
+
+    @ApiParam("通知标识")
+    private Integer notifyFlag;
+
+    @ApiParam("关联任务")
+    private String relateTask;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("有效性")
+    public Integer isValid;
+
+    @ApiParam("是否已删除")
+    public Integer isDeleted;
+
+    @ApiParam("创建用户")
+    public String createUser;
+
+    @ApiParam("创建日期")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改日期")
+    public String modifyDatetime;
+
+    @ApiParam("作业类型")
+    private String taskTypeName;
+
+    @ApiParam("作业状态")
+    private String taskStatusName;
+
+    @ApiParam("任务来源")
+    private String taskSourceName;
+
+    @ApiParam("通知标识")
+    private String notifyFlagName;
+
+
+    public MesEquTaskModel() {
+
+    }
+
+    public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+        this.id = id;
+        this.taskNo = taskNo;
+        this.taskType = taskType;
+        this.taskStatus = taskStatus;
+        this.workCenterCode = workCenterCode;
+        this.planTime = planTime;
+        this.taskSource = taskSource;
+        this.memo = memo;
+        this.notifyFlag = notifyFlag;
+        this.relateTask = relateTask;
+        this.organizeCode = organizeCode;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+}

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

@@ -102,6 +102,15 @@ public class MesEquipmentModel implements Serializable {
 
     }
 
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) {
+        this.id = id;
+        this.equipmentCode = equipmentCode;
+        this.equipmentName = equipmentName;
+        this.status = status;
+        this.workCenterCode = workCenterCode;
+        this.equipmentCategory = equipmentCategory;
+    }
+
     public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) {
         this.wcId = wcId;
         this.id = id;

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Repository
+public interface MesEquTaskDetailRepository extends BaseRepository<MesEquTaskDetail, Long> {
+}

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

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
 /**
  * @Description :
  * @Reference :
- * @Author : 王杰
+ * @Author : wangjie
  * @CreateDate : 2019-10-11
  * @Modify:
  **/

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquTask;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Repository
+public interface MesEquTaskRepository extends BaseRepository<MesEquTask, Long> {
+}

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

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
 /**
  * @Description :
  * @Reference :
- * @Author : 王杰
+ * @Author : wangjie
  * @CreateDate : 2019-10-11
  * @Modify:
  **/

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

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

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

@@ -1,11 +1,12 @@
-package cn.estsh.i3plus.pojo.mes.pcn.model;
+package cn.estsh.i3plus.pojo.model.mes;
+
+
 
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Column;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description : 工位请求bean
@@ -64,4 +65,7 @@ public class StationRequestBean implements Serializable {
 
     @ApiParam("托盘号")
     private String tray;
+
+    @ApiParam("工步列表")
+    private List<StepModel> stepList;
 }

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

@@ -47,6 +47,18 @@ public class StepModel implements Serializable {
     private boolean isComplete;
 
     /**
+     * 工步颜色
+     */
+    @ApiParam
+    private String color;
+
+    /**
+     * 异常信息
+     */
+    @ApiParam
+    private String exMsg;
+
+    /**
      * 工位扫描业务所需使用字段
      */
     @ApiParam("工步是否跳过")