MES：流程配置添加工序，工步基础数据接口

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

@@ -303,6 +303,7 @@ public class MesHqlPack {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdRouteCfg, organizeCode);
         DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean);
         packBean.setOrderByStr(mesProdRouteCfg.orderBy());
         return packBean;
     }
@@ -357,6 +358,9 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(step.getStepName())){
             DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean);
         }
+        if (StringUtils.isNotEmpty(step.getStepType())){
+            DdlPreparedPack.getStringLikerPack(step.getStepType(), "stepType", packBean);
+        }
 
         return packBean;
     }

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

@@ -21,8 +21,6 @@ import java.util.List;
 public class MesRouteModel implements Serializable {
     @ApiParam("流程代码")
     public String routeCode;
-    @ApiParam("工厂代码")
-    public String organizeCode;
     @ApiParam("GOJS位置")
     public String position;
     @ApiParam("流程明细Model集合")

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

@@ -25,6 +25,6 @@ public class MesRouteProcessModel {
     public MesRouteProcess mesRouteProcess;
     @ApiParam("流程工步参数配置表(根据Seq分组)")
     public Map<String, List<MesRouteProcessStep>> mesRouteProcessStepMap;
-    @ApiParam("流程工步参数配置表(根据Seq分组)")
+    @ApiParam("产品流程参数配置表(根据Seq分组)")
     public Map<String, List<MesProdRouteOptParam>> mesProdRouteOptParamMap;
 }