MES新增班次休息表、物料关键数据关系表

6 years ago · 280f9a2233
parent 623dfed52b
commit 280f9a2233
8 changed files with 361 additions and 1 deletions
--- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/model/SysOrganizeModel.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/model/SysOrganizeModel.java
@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import cn.estsh.i3plus.pojo.andon.bean.MesArea;
+import io.swagger.annotations.ApiParam;
+
+import javax.persistence.Transient;
+import java.util.List;
+
+public class SysOrganizeModel{
+
+    @Transient
+    @ApiParam(value ="父节点")
+    private Long parentId;
+
+    @Transient
+    @ApiParam(value ="名称")
+    private String name;
+
+    @Transient
+    @ApiParam(value ="子集列表")
+    private List<MesArea> childTreeList;
+
+    public List<MesArea> getChildTreeList() {
+        return childTreeList;
+    }
+
+    public void setChildTreeList(List<MesArea> childTreeList) {
+        this.childTreeList = childTreeList;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
@ -310,6 +310,26 @@ public class AndonHqlPack {
    }

    /**
+     * MES班次信息查询条件封装
+     * @param shift
+     * @return
+     */
+    public static DdlPackBean getMesShift(MesShift shift, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode);
+        if (StringUtils.isNotEmpty(shift.getShiftCode())){
+            DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(shift.getShiftName())){
+            DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean);
+        }
+        if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){
+            DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
     * 通知配置信息封装
     * @param responseCfg
     * @return
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java
@ -33,7 +33,7 @@ public class MesKeyData extends BaseBean {

    @Column(name="KEY_DATA_NAME")
    @ApiParam("关键数据名称")
-    private Integer keyDataName;
+    private String keyDataName;

    @Column(name="UPPER_LIMIT")
    @ApiParam("数据上限")
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.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;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_KP_DATA")
+@Api("物料关键数据关系")
+public class MesKpData extends BaseBean {
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="KEY_DATA_CODE")
+    @ApiParam("关键数据代码")
+    private String keyDataCode;
+
+    @Column(name="KEY_DATA_NAME")
+    @ApiParam("关键数据名称")
+    private String keyDataName;
+
+    @Column(name="KEY_DATA_COUNT")
+    @ApiParam("关键数据数量")
+    private Integer keyDataCount;
+
+    @Column(name="UPPER_LIMIT")
+    @ApiParam("数据上限")
+    private Double upperLimit;
+
+    @Column(name="LOWER_LIMIT")
+    @ApiParam("数据下限")
+    private Double lowerLimit;
+
+    public double getKeyDataCountVal() {
+        return this.keyDataCount == null ? 0 : this.keyDataCount;
+    }
+
+    public double getUpperLimitVal() {
+        return this.upperLimit == null ? 0.0d : this.upperLimit;
+    }
+
+    public double getLowerLimitVal() {
+        return this.lowerLimit == null ? 0.0d : this.lowerLimit;
+    }
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java
@ -0,0 +1,46 @@
+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 :mes系统业务动作
+ * @Reference :
+ * @Author : yiming.gu
+ * @CreateDate : 2019-05-20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_SHIFT_REST")
+@Api("班次休息信息")
+public class MesShiftRest extends BaseBean {
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name="START_TIME")
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Column(name="REST_TIMES")
+    @ApiParam("休息时长")
+    private Double restTimes;
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpDataRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpDataRepository.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.MesKpData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-21
+ * @Modify:
+ **/
+@Repository
+public interface MesKpDataRepository extends BaseRepository<MesKpData, Long> {
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftRestRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftRestRepository.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.MesShiftRest;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-20
+ * @Modify:
+ **/
+@Repository
+public interface MesShiftRestRepository extends BaseRepository<MesShiftRest, Long> {
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@ -328,6 +328,23 @@ public class MesHqlPack {
    }

    /**
+     * MES班次休息信息查询条件封装
+     * @param shiftRest
+     * @return
+     */
+    public static DdlPackBean getMesShiftRest(MesShiftRest shiftRest, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(shiftRest, organizeCode);
+        if (StringUtils.isNotEmpty(shiftRest.getWorkCenterCode())){
+            DdlPreparedPack.getStringEqualPack(shiftRest.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(shiftRest.getShiftCode())){
+            DdlPreparedPack.getStringEqualPack(shiftRest.getShiftCode(), "shiftCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
     * MES工序信息查询条件封装
     * @param process
     * @return
@ -425,6 +442,26 @@ public class MesHqlPack {
    }

    /**
+     * MES工序BOM信息查询条件封装
+     * @param processBom
+     * @return
+     */
+    public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode);
+        if (StringUtils.isNotEmpty(processBom.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(processBom.getPartNo(), "partNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(processBom.getItemPartNo())){
+            DdlPreparedPack.getStringEqualPack(processBom.getItemPartNo(), "itemPartNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(processBom.getProcessCode())){
+            DdlPreparedPack.getStringEqualPack(processBom.getProcessCode(), "processCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
     * MES 客户信息查询条件封装
     * @param customer
     * @return
@ -477,4 +514,118 @@ public class MesHqlPack {

        return packBean;
    }
+
+    /**
+     * MES 设备关键数据信息查询条件封装
+     * @param keyData
+     * @return
+     */
+    public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode);
+        if (StringUtils.isNotEmpty(keyData.getKeyDataCode())){
+            DdlPreparedPack.getStringEqualPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(keyData.getKeyDataName())){
+            DdlPreparedPack.getStringEqualPack(keyData.getKeyDataName(), "keyDataName", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 物料关键数据关系信息查询条件封装
+     * @param kpData
+     * @return
+     */
+    public static DdlPackBean getMesKpData(MesKpData kpData, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(kpData, organizeCode);
+        if (StringUtils.isNotEmpty(kpData.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "partNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(kpData.getKeyDataCode())){
+            DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "keyDataCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 产品配置类型信息查询条件封装
+     * @param prodCfgType
+     * @return
+     */
+    public static DdlPackBean getMesProdCfgType(MesProdCfgType prodCfgType, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgType, organizeCode);
+        if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())){
+            DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())){
+            DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 产品配置信息查询条件封装
+     * @param prodCfg
+     * @return
+     */
+    public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode);
+        if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())){
+            DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())){
+            DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgName(), "prodCfgName", packBean);
+        }
+        if (StringUtils.isNotEmpty(prodCfg.getProdCfgTypeCode())){
+            DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 产品配置关系信息查询条件封装
+     * @param prodCfgDetail
+     * @return
+     */
+    public static DdlPackBean getMesProdCfgDetail(MesProdCfgDetail prodCfgDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgDetail, organizeCode);
+        if (StringUtils.isNotEmpty(prodCfgDetail.getProdCfgCode())){
+            DdlPreparedPack.getStringEqualPack(prodCfgDetail.getProdCfgCode(), "prodCfgCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(prodCfgDetail.getPartNo(), "partNo", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 物料信息查询条件封装
+     * @param part
+     * @return
+     */
+    public static DdlPackBean getMesPart(MesPart part, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode);
+        if (StringUtils.isNotEmpty(part.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(part.getPartName())){
+            DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean);
+        }
+        if (StringUtils.isNotEmpty(part.getCategoryCode1())){
+            DdlPreparedPack.getStringEqualPack(part.getCategoryCode1(), "categoryCode1", packBean);
+        }
+        if (StringUtils.isNotEmpty(part.getCategoryCode2())){
+            DdlPreparedPack.getStringEqualPack(part.getCategoryCode2(), "categoryCode2", packBean);
+        }
+        if (StringUtils.isNotEmpty(part.getCategoryCode3())){
+            DdlPreparedPack.getStringEqualPack(part.getCategoryCode3(), "categoryCode3", packBean);
+        }
+
+        return packBean;
+    }
 }