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

6 years ago · 3111806b7b
parent e31b35b6e3 7bd4ea8be9
commit 3111806b7b
11 changed files with 257 additions and 23 deletions
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@ -608,5 +608,40 @@ public class MesEnumUtil {
            return tmp;
        }
    }
+    /**
+     * 工步参数类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STEP_PARAM_TYPE{
+
+        QUALIFIED(10,"数字"),
+        DEFECTED(20,"字符串"),
+        SCRAPED(30,"可选值");
+
+        private int value;
+        private String description;
+
+        STEP_PARAM_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;
+        }
+    }
 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java
@ -0,0 +1,63 @@
+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;
+import javax.persistence.Transient;
+
+/**
+ * @Description :物料关键数据
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-05-15
+ * @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;
+
+    @Transient
+    @ApiParam("扭矩值")
+    private Double torqueValue;
+
+    @Transient
+    @ApiParam("是否在范围之内")
+    private Boolean ok;
+}
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java
@ -49,6 +49,9 @@ public class StationRequestBean implements Serializable {
    @ApiParam("按钮编号")
    private String buttonCode;

+    @ApiParam("工步代码")
+    private String stepCode;
+
    /**
     * doScan-扫描，doModule-处理组件,initModule-初始化组件
     */
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java
@ -0,0 +1,17 @@
+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.MesArea;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesKpData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-05-15
+ * @Modify:
+ **/
+@Repository
+public interface MesKpDataRepository extends BaseRepository<MesKpData, Long> {
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java
@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;

 /**
 * @Description :产品流程配置操作参数表
@ -51,10 +52,19 @@ public class MesProdRouteOptParam extends BaseBean {
    @ApiParam("工步参数代码")
    private String paramCode;

+    @Column(name = "PARAM_TYPE")
+    @ApiParam("工步参数类型")
+    private Integer paramType;
+
    @Column(name = "PARAM_VALUE")
    @ApiParam("工步参数值")
    private String paramValue;

+    @Transient
+    @Column(name = "PARAM_ATTRIBUTE")
+    @ApiParam("参数属性")
+    private String paramAttribute;
+
    public long getProdRouteCfgIdVal() {
        return this.prodRouteCfgId == null ? 0l : this.prodRouteCfgId;
    }
@ -62,4 +72,8 @@ public class MesProdRouteOptParam extends BaseBean {
    public int getStepSeq() {
        return this.stepSeq == null ? 0 : this.stepSeq;
    }
+
+    public int getParamTypeVal() {
+        return this.paramType == null ? 0 : this.paramType;
+    }
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java
@ -34,4 +34,8 @@ public class MesRoute extends BaseBean {
    @Column(name = "ROUTE_NAME")
    @ApiParam("流程名称")
    private String routeName;
+
+    @Column(name = "POSITION")
+    @ApiParam("GOJS位置")
+    private String position;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java
@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;

 /**
 * @Description :流程工序工步关系
@ -39,19 +40,32 @@ public class MesRouteProcessStep extends BaseBean {
    @ApiParam("工步代码")
    private String stepCode;

-    @Column(name = "STEP_SEQ")
-    @ApiParam("工步顺序")
-    private Integer stepSeq;
+    @Column(name = "SEQ")
+    @ApiParam("顺序")
+    private Integer seq;

    @Column(name = "PARAM_CODE")
    @ApiParam("工步参数代码")
    private String paramCode;

+    @Column(name = "PARAM_TYPE")
+    @ApiParam("工步参数类型")
+    private Integer paramType;
+
    @Column(name = "PARAM_VALUE")
    @ApiParam("工步参数值")
    private String paramValue;

+    @Transient
+    @Column(name = "PARAM_ATTRIBUTE")
+    @ApiParam("参数属性")
+    private String paramAttribute;
+
    public int getStepSeqVal() {
-        return this.stepSeq == null ? 0 : this.stepSeq;
+        return this.seq == null ? 0 : this.seq;
+    }
+
+    public int getParamTypeVal() {
+        return this.paramType == null ? 0 : this.paramType;
    }
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java
@ -31,6 +31,10 @@ public class MesStepParam extends BaseBean {
    @ApiParam("工步代码")
    private String stepCode;

+    @Column(name = "PARAM_TYPE")
+    @ApiParam("参数类型")
+    private Integer paramType;
+
    @Column(name = "PARAM_CODE")
    @ApiParam("参数代码")
    private String paramCode;
--- 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
@ -19,6 +19,7 @@ public class MesHqlPack {

    /**
     * 通用查询条件
+     *
     * @param organizeCode
     * @return
     */
@ -32,6 +33,7 @@ public class MesHqlPack {

    /**
     * 生产计划查询条件封装
+     *
     * @param mesPlanOrder
     * @return
     */
@ -79,6 +81,7 @@ public class MesHqlPack {

    /**
     * 物料信息查询条件封装
+     *
     * @param mesPart
     * @return
     */
@ -111,6 +114,7 @@ public class MesHqlPack {

    /**
     * 生产工单查询条件封装
+     *
     * @param mesWorkOrder
     * @return
     */
@ -157,6 +161,7 @@ public class MesHqlPack {

    /**
     * 生产队列查询条件封装
+     *
     * @param mesQueueOrder
     * @return
     */
@ -191,6 +196,7 @@ public class MesHqlPack {

    /**
     * 通用查询条件
+     *
     * @param organizeCode
     * @return
     */
@ -204,6 +210,7 @@ public class MesHqlPack {

    /**
     * MES区域信息查询条件封装
+     *
     * @param mesArea
     * @return
     */
@ -218,6 +225,7 @@ public class MesHqlPack {

    /**
     * MES工作中心信息查询条件封装
+     *
     * @param mesWorkCenter
     * @return
     */
@ -235,6 +243,7 @@ public class MesHqlPack {

    /**
     * MES工作单元信息查询条件封装
+     *
     * @param mesWorkCell
     * @return
     */
@ -254,19 +263,30 @@ public class MesHqlPack {
    }

    /**
-     * MES设备信息查询条件封装
-     * @param mesEquipment
+     * 流程查询条件封装
+     *
+     * @param mesRoute
     * @return
     */
-    public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode);
-        if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){
-            DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean);
-        }
-        if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){
-            DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
+    public static DdlPackBean packHqlMesRoute(MesRoute mesRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesRoute, organizeCode);
+        DdlPreparedPack.getStringLikerPack(mesRoute.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesRoute.getRouteName(), "routeName", packBean);
+        packBean.setOrderByStr(mesRoute.orderBy());
+        return packBean;
    }
-
+    /**
+     * 产品流程配置查询条件封装
+     *
+     * @param mesProdRouteCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean packHqlMesProdRouteCfg(MesProdRouteCfg mesProdRouteCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdRouteCfg, organizeCode);
+        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        packBean.setOrderByStr(mesProdRouteCfg.orderBy());
        return packBean;
    }

--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java
@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
+import cn.estsh.i3plus.pojo.model.wms.WmsActionGroupDetailsModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : 流程Model
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-05-15 13:27
+ * @Modify:
+ **/
+@Data
+@Api("流程Model")
+public class MesRouteModel implements Serializable {
+    @ApiParam("流程代码")
+    public String routeCode;
+    @ApiParam("工厂代码")
+    public String organizeCode;
+    @ApiParam("GOJS位置")
+    public String position;
+    @ApiParam("流程明细Model集合")
+    public List<MesRouteProcessModel> mesRouteProcessModelList;
+}
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java
@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesProdRouteOptParam;
+import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
+import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcessStep;
+import cn.estsh.i3plus.pojo.wms.bean.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 流程工序Model
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-04-29 15:39
+ * @Modify:
+ **/
+@Data
+@Api("流程工序Model")
+public class MesRouteProcessModel {
+    @ApiParam("流程工序")
+    public MesRouteProcess mesRouteProcess;
+    @ApiParam("流程工步参数配置表(根据Seq分组)")
+    public Map<String, List<MesRouteProcessStep>> mesRouteProcessStepMap;
+    @ApiParam("流程工步参数配置表(根据Seq分组)")
+    public Map<String, List<MesProdRouteOptParam>> mesProdRouteOptParamMap;
+}