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 {

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/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java

@@ -0,0 +1,68 @@
+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")
+@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;
+
+}

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/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:
  **/