jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

修改表字段

Browse Source
tags/yfai-mes-ext-v1.0
LML丶 12 months ago
parent 904f990ba2
commit d1882b87db
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File

6
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/EquipmentExtService.java
Unescape Escape View File

@ -48,9 +48,9 @@ public class EquipmentExtService implements IEquipmentExtService {
pager = PagerHelper.getPager(pager, equipmentDao.queryMesEquipmentByPagerOrgCount(mesEquipment)); pager = PagerHelper.getPager(pager, equipmentDao.queryMesEquipmentByPagerOrgCount(mesEquipment));
List<MesEquipmentModel> equipmentModels = equipmentDao.queryMesEquipmentByPagerOrg(mesEquipment, pager); List<MesEquipmentModel> equipmentModels = equipmentDao.queryMesEquipmentByPagerOrg(mesEquipment, pager);
for (MesEquipmentModel equipmentModel : equipmentModels) { for (MesEquipmentModel equipmentModel : equipmentModels) {
if(equipmentModel.getStatus() != null){ // if(equipmentModel.getStatus() != null){
equipmentModel.setStatusName(LocaleUtils.getLocaleRes(equStatusEnumMap.get(equipmentModel.getStatus().toString()))); // equipmentModel.setStatusName(LocaleUtils.getLocaleRes(equStatusEnumMap.get(equipmentModel.getStatus().toString())));
} // }
} }
return new ListPager(equipmentModels, pager); return new ListPager(equipmentModels, pager);
} }

7
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java
Unescape Escape View File

@ -78,7 +78,7 @@ public class MesDefectWarnConfigService extends BaseMesService<MesDefectWarnConf
DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getDefectTypeCode(), "defectTypeCode", packBean); 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.getPartTypeCode(), "partTypeCode", packBean);
DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", packBean);
DdlPreparedPack.getNumEqualPack(item.getFrontBack(), "frontBack", packBean); DdlPreparedPack.getNumEqualPack(item.getFrontBack(), "frontBack", packBean);
@ -96,8 +96,9 @@ public class MesDefectWarnConfigService extends BaseMesService<MesDefectWarnConf
protected void setPackQueryBean(MesDefectWarnConfig bean, DdlPackBean packBean) { protected void setPackQueryBean(MesDefectWarnConfig bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getDefectTypeCode(), "defectTypeCode", 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.getPartTypeCode(), "partTypeCode", packBean);
DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
} }
@Override @Override
@ -112,7 +113,7 @@ public class MesDefectWarnConfigService extends BaseMesService<MesDefectWarnConf
for (MesDefectRecordModel model : modelList) { for (MesDefectRecordModel model : modelList) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(org); DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
DdlPreparedPack.getStringEqualPack(model.getDefectTypeCode(), "defectTypeCode", packBean); 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.getPartTypeCode(), "partTypeCode", packBean);
DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", packBean);
DdlPreparedPack.getNumEqualPack(model.getFrontBack(), "frontBack", packBean); DdlPreparedPack.getNumEqualPack(model.getFrontBack(), "frontBack", packBean);

Write Preview
Loading…
Cancel
Save