Merge remote-tracking branch 'remotes/origin/dev' into test

6 years ago · 78267a3a45
parent 54628594e9 0f99cb1027
commit 78267a3a45
10 changed files with 395 additions and 73 deletions
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java
@ -4,8 +4,10 @@ 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.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;

@ -24,6 +26,8 @@ import javax.persistence.Table;
@Entity
@DynamicInsert
@DynamicUpdate
+@AllArgsConstructor
+@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_EVENT_ACTION")
@Api("系统业务事件动作")
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java
@ -34,7 +34,7 @@ public class MesRepair extends BaseBean {

    @Column(name="REPAIR_NAME")
    @ApiParam("维修名称")
-    private String repariName;
+    private String repairName;

    @Column(name="REPAIR_TYPE")
    @ApiParam("维修类型")
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java
@ -18,8 +18,12 @@ import java.util.Map;
 public class ActionRequestBean<Obj> implements Serializable {

    @ApiParam("事件代码")
+    @Deprecated
    public String eventCode;

+    @ApiParam("按钮代码")
+    public String buttonCode;
+
    @ApiParam("单个结果")
    public Obj resultObject;

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesActionMethodModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesActionMethodModel.java
@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/6 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("动作函数关系model")
+public class MesActionMethodModel implements Serializable {
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("动作名称")
+    private String actionName;
+
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @ApiParam("函数代码")
+    private String methodCode;
+
+    @ApiParam("序号")
+    private Integer seq;
+
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEventActionModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEventActionModel.java
@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import cn.estsh.i3plus.pojo.mes.bean.MesEventAction;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/6 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("事件动作关系model")
+public class MesEventActionModel implements Serializable {
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("动作名称")
+    private String actionName;
+
+    @ApiParam("事件名称")
+    private String eventName;
+
+    @ApiParam("动作代码")
+    private String actionCode;
+
+
+    @ApiParam("事件代码")
+    private String eventCode;
+
+
+
+    @ApiParam("序号")
+    private Integer seq;
+
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionRepository.java
@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.mes.bean.MesAction;
 import org.springframework.stereotype.Repository;

+import java.util.List;
+
 /**
 * @Description :
 * @Reference :
@ -13,4 +15,8 @@ import org.springframework.stereotype.Repository;
 **/
@Repository
 public interface MesActionRepository extends BaseRepository<MesAction, Long> {
+
+    List<MesAction> findByOrganizeCodeAndIsDeleted(String organizeCode,Integer isDeleted);
+
+    List<MesAction> findByActionCodeAndIsValidAndIsDeleted(String actionCode,Integer isValid,Integer isDeleted);
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventActionRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventActionRepository.java
@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.mes.bean.MesEventAction;
 import org.springframework.stereotype.Repository;

+import java.util.List;
+
 /**
 * @Description :
 * @Reference :
@ -13,4 +15,5 @@ import org.springframework.stereotype.Repository;
 **/
@Repository
 public interface MesEventActionRepository extends BaseRepository<MesEventAction, Long> {
+
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventRepository.java
@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.mes.bean.MesEvent;
 import org.springframework.stereotype.Repository;

+import java.util.List;
+
 /**
 * @Description :
 * @Reference :
@ -13,4 +15,11 @@ import org.springframework.stereotype.Repository;
 **/
@Repository
 public interface MesEventRepository extends BaseRepository<MesEvent, Long> {
+
+    List<MesEvent> findByOrganizeCodeAndIsDeleted(String organizeCode,Integer isDeleted);
+
+    List<MesEvent> findByButtonCodeAndIsValidAndIsDeleted(String buttonCode,Integer isValid,Integer isDeleted);
+
+    List<MesEvent> findByEventCodeAndIsValidAndIsDeleted(String eventCode,Integer isValid,Integer isDeleted);
+
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.java
@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.mes.bean.MesMethod;
 import org.springframework.stereotype.Repository;

+import java.util.List;
+
 /**
 * @Description :
 * @Reference :
@ -13,4 +15,8 @@ import org.springframework.stereotype.Repository;
 **/
@Repository
 public interface MesMethodRepository extends BaseRepository<MesMethod, Long> {
+
+    List<MesMethod> findByMethodCodeAndIsValidAndIsDeleted(String methodCode, Integer isValid, Integer isDeleted);
+
+    List<MesMethod> findByOrganizeCodeAndIsDeleted(String organizeCode, int value);
 }
--- 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
@ -26,7 +26,6 @@ public class MesHqlPack {
    public static DdlPackBean getAllBaseData(String organizeCode) {
        DdlPackBean packBean = new DdlPackBean();
        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
        return packBean;
    }
@ -45,6 +44,9 @@ public class MesHqlPack {
        if (StringUtils.isNotEmpty(mesPcn.getAreaCode())) {
            DdlPreparedPack.getStringLikerPack(mesPcn.getAreaCode(), "areaCode", packBean);
        }
+        if (mesPcn.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(mesPcn.getIsValid(), "isValid", packBean);
+        }
        return packBean;
    }
    /**
@ -160,6 +162,9 @@ public class MesHqlPack {
        if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) {
            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
        }
+        if (mesWorkOrder.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean);
+        }

        // 时间段查询
 //        DdlPreparedPack.timeBuilder(
@ -195,6 +200,10 @@ public class MesHqlPack {
            DdlPreparedPack.getStringLikerPack(mesQueueOrder.getOrderNo(), "orderNo", packBean);
        }

+        if (mesQueueOrder.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(mesQueueOrder.getIsValid(), "isValid", packBean);
+        }
+
        // 只查询创建状态的队列
        DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean);

@ -280,6 +289,7 @@ public class MesHqlPack {

    /**
     * MES设备信息查询条件封装
+     *
     * @param mesEquipment
     * @return
     */
@ -308,6 +318,7 @@ public class MesHqlPack {
        packBean.setOrderByStr(mesRoute.orderBy());
        return packBean;
    }
+
    /**
     * 产品流程配置查询条件封装
     *
@ -326,6 +337,7 @@ public class MesHqlPack {

    /**
     * MES班次信息查询条件封装
+     *
     * @param shift
     * @return
     */
@ -346,6 +358,7 @@ public class MesHqlPack {

    /**
     * MES班次休息信息查询条件封装
+     *
     * @param shiftRest
     * @return
     */
@ -360,9 +373,71 @@ public class MesHqlPack {

        return packBean;
    }
+/******************created by wynne*************/
+    /**
+     * MES 报废信息查询
+     * @param mesScrap
+     * @return
+     */
+    public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (StringUtils.isNotEmpty(mesScrap.getScrapCode())){
+            DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesScrap.getScrapName())){
+            DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean);
+        }
+        if (mesScrap.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(mesScrap.getIsValid(), "isValid", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES PCN系统配置信息条件查询
+     * @param mesConfig
+     * @return
+     */
+    public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (StringUtils.isNotEmpty(mesConfig.getCfgCode())){
+            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesConfig.getCfgName())){
+            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
+        }
+        if (mesConfig.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 维修信息条件查询
+     * @param mesRepair
+     * @return
+     */
+    public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (StringUtils.isNotEmpty(mesRepair.getRepairCode())){
+            DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesRepair.getRepairName())){
+            DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean);
+        }
+        if (mesRepair.getRepairType() != null){
+            DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean);
+        }
+        if (mesRepair.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(mesRepair.getIsValid(), "isValid", packBean);
+        }
+
+        return packBean;
+    }

    /**
     * MES 上传文件FastDfs封装
+     *
     * @param mesESOP
     * @return
     */
@ -379,7 +454,117 @@ public class MesHqlPack {
    }

    /**
+     * 事件分页获取封装
+     *
+     * @param mesEvent
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEvent(MesEvent mesEvent, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEvent, organizeCode);
+        if (StringUtils.isNotEmpty(mesEvent.getButtonCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEvent.getButtonCode(), "buttonCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesEvent.getEventCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEvent.getEventCode(), "eventCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesEvent.getEventName())) {
+            DdlPreparedPack.getStringLikerPack(mesEvent.getEventName(), "eventName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 动作分页获取封装
+     *
+     * @param mesAction
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesAction(MesAction mesAction, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
+        if (StringUtils.isNotEmpty(mesAction.getActionCode())) {
+            DdlPreparedPack.getStringRightLikerPack(mesAction.getActionCode(), "actionCode", packBean);
+        }
+
+        if (StringUtils.isNotEmpty(mesAction.getActionName())) {
+            DdlPreparedPack.getStringLikerPack(mesAction.getActionName(), "actionName", packBean);
+        }
+
+        if (mesAction.getActionType() != null && StringUtils.isNotEmpty(mesAction.getActionType() + "")) {
+            DdlPreparedPack.getStringEqualPack(mesAction.getActionType() + "", "actionType", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 函数分页获取封装
+     *
+     * @param mesMethod
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesMethod(MesMethod mesMethod, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, organizeCode);
+        if (StringUtils.isNotEmpty(mesMethod.getMethodCode())) {
+            DdlPreparedPack.getStringRightLikerPack(mesMethod.getMethodCode(), "methodCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesMethod.getMethodName())) {
+            DdlPreparedPack.getStringLikerPack(mesMethod.getMethodName(), "methodName", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesMethod.getCallClass())) {
+            DdlPreparedPack.getStringRightLikerPack(mesMethod.getCallClass(), "callClass", packBean);
+        }
+        if (mesMethod.getMethodType() != null && StringUtils.isNotEmpty(mesMethod.getMethodType() + "")) {
+            DdlPreparedPack.getStringEqualPack(mesMethod.getMethodType() + "", "methodType", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 事件动作分页获取封装
+     *
+     * @param mesActionMethod
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesActionMethod(MesActionMethod mesActionMethod, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesActionMethod, organizeCode);
+        if (StringUtils.isNotEmpty(mesActionMethod.getActionCode())) {
+            DdlPreparedPack.getStringLikerPack(mesActionMethod.getActionCode(), "actionCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesActionMethod.getMethodCode())) {
+            DdlPreparedPack.getStringLikerPack(mesActionMethod.getMethodCode(), "methodCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 事件动作分页获取封装
+     *
+     * @param mesEventAction
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEventAction(MesEventAction mesEventAction, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEventAction, organizeCode);
+        if (StringUtils.isNotEmpty(mesEventAction.getOrganizeCode())) {
+            DdlPreparedPack.getStringEqualPack(mesEventAction.getOrganizeCode(), "organizeCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesEventAction.getEventCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEventAction.getEventCode(), "eventCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesEventAction.getActionCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEventAction.getActionCode(), "actionCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /******************created by wynne*************/
+    /**
     * MES工序信息查询条件封装
+     *
     * @param process
     * @return
     */
@ -397,6 +582,7 @@ public class MesHqlPack {

    /**
     * MES工步信息查询条件封装
+     *
     * @param step
     * @return
     */
@ -417,6 +603,7 @@ public class MesHqlPack {

    /**
     * MES工步参数信息查询条件封装
+     *
     * @param stepParam
     * @return
     */
@ -437,6 +624,7 @@ public class MesHqlPack {

    /**
     * MES工序工作单元对应关系查询条件封装
+     *
     * @param routeProcessCell
     * @return
     */
@ -460,6 +648,7 @@ public class MesHqlPack {

    /**
     * MES BOM信息查询条件封装
+     *
     * @param bom
     * @return
     */
@ -480,6 +669,7 @@ public class MesHqlPack {

    /**
     * MES工序BOM信息查询条件封装
+     *
     * @param processBom
     * @return
     */
@ -500,6 +690,7 @@ public class MesHqlPack {

    /**
     * MES 客户信息查询条件封装
+     *
     * @param customer
     * @return
     */
@ -517,6 +708,7 @@ public class MesHqlPack {

    /**
     * MES 客户产线信息查询条件封装
+     *
     * @param custProdLine
     * @return
     */
@ -534,6 +726,7 @@ public class MesHqlPack {

    /**
     * MES 客户零件关系信息查询条件封装
+     *
     * @param customerPart
     * @return
     */
@ -554,6 +747,7 @@ public class MesHqlPack {

    /**
     * MES 设备关键数据信息查询条件封装
+     *
     * @param keyData
     * @return
     */
@ -571,6 +765,7 @@ public class MesHqlPack {

    /**
     * MES 物料关键数据关系信息查询条件封装
+     *
     * @param kpData
     * @return
     */
@ -588,6 +783,7 @@ public class MesHqlPack {

    /**
     * MES 产品配置类型信息查询条件封装
+     *
     * @param prodCfgType
     * @return
     */
@ -605,6 +801,7 @@ public class MesHqlPack {

    /**
     * MES 产品配置信息查询条件封装
+     *
     * @param prodCfg
     * @return
     */
@ -625,6 +822,7 @@ public class MesHqlPack {

    /**
     * MES 产品配置关系信息查询条件封装
+     *
     * @param prodCfgDetail
     * @return
     */
@ -642,6 +840,7 @@ public class MesHqlPack {

    /**
     * MES 物料信息查询条件封装
+     *
     * @param part
     * @return
     */
@ -668,6 +867,7 @@ public class MesHqlPack {

    /**
     * MES 物料分类信息查询条件封装
+     *
     * @param partCategory
     * @return
     */
@ -685,6 +885,7 @@ public class MesHqlPack {

    /**
     * MES 包装规格信息查询条件封装
+     *
     * @param packSpec
     * @return
     */
@ -705,6 +906,7 @@ public class MesHqlPack {

    /**
     * MES 产品类型信息查询条件封装
+     *
     * @param produceCategory
     * @return
     */
@ -722,6 +924,7 @@ public class MesHqlPack {

    /**
     * MES 关键件条码规则信息查询条件封装
+     *
     * @param kpsnRule
     * @return
     */
@ -736,6 +939,7 @@ public class MesHqlPack {

    /**
     * MES 产品排程清单信息查询条件封装
+     *
     * @param partScheduleBom
     * @return
     */
@ -753,6 +957,7 @@ public class MesHqlPack {

    /**
     * MES对象与dao对应关系查询条件封装
+     *
     * @param objectDao
     * @return
     */
@ -770,6 +975,7 @@ public class MesHqlPack {

    /**
     * MES-PCN同步配置查询条件封装
+     *
     * @param pcnSyncCfg
     * @return
     */
@ -790,6 +996,7 @@ public class MesHqlPack {

    /**
     * MES工作单元参数配置查询条件封装
+     *
     * @param workCellParamCfg
     * @return
     */
@ -807,6 +1014,7 @@ public class MesHqlPack {

    /**
     * MES工作单元队列查询条件封装
+     *
     * @param workCellPoint
     * @return
     */
@ -820,6 +1028,7 @@ public class MesHqlPack {

    /**
     * PLC设备信息配置查询条件封装
+     *
     * @param plcConfigure
     * @return
     */