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 2 years ago
parent 7ddd82b292
commit 0d5192e74b
2 changed files with 32 additions and 25 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

@ -18,8 +18,6 @@ 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.tool.HqlPack;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
import cn.estsh.i3plus.pojo.mes.repository.MesWorkCellRepository;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import org.springframework.beans.factory.annotation.Autowired;
@ -27,9 +25,9 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@ -46,9 +44,6 @@ public class TorqueManageService implements ITorqueManageService {
@Autowired
private MesProcessTorqueManageTaskDetailRepository mesTorqueManageTaskDetailRDao;
@Autowired
private MesWorkCellRepository workCellRepository;
@Override
public MesProcessTorqueManage insertMesProcessTorqueManage(MesProcessTorqueManage mesProcessTorqueManage) {
//数据唯一性校验
@ -104,12 +99,14 @@ public class TorqueManageService implements ITorqueManageService {
}
processTorqueManageDb.setPartNo(mesProcessTorqueManage.getPartNo());
processTorqueManageDb.setPartName(mesProcessTorqueManage.getPartName());
processTorqueManageDb.setProcessCode(mesProcessTorqueManage.getProcessCode());
processTorqueManageDb.setProcessName(mesProcessTorqueManage.getProcessName());
processTorqueManageDb.setSpecification(mesProcessTorqueManage.getSpecification());
processTorqueManageDb.setFasteningPosition(mesProcessTorqueManage.getFasteningPosition());
processTorqueManageDb.setUpLimit(mesProcessTorqueManage.getUpLimit());
processTorqueManageDb.setDownLimit(mesProcessTorqueManage.getDownLimit());
processTorqueManageDb.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
ConvertBean.serviceModelUpdate(processTorqueManageDb, userName);
mesProcessTorqueManageRDao.save(processTorqueManageDb);
@ -130,8 +127,18 @@ public class TorqueManageService implements ITorqueManageService {
}
@Override
public void deleteWeaklyMesProcessTorqueManageByIds(Long[] ids, String userName) {
mesProcessTorqueManageRDao.deleteWeaklyByIds(ids, userName);
public void deleteWeaklyMesProcessTorqueManageByIds(String[] ids, String userName) {
//mesProcessTorqueManageRDao.deleteWeaklyByIds(ids, userName);
StringBuffer wheres = new StringBuffer();
HqlPack.getInPack(String.join(",", ids), MesExtConstWords.ID, wheres);
int num = mesProcessTorqueManageRDao.updateByHqlWhere(
wheres.toString(),
new String[]{MesExtConstWords.IS_DELETED, MesExtConstWords.SYSTEM_SYNC_STATUS, MesExtConstWords.MODIFY_USER, MesExtConstWords.MODIFY_DATE_TIME},
new Object[]{CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue(), userName, TimeTool.getNowTime(true)}
);
}
@Override
@ -141,8 +148,8 @@ public class TorqueManageService implements ITorqueManageService {
int num = mesProcessTorqueManageRDao.updateByHqlWhere(
wheres.toString(),
new String[]{MesExtConstWords.IS_VALID, MesExtConstWords.MODIFY_USER, MesExtConstWords.MODIFY_DATE_TIME},
new Object[]{status, userName, TimeTool.getNowTime(true)}
new String[]{MesExtConstWords.IS_VALID, MesExtConstWords.SYSTEM_SYNC_STATUS, MesExtConstWords.MODIFY_USER, MesExtConstWords.MODIFY_DATE_TIME},
new Object[]{status, MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue(), userName, TimeTool.getNowTime(true)}
);
return num;
}
@ -178,17 +185,9 @@ public class TorqueManageService implements ITorqueManageService {
return new ListPager(torqueManageTaskDetailList, pager);
}
private Map<String, String> getWorkCenterCodeByWorkCellCodeMap(MesProcessTorqueManageTaskDetail mesTorqueManageTaskDetail, List<MesProcessTorqueManageTaskDetail> qmanageTaskDetails) {
List<String> workCellCodeList = qmanageTaskDetails.stream().map(MesProcessTorqueManageTaskDetail::getWorkCellCode).distinct().collect(Collectors.toList());
if(CollectionUtils.isEmpty(workCellCodeList)) return null;
DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesTorqueManageTaskDetail.getOrganizeCode());
DdlPreparedPack.getInPackList(workCellCodeList, MesExtConstWords.WORK_CELL_CODE, packBean);
List<MesWorkCell> mesWorkCellDbList = workCellRepository.findByHqlWhere(packBean);
return CollectionUtils.isEmpty(mesWorkCellDbList) ? null : mesWorkCellDbList.stream().collect(Collectors.toMap(MesWorkCell::getWorkCellCode, MesWorkCell::getWorkCenterCode));
}
@Override
public void doConfirmTorqueManageList(List<MesProcessTorqueManageTaskDetail> mesTorqueManageTaskDetailList, String userName) {
List<MesProcessTorqueManageTaskDetail> mesTorqueManageTaskDetailDbList = new ArrayList<>();
for (MesProcessTorqueManageTaskDetail mesTorqueManageTaskDetail : mesTorqueManageTaskDetailList) {
MesProcessTorqueManageTaskDetail torqueManageTaskDetail = mesTorqueManageTaskDetailRDao.getById(mesTorqueManageTaskDetail.getId());
if (torqueManageTaskDetail == null) {
@ -199,13 +198,15 @@ public class TorqueManageService implements ITorqueManageService {
.build();
}
torqueManageTaskDetail.setTeamConfirmUser(mesTorqueManageTaskDetail.getTeamConfirmUser());
torqueManageTaskDetail.setTeamConfirmTime(mesTorqueManageTaskDetail.getTeamConfirmTime());
torqueManageTaskDetail.setIsTeamConfirm(mesTorqueManageTaskDetail.getIsTeamConfirm());
ConvertBean.serviceModelUpdate(torqueManageTaskDetail, torqueManageTaskDetail.getTeamConfirmUser());
torqueManageTaskDetail.setTeamConfirmUser(userName);
torqueManageTaskDetail.setTeamConfirmTime(TimeTool.getNowTime(true));
torqueManageTaskDetail.setIsTeamConfirm(MesExtEnumUtil.CONFIRM_TYPE.YES.getValue());
torqueManageTaskDetail.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
ConvertBean.serviceModelUpdate(torqueManageTaskDetail, userName);
mesTorqueManageTaskDetailDbList.add(torqueManageTaskDetail);
}
mesTorqueManageTaskDetailRDao.saveAll(mesTorqueManageTaskDetailList);
mesTorqueManageTaskDetailRDao.saveAll(mesTorqueManageTaskDetailDbList);
}
}

8
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/jx/TorqueManageExcelService.java
Unescape Escape View File

@ -3,7 +3,6 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.excel.jx;
import cn.estsh.i3plus.ext.mes.api.base.IExcelImportExtService;
import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.CommonExtService;
import cn.estsh.i3plus.ext.mes.pojo.bean.MesProcessTorqueManage;
import cn.estsh.i3plus.ext.mes.pojo.bean.MesProcessTorqueManage;
import cn.estsh.i3plus.ext.mes.pojo.model.ExcelImportErrorExtModel;
import cn.estsh.i3plus.ext.mes.pojo.model.ExcelImportResultExtModel;
import cn.estsh.i3plus.ext.mes.pojo.repository.MesProcessTorqueManageRepository;
@ -14,6 +13,7 @@ import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.tool.MathOperation;
import cn.estsh.i3plus.platform.common.util.MesConstWords;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.mes.bean.MesPart;
import cn.estsh.i3plus.pojo.mes.bean.MesProcess;
import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository;
import cn.estsh.i3plus.pojo.mes.repository.MesProcessRepository;
@ -198,12 +198,16 @@ public class TorqueManageExcelService implements IExcelImportExtService {
processName = ((MesProcess) processCodeEntityMap.get(processCode)).getProcessName();
}
String partName = null;
//校验零件编号
if (!StringUtils.isEmpty(partNo)) {
if (!partNoEntityMap.containsKey(partNo)) {
errorNum++;
cellNum += "A;";
errorInfo += "第A列数据无效;";
} else {
partName = ((MesPart)partNoEntityMap.get(partNo)).getPartName();
}
}
@ -309,6 +313,7 @@ public class TorqueManageExcelService implements IExcelImportExtService {
mesProcessTorqueManage = new MesProcessTorqueManage();
ConvertBean.serviceModelInitialize(mesProcessTorqueManage, userName);
mesProcessTorqueManage.setPartNo(partNo);
mesProcessTorqueManage.setPartName(partName);
mesProcessTorqueManage.setProcessCode(processCode);
}
@ -318,6 +323,7 @@ public class TorqueManageExcelService implements IExcelImportExtService {
mesProcessTorqueManage.setOrganizeCode(organizeCode);
mesProcessTorqueManage.setUpLimit(upLimit);
mesProcessTorqueManage.setDownLimit(downLimit);
mesProcessTorqueManage.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
processTorqueManageExtList.add(mesProcessTorqueManage);

Write Preview
Loading…
Cancel
Save