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

Merge branch 'dev' into dev-wuhan

Browse Source
tags/yfai-mes-ext-v2.3
王杰 7 months ago
parent b1c10ef5ab c69478ef7d
commit 99afee831f
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File

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

@ -134,12 +134,6 @@ public class MesDowntimeRecordServiceImpl extends BaseMesService<MesDowntimeReco
if (StringUtil.isEmpty(mesProductionRecord)) { if (StringUtil.isEmpty(mesProductionRecord)) {
DdlPackBean ddlPackBeanDowntime = DdlPackBean.getDdlPackBean(organizeCode); DdlPackBean ddlPackBeanDowntime = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", ddlPackBeanDowntime); DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", ddlPackBeanDowntime);
if(!StringUtil.isEmpty(reason)){
DdlPreparedPack.getStringEqualPack(reason, "reasonCode", ddlPackBeanDowntime);
}
if(!StringUtil.isEmpty(type)){
DdlPreparedPack.getStringEqualPack(type, "reasonTypeCode", ddlPackBeanDowntime);
}
DdlPreparedPack.getOrderBy("createDatetime", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), ddlPackBeanDowntime); DdlPreparedPack.getOrderBy("createDatetime", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), ddlPackBeanDowntime);
List<MesDowntimeRecord> mesDowntimeRecordDaoList = mesDowntimeRecordRDao.findByHqlTopWhere(ddlPackBeanDowntime, 1); List<MesDowntimeRecord> mesDowntimeRecordDaoList = mesDowntimeRecordRDao.findByHqlTopWhere(ddlPackBeanDowntime, 1);
@ -175,7 +169,7 @@ public class MesDowntimeRecordServiceImpl extends BaseMesService<MesDowntimeReco
}else { }else {
// 如果上一次停机还未结束，则不需要再生成一条新的记录 // 如果上一次停机还未结束，则不需要再生成一条新的记录
if (StringUtils.isEmpty(mesDowntimeRecordDaoList.get(0).getModifyDatetime())) { if (StringUtils.isEmpty(mesDowntimeRecordDaoList.get(0).getModifyDatetime()) && Objects.equals(mesDowntimeRecordDaoList.get(0).getReasonTypeCode(), "6")) {
continue; continue;
} }
ConvertBean.serviceModelUpdate(mesDowntimeRecordDaoList.get(0), "MesDowntimeRecordJob"); ConvertBean.serviceModelUpdate(mesDowntimeRecordDaoList.get(0), "MesDowntimeRecordJob");
@ -185,12 +179,6 @@ public class MesDowntimeRecordServiceImpl extends BaseMesService<MesDowntimeReco
} else { } else {
DdlPackBean ddlPackBeanDowntime = DdlPackBean.getDdlPackBean(organizeCode); DdlPackBean ddlPackBeanDowntime = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", ddlPackBeanDowntime); DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", ddlPackBeanDowntime);
if(!StringUtil.isEmpty(reason)){
DdlPreparedPack.getStringEqualPack(reason, "reasonCode", ddlPackBeanDowntime);
}
if(!StringUtil.isEmpty(type)){
DdlPreparedPack.getStringEqualPack(type, "reasonTypeCode", ddlPackBeanDowntime);
}
DdlPreparedPack.getOrderBy("createDatetime", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), ddlPackBeanDowntime); DdlPreparedPack.getOrderBy("createDatetime", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), ddlPackBeanDowntime);
MesDowntimeRecord mesDowntimeRecordDao = mesDowntimeRecordRDao.getByProperty(ddlPackBeanDowntime); MesDowntimeRecord mesDowntimeRecordDao = mesDowntimeRecordRDao.getByProperty(ddlPackBeanDowntime);
if (mesDowntimeRecordDao != null) { if (mesDowntimeRecordDao != null) {

Write Preview
Loading…
Cancel
Save