设备作业周期 新增planCfgCode

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

@@ -43,9 +43,9 @@ public class MesEquTaskPlan extends BaseBean implements Serializable {
     @ApiParam("作业类型")
     private Integer taskType;
 
-    @Column(name = "CYCLE_TYPE")
-    @ApiParam("周期类型")
-    private Integer cycleType;
+    @Column(name = "PLAN_CFG_CODE")
+    @ApiParam("计划配置代码")
+    private String planCfgCode;
 
     @Column(name = "TASK_CYCLE")
     @ApiParam("周期(天)")

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description :设备计划配置
+ * @Reference :
+ * @Author : Wynne.Lu
+ * @CreateDate : 2020-10-15
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_TASK_PLAN_CFG")
+@Api("设备周期作业计划配置")
+public class MesEquTaskPlanCfg extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 7734079474434307857L;
+
+    @Column(name = "PLAN_CFG_CODE")
+    @ApiParam("计划配置代码")
+    private String planCfgCode;
+
+    @Column(name = "BACKGROUND_COLOR")
+    @ApiParam("显示背景色")
+    private String backgroundColor;
+
+    @Column(name = "COLOR")
+    @ApiParam("字体颜色")
+    private String color;
+
+    @Column(name = "CYCLE")
+    @ApiParam("周期(天)")
+    private Integer taskCycle;
+
+    @Column(name = "DISPLAY_TEXT")
+    @ApiParam("显示文字")
+    private String displayText;
+
+}

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

@@ -196,6 +196,22 @@ public class StationRequestBean implements Serializable {
     @ApiParam("密码")
     private String password;
 
+    public StationRequestBean() {
+    }
+
+    public StationRequestBean(String organizeCode, String workCenterCode, String workCellCode) {
+        this.organizeCode = organizeCode;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+    }
+
+    public StationRequestBean(String organizeCode, String workCenterCode, String workCellCode, String userInfo) {
+        this.organizeCode = organizeCode;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.userInfo = userInfo;
+    }
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.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.MesEquTaskPlanCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Repository
+public interface MesEquTaskPlanCfgRepository extends BaseRepository<MesEquTaskPlanCfg, Long> {
+}

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

@@ -897,6 +897,7 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
     /**
      * MES 物料关键数据关系信息查询条件封装
      *
@@ -1659,6 +1660,24 @@ public class MesHqlPack {
     }
 
     /**
+     * 设备任务配置  查询条件封装
+     *
+     * @param equTaskPlanCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean findEquTaskPlanCfg(MesEquTaskPlanCfg equTaskPlanCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(equTaskPlanCfg, organizeCode);
+        if (!StringUtils.isEmpty(equTaskPlanCfg.getPlanCfgCode())) {
+            DdlPreparedPack.getStringLikerPack(equTaskPlanCfg.getPlanCfgCode(), "planCfgCode", packBean);
+        }
+        if (!StringUtils.isEmpty(equTaskPlanCfg.getDisplayText())) {
+            DdlPreparedPack.getStringLikerPack(equTaskPlanCfg.getDisplayText(), "displayText", packBean);
+        }
+        return packBean;
+    }
+
+    /**
      * MES 类型信息查询条件封装
      *
      * @param mesTypeCfg
@@ -2348,6 +2367,7 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
     /**
      * 监听任务查询条件封装
      *
@@ -3309,6 +3329,7 @@ public class MesHqlPack {
 
     /**
      * 客户JIT队列下达配置
+     *
      * @param jitIssueCfg
      * @param organizeCode
      * @return
@@ -3335,6 +3356,7 @@ public class MesHqlPack {
 
     /**
      * 条码照片关系
+     *
      * @param snPhotoRelation
      * @param organizeCode
      * @return