修改表字段

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);
     }

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);