用户管理修改密码 Bug 修复

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("系统业务事件动作")

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("维修类型")

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;
 

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;
+
+}

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;
+
+}

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);
 }

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> {
+
 }

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);
+
 }

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);
 }

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,15 +289,16 @@ public class MesHqlPack {
 
     /**
      * MES设备信息查询条件封装
+     *
      * @param mesEquipment
      * @return
      */
     public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode);
-        if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){
+        if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())) {
             DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){
+        if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())) {
             DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
         }
 
@@ -308,6 +318,7 @@ public class MesHqlPack {
         packBean.setOrderByStr(mesRoute.orderBy());
         return packBean;
     }
+
     /**
      * 产品流程配置查询条件封装
      *
@@ -326,18 +337,19 @@ public class MesHqlPack {
 
     /**
      * MES班次信息查询条件封装
+     *
      * @param shift
      * @return
      */
     public static DdlPackBean getMesShift(MesShift shift, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode);
-        if (StringUtils.isNotEmpty(shift.getShiftCode())){
+        if (StringUtils.isNotEmpty(shift.getShiftCode())) {
             DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean);
         }
-        if (StringUtils.isNotEmpty(shift.getShiftName())){
+        if (StringUtils.isNotEmpty(shift.getShiftName())) {
             DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean);
         }
