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
yxw 1 year ago
parent 75e34ed10d
commit 8dde8181f4
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File

49
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/jx/TorqueManageService.java
Unescape Escape View File

@ -156,33 +156,38 @@ public class TorqueManageService implements ITorqueManageService {
@Override @Override
public ListPager<MesProcessTorqueManageTaskDetail> queryTorqueManageTaskDetailReportByPager(MesProcessTorqueManageTaskDetail mesTorqueManageTaskDetail, Pager pager) { public ListPager<MesProcessTorqueManageTaskDetail> queryTorqueManageTaskDetailReportByPager(MesProcessTorqueManageTaskDetail mesTorqueManageTaskDetail, Pager pager) {
DdlPackBean packBean = MesExtHqlPack.getMesProcessTorqueManageTaskDetail(mesTorqueManageTaskDetail); if (mesTorqueManageTaskDetail == null) {
pager = PagerHelper.getPager(pager, mesTorqueManageTaskDetailRDao.listCount());
pager = PagerHelper.getPager(pager, mesTorqueManageTaskDetailRDao.findByHqlWhereCount(packBean)); return new ListPager(mesTorqueManageTaskDetailRDao.listPager(pager), pager);
List<MesProcessTorqueManageTaskDetail> torqueManageTaskDetailList = mesTorqueManageTaskDetailRDao.findByHqlWhere(packBean); } else {
DdlPackBean hqlPack = MesExtHqlPack.getMesProcessTorqueManageTaskDetail(mesTorqueManageTaskDetail);
if (!CollectionUtils.isEmpty(torqueManageTaskDetailList)) { hqlPack.setOrderByStr(mesTorqueManageTaskDetail.orderBy());
pager = PagerHelper.getPager(pager, mesTorqueManageTaskDetailRDao.findByHqlWhereCount(hqlPack));
for (MesProcessTorqueManageTaskDetail torqueManageTaskDetail : torqueManageTaskDetailList) { List<MesProcessTorqueManageTaskDetail> torqueManageTaskDetailList = mesTorqueManageTaskDetailRDao.findByHqlWherePage(hqlPack, pager);
if (torqueManageTaskDetail != null) {
if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueSpecValue())) { if (!CollectionUtils.isEmpty(torqueManageTaskDetailList)) {
List<String> torqueSpecValueList = Arrays.stream(torqueManageTaskDetail.getTorqueSpecValue().split(MesExtConstWords.COMMA)).collect(Collectors.toList());
StringBuffer torqueSpecValueDesc = new StringBuffer(); for (MesProcessTorqueManageTaskDetail torqueManageTaskDetail : torqueManageTaskDetailList) {
for (String torqueSpecValue : torqueSpecValueList) { if (torqueManageTaskDetail != null) {
torqueSpecValueDesc.append(MesExtEnumUtil.TORQUE_SPEC_VALUE.valueOfDescription(torqueSpecValue)); if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueSpecValue())) {
torqueSpecValueDesc.append(MesExtConstWords.COMMA); List<String> torqueSpecValueList = Arrays.stream(torqueManageTaskDetail.getTorqueSpecValue().split(MesExtConstWords.COMMA)).collect(Collectors.toList());
StringBuffer torqueSpecValueDesc = new StringBuffer();
for (String torqueSpecValue : torqueSpecValueList) {
torqueSpecValueDesc.append(MesExtEnumUtil.TORQUE_SPEC_VALUE.valueOfDescription(torqueSpecValue));
torqueSpecValueDesc.append(MesExtConstWords.COMMA);
}
torqueSpecValueDesc.deleteCharAt(torqueSpecValueDesc.length() - 1);
torqueManageTaskDetail.setTorqueSpecValueDesc(torqueSpecValueDesc.toString());
} }
torqueSpecValueDesc.deleteCharAt(torqueSpecValueDesc.length() - 1);
torqueManageTaskDetail.setTorqueSpecValueDesc(torqueSpecValueDesc.toString());
}
if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueManageNo1())) torqueManageTaskDetail.setTorqueManageNo1Full("M60-"+ torqueManageTaskDetail.getTorqueManageNo1() +"-Q0"); if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueManageNo1())) torqueManageTaskDetail.setTorqueManageNo1Full("M60-"+ torqueManageTaskDetail.getTorqueManageNo1() +"-Q0");
if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueManageNo2())) torqueManageTaskDetail.setTorqueManageNo2Full("M60-"+ torqueManageTaskDetail.getTorqueManageNo2() +"-Q0"); if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueManageNo2())) torqueManageTaskDetail.setTorqueManageNo2Full("M60-"+ torqueManageTaskDetail.getTorqueManageNo2() +"-Q0");
if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueManageNo3())) torqueManageTaskDetail.setTorqueManageNo3Full("M60-"+ torqueManageTaskDetail.getTorqueManageNo3() +"-Q0"); if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueManageNo3())) torqueManageTaskDetail.setTorqueManageNo3Full("M60-"+ torqueManageTaskDetail.getTorqueManageNo3() +"-Q0");
}
} }
} }
return new ListPager(torqueManageTaskDetailList, pager);
} }
return new ListPager(torqueManageTaskDetailList, pager);
} }
@Override @Override

Write Preview
Loading…
Cancel
Save