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

设备停机记录job修改

Browse Source
tags/yfai-mes-ext-v2.2
xiangwei.zhang 7 months ago
parent d96f360a0f
commit 5137d12b0e
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesAccountJob.java
Unescape Escape View File

@ -145,7 +145,7 @@ public class MesAccountJob extends BaseMesScheduleJob {
DdlPreparedPack.getStringEqualPack(detailLogs.get(0).getEquipVariableValue(), "mouldNo", mouldMultipackBeanTemp);
List<MesMouldMultiCavity> mouldMultiCavities = mesMouldMultiCavityRepository.findByHqlWhere(mouldMultipackBeanTemp);
if (CollectionUtils.isEmpty(mouldMultiCavities)) {
continue;
partNo = "";
} else {
List<String> partList = mouldMultiCavities.stream().map(MesMouldMultiCavity::getPartNo).distinct().collect(Collectors.toList());
partNo = String.join(",", partList);

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

@ -11,6 +11,7 @@ import cn.estsh.i3plus.platform.common.util.MesConstWords;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.util.StringUtil;
@ -173,6 +174,10 @@ public class MesDowntimeRecordServiceImpl extends BaseMesService<MesDowntimeReco
mesDowntimeRecordRDao.insert(mesDowntimeRecord);
}else {
// 如果上一次停机还未结束，则不需要再生成一条新的记录
if (StringUtils.isEmpty(mesDowntimeRecordDaoList.get(0).getModifyDatetime())) {
continue;
}
ConvertBean.serviceModelUpdate(mesDowntimeRecordDaoList.get(0), "MesDowntimeRecordJob");
mesDowntimeRecordDaoList.get(0).setSystemSyncStatus(2);
mesDowntimeRecordRDao.update(mesDowntimeRecordDaoList.get(0));
@ -216,9 +221,11 @@ public class MesDowntimeRecordServiceImpl extends BaseMesService<MesDowntimeReco
DdlPreparedPack.getStringBiggerPack(downtimeRecord.getCreateDatetime(), "createDatetime", ddlPackBean);
}
if (!StringUtils.isEmpty(downtimeRecord.getModifyDatetime())) {
DdlPreparedPack.getStringBiggerPack(downtimeRecord.getModifyDatetime(), "modifyDatetime", ddlPackBean);
DdlPreparedPack.getStringSmallerPack(downtimeRecord.getModifyDatetime(), "modifyDatetime", ddlPackBean);
}
pager = PagerHelper.getPager(pager, mesDowntimeRecordRDao.findByHqlWhereCount(ddlPackBean));
List<MesDowntimeRecord> recordList = mesDowntimeRecordRDao.findByHqlWherePage(ddlPackBean, pager);
if (!CollectionUtils.isEmpty(recordList)) {
List<String> reasonCodeList = recordList.stream().map(MesDowntimeRecord::getReasonCode).distinct().collect(Collectors.toList());
@ -261,12 +268,12 @@ public class MesDowntimeRecordServiceImpl extends BaseMesService<MesDowntimeReco
if (StringUtils.isEmpty(mesDowntimeRecordResModel.getModifyDatetime())) {
Date startTime = DateUtil.parseDateTime(mesDowntimeRecordResModel.getCreateDatetime());
Date currentTime = new Date();
Long time = (currentTime.getTime() - startTime.getTime())/1000;
Long time = (currentTime.getTime() - startTime.getTime())/(1000 * 60);
mesDowntimeRecordResModel.setCurrentDownTime(time.intValue());
} else {
Date startTime = DateUtil.parseDateTime(mesDowntimeRecordResModel.getCreateDatetime());
Date endTime = DateUtil.parseDateTime(mesDowntimeRecordResModel.getModifyDatetime());
Long time = (endTime.getTime() - startTime.getTime())/1000;
Long time = (endTime.getTime() - startTime.getTime())/(1000 * 60);
mesDowntimeRecordResModel.setDownTime(time.intValue());
}
list.add(mesDowntimeRecordResModel);

Write Preview
Loading…
Cancel
Save