From d1882b87db4508b43b2f81360762fdb0f8133795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Thu, 23 May 2024 14:09:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/mes/apiservice/serviceimpl/base/EquipmentExtService.java   | 6 +++---
 .../apiservice/serviceimpl/base/MesDefectWarnConfigService.java    | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/EquipmentExtService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/EquipmentExtService.java
index fb399a9..dab9a9c 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/EquipmentExtService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/EquipmentExtService.java
@@ -48,9 +48,9 @@ public class EquipmentExtService implements IEquipmentExtService {
         pager = PagerHelper.getPager(pager, equipmentDao.queryMesEquipmentByPagerOrgCount(mesEquipment));
         List<MesEquipmentModel> equipmentModels = equipmentDao.queryMesEquipmentByPagerOrg(mesEquipment, pager);
         for (MesEquipmentModel equipmentModel : equipmentModels) {
-            if(equipmentModel.getStatus() != null){
-                equipmentModel.setStatusName(LocaleUtils.getLocaleRes(equStatusEnumMap.get(equipmentModel.getStatus().toString())));
-            }
+//            if(equipmentModel.getStatus() != null){
+//                equipmentModel.setStatusName(LocaleUtils.getLocaleRes(equStatusEnumMap.get(equipmentModel.getStatus().toString())));
+//            }
         }
         return new ListPager(equipmentModels, pager);
     }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java
index 6663c4b..923a83d 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java
@@ -78,7 +78,7 @@ public class MesDefectWarnConfigService extends BaseMesService<MesDefectWarnConf
 
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getDefectTypeCode(), "defectTypeCode", packBean);
-        DdlPreparedPack.getStringLikerPack(item.getDefectLocation(), "defectLocation", packBean);
+        DdlPreparedPack.getStringEqualPack(item.getDefectLocation(), "defectLocation", packBean);
         DdlPreparedPack.getStringEqualPack(item.getPartTypeCode(), "partTypeCode", packBean);
         DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getNumEqualPack(item.getFrontBack(), "frontBack", packBean);
@@ -96,8 +96,9 @@ public class MesDefectWarnConfigService extends BaseMesService<MesDefectWarnConf
 
     protected void setPackQueryBean(MesDefectWarnConfig bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getDefectTypeCode(), "defectTypeCode", packBean);
-        DdlPreparedPack.getStringLikerPack(bean.getDefectLocation(), "defectLocation", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getDefectLocation(), "defectLocation", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getPartTypeCode(), "partTypeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
     }
 
     @Override
@@ -112,7 +113,7 @@ public class MesDefectWarnConfigService extends BaseMesService<MesDefectWarnConf
         for (MesDefectRecordModel model : modelList) {
             DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
             DdlPreparedPack.getStringEqualPack(model.getDefectTypeCode(), "defectTypeCode", packBean);
-            DdlPreparedPack.getStringLikerPack(model.getDefectLocation(), "defectLocation", packBean);
+            DdlPreparedPack.getStringEqualPack(model.getDefectLocation(), "defectLocation", packBean);
             DdlPreparedPack.getStringEqualPack(model.getPartTypeCode(), "partTypeCode", packBean);
             DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", packBean);
             DdlPreparedPack.getNumEqualPack(model.getFrontBack(), "frontBack", packBean);