-        if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){
+        if (StringUtils.isNotEmpty(shift.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean);
         }
 
@@ -346,32 +358,95 @@ 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())){
+        if (StringUtils.isNotEmpty(shiftRest.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(shiftRest.getWorkCenterCode(), "workCenterCode", packBean);
         }
-        if (StringUtils.isNotEmpty(shiftRest.getShiftCode())){
+        if (StringUtils.isNotEmpty(shiftRest.getShiftCode())) {
             DdlPreparedPack.getStringEqualPack(shiftRest.getShiftCode(), "shiftCode", packBean);
         }
 
         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
      */
     public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode);
-        if (StringUtils.isNotEmpty(mesESOP.getWorkCenterCode())){
+        if (StringUtils.isNotEmpty(mesESOP.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesESOP.getPartNo())){
+        if (StringUtils.isNotEmpty(mesESOP.getPartNo())) {
             DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean);
         }
 
@@ -379,16 +454,126 @@ 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
      */
     public static DdlPackBean getMesProcess(MesProcess process, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(process, organizeCode);
-        if (StringUtils.isNotEmpty(process.getProcessCode())){
+        if (StringUtils.isNotEmpty(process.getProcessCode())) {
             DdlPreparedPack.getStringEqualPack(process.getProcessCode(), "processCode", packBean);
         }
-        if (StringUtils.isNotEmpty(process.getProcessName())){
+        if (StringUtils.isNotEmpty(process.getProcessName())) {
             DdlPreparedPack.getStringLikerPack(process.getProcessName(), "processName", packBean);
         }
 
@@ -397,18 +582,19 @@ public class MesHqlPack {
 
     /**
      * MES工步信息查询条件封装
+     *
      * @param step
      * @return
      */
     public static DdlPackBean getMesStep(MesStep step, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(step, organizeCode);
-        if (StringUtils.isNotEmpty(step.getStepCode())){
+        if (StringUtils.isNotEmpty(step.getStepCode())) {
             DdlPreparedPack.getStringEqualPack(step.getStepCode(), "stepCode", packBean);
         }
-        if (StringUtils.isNotEmpty(step.getStepName())){
+        if (StringUtils.isNotEmpty(step.getStepName())) {
             DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean);
         }
-        if (StringUtils.isNotEmpty(step.getStepType())){
+        if (StringUtils.isNotEmpty(step.getStepType())) {
             DdlPreparedPack.getStringLikerPack(step.getStepType(), "stepType", packBean);
         }
 
@@ -417,18 +603,19 @@ public class MesHqlPack {
 
     /**
      * MES工步参数信息查询条件封装
+     *
      * @param stepParam
      * @return
      */
     public static DdlPackBean getMesStepParam(MesStepParam stepParam, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(stepParam, organizeCode);
-        if (StringUtils.isNotEmpty(stepParam.getStepCode())){
+        if (StringUtils.isNotEmpty(stepParam.getStepCode())) {
             DdlPreparedPack.getStringEqualPack(stepParam.getStepCode(), "stepCode", packBean);
         }
-        if (StringUtils.isNotEmpty(stepParam.getParamCode())){
+        if (StringUtils.isNotEmpty(stepParam.getParamCode())) {
             DdlPreparedPack.getStringEqualPack(stepParam.getParamCode(), "paramCode", packBean);
         }
-        if (StringUtils.isNotEmpty(stepParam.getParamName())){
+        if (StringUtils.isNotEmpty(stepParam.getParamName())) {
             DdlPreparedPack.getStringLikerPack(stepParam.getParamName(), "paramName", packBean);
         }
 
@@ -437,21 +624,22 @@ public class MesHqlPack {
 
     /**
      * MES工序工作单元对应关系查询条件封装
+     *
      * @param routeProcessCell
      * @return
      */
     public static DdlPackBean getMesRouteProcessCell(MesRouteProcessCell routeProcessCell, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(routeProcessCell, organizeCode);
-        if (StringUtils.isNotEmpty(routeProcessCell.getRouteCode())){
+        if (StringUtils.isNotEmpty(routeProcessCell.getRouteCode())) {
             DdlPreparedPack.getStringEqualPack(routeProcessCell.getRouteCode(), "routeCode", packBean);
         }
-        if (StringUtils.isNotEmpty(routeProcessCell.getProcessCode())){
+        if (StringUtils.isNotEmpty(routeProcessCell.getProcessCode())) {
             DdlPreparedPack.getStringEqualPack(routeProcessCell.getProcessCode(), "processCode", packBean);
         }
-        if (StringUtils.isNotEmpty(routeProcessCell.getWorkCellCode())){
+        if (StringUtils.isNotEmpty(routeProcessCell.getWorkCellCode())) {
             DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCellCode(), "workCellCode", packBean);
         }
-        if (StringUtils.isNotEmpty(routeProcessCell.getWorkCenterCode())){
+        if (StringUtils.isNotEmpty(routeProcessCell.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCenterCode(), "workCenterCode", packBean);
         }
 
@@ -460,18 +648,19 @@ public class MesHqlPack {
 
     /**
      * MES BOM信息查询条件封装
+     *
      * @param bom
      * @return
      */
     public static DdlPackBean getMesBom(MesBom bom, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(bom, organizeCode);
-        if (StringUtils.isNotEmpty(bom.getPartNo())){
+        if (StringUtils.isNotEmpty(bom.getPartNo())) {
             DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean);
         }
-        if (StringUtils.isNotEmpty(bom.getItemPartNo())){
+        if (StringUtils.isNotEmpty(bom.getItemPartNo())) {
             DdlPreparedPack.getStringEqualPack(bom.getItemPartNo(), "itemPartNo", packBean);
         }
-        if (StringUtils.isNotEmpty(bom.getBomVersion())){
+        if (StringUtils.isNotEmpty(bom.getBomVersion())) {
             DdlPreparedPack.getStringEqualPack(bom.getBomVersion(), "bomVersion", packBean);
         }
 
@@ -480,18 +669,19 @@ 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())){
+        if (StringUtils.isNotEmpty(processBom.getPartNo())) {
             DdlPreparedPack.getStringEqualPack(processBom.getPartNo(), "partNo", packBean);
         }
-        if (StringUtils.isNotEmpty(processBom.getItemPartNo())){
+        if (StringUtils.isNotEmpty(processBom.getItemPartNo())) {
             DdlPreparedPack.getStringEqualPack(processBom.getItemPartNo(), "itemPartNo", packBean);
         }
-        if (StringUtils.isNotEmpty(processBom.getProcessCode())){
+        if (StringUtils.isNotEmpty(processBom.getProcessCode())) {
             DdlPreparedPack.getStringEqualPack(processBom.getProcessCode(), "processCode", packBean);
         }
 
@@ -500,15 +690,16 @@ public class MesHqlPack {
 
     /**
      * MES 客户信息查询条件封装
+     *
      * @param customer
      * @return
      */
     public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode);
-        if (StringUtils.isNotEmpty(customer.getCustomerCode())){
+        if (StringUtils.isNotEmpty(customer.getCustomerCode())) {
             DdlPreparedPack.getStringEqualPack(customer.getCustomerCode(), "customerCode", packBean);
         }
-        if (StringUtils.isNotEmpty(customer.getCustomerName())){
+        if (StringUtils.isNotEmpty(customer.getCustomerName())) {
             DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean);
         }
 
@@ -517,15 +708,16 @@ public class MesHqlPack {
 
     /**
      * MES 客户产线信息查询条件封装
+     *
      * @param custProdLine
      * @return
      */
     public static DdlPackBean getMesCustProdLine(MesCustProdLine custProdLine, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(custProdLine, organizeCode);
-        if (StringUtils.isNotEmpty(custProdLine.getCustProdLineCode())){
+        if (StringUtils.isNotEmpty(custProdLine.getCustProdLineCode())) {
             DdlPreparedPack.getStringEqualPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean);
         }
-        if (StringUtils.isNotEmpty(custProdLine.getCustProdLineName())){
+        if (StringUtils.isNotEmpty(custProdLine.getCustProdLineName())) {
             DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineName(), "custProdLineName", packBean);
         }
 
@@ -534,18 +726,19 @@ public class MesHqlPack {
 
     /**
      * MES 客户零件关系信息查询条件封装
+     *
      * @param customerPart
      * @return
      */
     public static DdlPackBean getMesCustomerPart(MesCustomerPart customerPart, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(customerPart, organizeCode);
-        if (StringUtils.isNotEmpty(customerPart.getCustomerCode())){
+        if (StringUtils.isNotEmpty(customerPart.getCustomerCode())) {
             DdlPreparedPack.getStringEqualPack(customerPart.getCustomerCode(), "customerCode", packBean);
         }
-        if (StringUtils.isNotEmpty(customerPart.getPartNo())){
+        if (StringUtils.isNotEmpty(customerPart.getPartNo())) {
             DdlPreparedPack.getStringEqualPack(customerPart.getPartNo(), "partNo", packBean);
         }
-        if (StringUtils.isNotEmpty(customerPart.getCustomerPartNo())){
+        if (StringUtils.isNotEmpty(customerPart.getCustomerPartNo())) {
             DdlPreparedPack.getStringEqualPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean);
         }
 
@@ -554,15 +747,16 @@ public class MesHqlPack {
 
     /**
      * MES 设备关键数据信息查询条件封装
+     *
      * @param keyData
      * @return
      */
     public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode);
-        if (StringUtils.isNotEmpty(keyData.getKeyDataCode())){
+        if (StringUtils.isNotEmpty(keyData.getKeyDataCode())) {
             DdlPreparedPack.getStringEqualPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
         }
-        if (StringUtils.isNotEmpty(keyData.getKeyDataName())){
+        if (StringUtils.isNotEmpty(keyData.getKeyDataName())) {
             DdlPreparedPack.getStringEqualPack(keyData.getKeyDataName(), "keyDataName", packBean);
         }
 
@@ -571,15 +765,16 @@ public class MesHqlPack {
 
     /**
      * MES 物料关键数据关系信息查询条件封装
+     *
      * @param kpData
      * @return
      */
     public static DdlPackBean getMesKpData(MesKpData kpData, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(kpData, organizeCode);
-        if (StringUtils.isNotEmpty(kpData.getPartNo())){
+        if (StringUtils.isNotEmpty(kpData.getPartNo())) {
             DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "partNo", packBean);
         }
-        if (StringUtils.isNotEmpty(kpData.getKeyDataCode())){
+        if (StringUtils.isNotEmpty(kpData.getKeyDataCode())) {
             DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "keyDataCode", packBean);
         }
 
@@ -588,15 +783,16 @@ public class MesHqlPack {
 
     /**
      * MES 产品配置类型信息查询条件封装
+     *
      * @param prodCfgType
      * @return
      */
     public static DdlPackBean getMesProdCfgType(MesProdCfgType prodCfgType, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgType, organizeCode);
-        if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())){
+        if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())) {
             DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
         }
-        if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())){
+        if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())) {
             DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean);
         }
 
@@ -605,18 +801,19 @@ public class MesHqlPack {
 
     /**
      * MES 产品配置信息查询条件封装
+     *
      * @param prodCfg
      * @return
      */
     public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode);
-        if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())){
+        if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())) {
             DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean);
         }
-        if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())){
+        if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())) {
             DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgName(), "prodCfgName", packBean);
         }
-        if (StringUtils.isNotEmpty(prodCfg.getProdCfgTypeCode())){
+        if (StringUtils.isNotEmpty(prodCfg.getProdCfgTypeCode())) {
             DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
         }
 
@@ -625,15 +822,16 @@ public class MesHqlPack {
 
     /**
      * MES 产品配置关系信息查询条件封装
+     *
      * @param prodCfgDetail
      * @return
      */
     public static DdlPackBean getMesProdCfgDetail(MesProdCfgDetail prodCfgDetail, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgDetail, organizeCode);
-        if (StringUtils.isNotEmpty(prodCfgDetail.getProdCfgCode())){
+        if (StringUtils.isNotEmpty(prodCfgDetail.getProdCfgCode())) {
             DdlPreparedPack.getStringEqualPack(prodCfgDetail.getProdCfgCode(), "prodCfgCode", packBean);
         }
-        if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())){
+        if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())) {
             DdlPreparedPack.getStringEqualPack(prodCfgDetail.getPartNo(), "partNo", packBean);
         }
 
@@ -642,24 +840,25 @@ public class MesHqlPack {
 
     /**
      * MES 物料信息查询条件封装
+     *
      * @param part
      * @return
      */
     public static DdlPackBean getMesPart(MesPart part, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode);
-        if (StringUtils.isNotEmpty(part.getPartNo())){
+        if (StringUtils.isNotEmpty(part.getPartNo())) {
             DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean);
         }
-        if (StringUtils.isNotEmpty(part.getPartName())){
+        if (StringUtils.isNotEmpty(part.getPartName())) {
             DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean);
         }
-        if (StringUtils.isNotEmpty(part.getCategoryCode1())){
+        if (StringUtils.isNotEmpty(part.getCategoryCode1())) {
             DdlPreparedPack.getStringEqualPack(part.getCategoryCode1(), "categoryCode1", packBean);
         }
-        if (StringUtils.isNotEmpty(part.getCategoryCode2())){
+        if (StringUtils.isNotEmpty(part.getCategoryCode2())) {
             DdlPreparedPack.getStringEqualPack(part.getCategoryCode2(), "categoryCode2", packBean);
         }
-        if (StringUtils.isNotEmpty(part.getCategoryCode3())){
+        if (StringUtils.isNotEmpty(part.getCategoryCode3())) {
             DdlPreparedPack.getStringEqualPack(part.getCategoryCode3(), "categoryCode3", packBean);
         }
 
@@ -668,15 +867,16 @@ public class MesHqlPack {
 
     /**
      * MES 物料分类信息查询条件封装
+     *
      * @param partCategory
      * @return
      */
     public static DdlPackBean getMesPartCategory(MesPartCategory partCategory, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(partCategory, organizeCode);
-        if (StringUtils.isNotEmpty(partCategory.getCategoryCode())){
+        if (StringUtils.isNotEmpty(partCategory.getCategoryCode())) {
             DdlPreparedPack.getStringEqualPack(partCategory.getCategoryCode(), "categoryCode", packBean);
         }
-        if (StringUtils.isNotEmpty(partCategory.getCategoryName())){
+        if (StringUtils.isNotEmpty(partCategory.getCategoryName())) {
             DdlPreparedPack.getStringLikerPack(partCategory.getCategoryName(), "categoryName", packBean);
         }
 
@@ -685,18 +885,19 @@ public class MesHqlPack {
 
     /**
      * MES 包装规格信息查询条件封装
+     *
      * @param packSpec
      * @return
      */
     public static DdlPackBean getMesPackSpec(MesPackSpec packSpec, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(packSpec, organizeCode);
-        if (StringUtils.isNotEmpty(packSpec.getSpecCode())){
+        if (StringUtils.isNotEmpty(packSpec.getSpecCode())) {
             DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "specCode", packBean);
         }
-        if (StringUtils.isNotEmpty(packSpec.getSpecName())){
+        if (StringUtils.isNotEmpty(packSpec.getSpecName())) {
             DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean);
         }
-        if (StringUtils.isNotEmpty(packSpec.getParentSpec())){
+        if (StringUtils.isNotEmpty(packSpec.getParentSpec())) {
             DdlPreparedPack.getStringEqualPack(packSpec.getParentSpec(), "parentSpec", packBean);
         }
 
@@ -705,15 +906,16 @@ public class MesHqlPack {
 
     /**
      * MES 产品类型信息查询条件封装
+     *
      * @param produceCategory
      * @return
      */
     public static DdlPackBean getMesProduceCategory(MesProduceCategory produceCategory, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(produceCategory, organizeCode);
-        if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryCode())){
+        if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryCode())) {
             DdlPreparedPack.getStringEqualPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean);
         }
-        if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryName())){
+        if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryName())) {
             DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryName(), "produceCategoryName", packBean);
         }
 
@@ -722,12 +924,13 @@ public class MesHqlPack {
 
     /**
      * MES 关键件条码规则信息查询条件封装
+     *
      * @param kpsnRule
      * @return
      */
     public static DdlPackBean getMesKpsnRule(MesKpsnRule kpsnRule, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(kpsnRule, organizeCode);
-        if (StringUtils.isNotEmpty(kpsnRule.getPartNo())){
+        if (StringUtils.isNotEmpty(kpsnRule.getPartNo())) {
             DdlPreparedPack.getStringEqualPack(kpsnRule.getPartNo(), "partNo", packBean);
         }
 
@@ -736,15 +939,16 @@ public class MesHqlPack {
 
     /**
      * MES 产品排程清单信息查询条件封装
+     *
      * @param partScheduleBom
      * @return
      */
     public static DdlPackBean getMesPartScheduleBom(MesPartScheduleBom partScheduleBom, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(partScheduleBom, organizeCode);
-        if (StringUtils.isNotEmpty(partScheduleBom.getPartNo())){
+        if (StringUtils.isNotEmpty(partScheduleBom.getPartNo())) {
             DdlPreparedPack.getStringEqualPack(partScheduleBom.getPartNo(), "partNo", packBean);
         }
-        if (StringUtils.isNotEmpty(partScheduleBom.getItemPartNo())){
+        if (StringUtils.isNotEmpty(partScheduleBom.getItemPartNo())) {
             DdlPreparedPack.getStringLikerPack(partScheduleBom.getItemPartNo(), "itemPartNo", packBean);
         }
 
@@ -753,15 +957,16 @@ public class MesHqlPack {
 
     /**
      * MES对象与dao对应关系查询条件封装
+     *
      * @param objectDao
      * @return
      */
     public static DdlPackBean getMesObjectDao(MesObjectDao objectDao, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode);
-        if (StringUtils.isNotEmpty(objectDao.getObjectCode())){
+        if (StringUtils.isNotEmpty(objectDao.getObjectCode())) {
             DdlPreparedPack.getStringEqualPack(objectDao.getObjectCode(), "objectCode", packBean);
         }
-        if (StringUtils.isNotEmpty(objectDao.getDaoClass())){
+        if (StringUtils.isNotEmpty(objectDao.getDaoClass())) {
             DdlPreparedPack.getStringEqualPack(objectDao.getDaoClass(), "daoClass", packBean);
         }
 
@@ -770,18 +975,19 @@ public class MesHqlPack {
 
     /**
      * MES-PCN同步配置查询条件封装
+     *
      * @param pcnSyncCfg
      * @return
      */
     public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode);
-        if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())){
+        if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())) {
             DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
         }
-        if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())){
+        if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())) {
             DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
         }
-        if (null != pcnSyncCfg.getSyncType()){
+        if (null != pcnSyncCfg.getSyncType()) {
             DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean);
         }
 
@@ -790,15 +996,16 @@ public class MesHqlPack {
 
     /**
      * MES工作单元参数配置查询条件封装
+     *
      * @param workCellParamCfg
      * @return
      */
     public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode);
-        if (StringUtils.isNotEmpty(workCellParamCfg.getWorkCellCode())){
+        if (StringUtils.isNotEmpty(workCellParamCfg.getWorkCellCode())) {
             DdlPreparedPack.getStringEqualPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean);
         }
-        if (StringUtils.isNotEmpty(workCellParamCfg.getParamCode())){
+        if (StringUtils.isNotEmpty(workCellParamCfg.getParamCode())) {
             DdlPreparedPack.getStringEqualPack(workCellParamCfg.getParamCode(), "paramCode", packBean);
         }
 
@@ -807,12 +1014,13 @@ public class MesHqlPack {
 
     /**
      * MES工作单元队列查询条件封装
+     *
      * @param workCellPoint
      * @return
      */
     public static DdlPackBean getMesWorkCellPoint(MesWorkCellPoint workCellPoint, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(workCellPoint, organizeCode);
-        if (StringUtils.isNotEmpty(workCellPoint.getWorkCellCode())){
+        if (StringUtils.isNotEmpty(workCellPoint.getWorkCellCode())) {
             DdlPreparedPack.getStringEqualPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean);
         }
         return packBean;
@@ -820,18 +1028,19 @@ public class MesHqlPack {
 
     /**
      * PLC设备信息配置查询条件封装
+     *
      * @param plcConfigure
      * @return
      */
     public static DdlPackBean getMesPLCConfigure(MesPLCConfigure plcConfigure, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(plcConfigure, organizeCode);
-        if (StringUtils.isNotEmpty(plcConfigure.getAreaCode())){
+        if (StringUtils.isNotEmpty(plcConfigure.getAreaCode())) {
             DdlPreparedPack.getStringEqualPack(plcConfigure.getAreaCode(), "areaCode", packBean);
         }
-        if (StringUtils.isNotEmpty(plcConfigure.getWorkCenterCode())){
+        if (StringUtils.isNotEmpty(plcConfigure.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(plcConfigure.getWorkCenterCode(), "workCenterCode", packBean);
         }
-        if (StringUtils.isNotEmpty(plcConfigure.getWorkCellCode())){
+        if (StringUtils.isNotEmpty(plcConfigure.getWorkCellCode())) {
             DdlPreparedPack.getStringEqualPack(plcConfigure.getWorkCellCode(), "workCellCode", packBean);
         }
         return packBean;