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

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java

@@ -38,4 +38,9 @@ public class MesRouteProcessCell extends BaseBean {
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
 }

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

@@ -363,4 +363,27 @@ public class MesHqlPack {
 
         return packBean;
     }
+
+    /**
+     * MES工序工作单元对应关系查询条件封装
+     * @param routeProcessCell
+     * @return
+     */
+    public static DdlPackBean getMesRouteProcessCell(MesRouteProcessCell routeProcessCell, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(routeProcessCell, organizeCode);
+        if (StringUtils.isNotEmpty(routeProcessCell.getRouteCode())){
+            DdlPreparedPack.getStringEqualPack(routeProcessCell.getRouteCode(), "routeCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(routeProcessCell.getProcessCode())){
+            DdlPreparedPack.getStringEqualPack(routeProcessCell.getProcessCode(), "processCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(routeProcessCell.getWorkCellCode())){
+            DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(routeProcessCell.getWorkCenterCode())){
+            DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+
+        return packBean;
+    }
 }