From c90a009e66d218a6e2482866c46b196471590670 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Fri, 24 Jul 2020 18:02:19 +0800
Subject: [PATCH] Fix Bug #9874

---
 .../estsh/i3plus/pojo/mes/model/StationRequestBean.java |  6 ++++++
 .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java    | 17 ++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
index ad767e6..62c4058 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
+++ b/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{" +
diff --git 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
index ffe13b9..cae893e 100644
--- 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
@@ -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;