Fix Bug #9874

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

@@ -174,6 +174,12 @@ public class StationRequestBean implements Serializable {
     @ApiParam("区域代码")
     private String areaCode;
 
+    @ApiParam("数量")
+    private Integer qty;
+
+    @ApiParam("班次名称")
+    private String shiftName;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -296,8 +296,15 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode);
-        DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
+        if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikePack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterName())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkCenter.getAreaCode())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
+        }
         return packBean;
     }
 
@@ -310,13 +317,13 @@ public class MesHqlPack {
     public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode);
         if (!StringUtils.isEmpty(mesWorkCell.getWorkCenterCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
         }
         if (!StringUtils.isEmpty(mesWorkCell.getAreaCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
         }
         if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
         }
 
         return packBean;