xiangwei.zhang
/
i3plus-mes-pcn-panasonic-jx
forked from I3_CDG/i3plus-mes-pcn-panasonic-jx
1
0
Fork 0
Code Pull Requests Activity

扭矩管理点检

Browse Source
dev
yxw 2 years ago
parent 1f5f0448dd
commit 8661d930fa
3 changed files with 64 additions and 26 deletions
Show Stats Download Patch File Download Diff File

10
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/jx/TorqueManageCheckController.java
Unescape Escape View File

@ -44,7 +44,7 @@ public class TorqueManageCheckController extends MesPcnBaseController {
@ApiOperation(value = "查询扭矩管理点检作业明细")
public ResultBean queryProcessTorqueManageTaskDetailCheckDetail(MesProcessTorqueManageTaskDetail torqueManageTaskDetail, Pager pager) {
try {
return ResultBean.success("查询成功").setResultObject(personCheckDetailService.queryTorqueManageCheckDetail(torqueManageTaskDetail, pager))
return ResultBean.success("查询成功").setListPager(personCheckDetailService.queryTorqueManageCheckDetail(torqueManageTaskDetail, pager))
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
@ -61,9 +61,9 @@ public class TorqueManageCheckController extends MesPcnBaseController {
*/
@PutMapping(value = "/detail/update")
@ApiOperation(value = "修改明细数据")
public ResultBean updateMesQManageTaskDetail(MesProcessTorqueManageTaskDetail personCheckDetail) {
public ResultBean updateMesQManageTaskDetail(MesProcessTorqueManageTaskDetail torqueManageTaskDetail) {
try {
personCheckDetailService.updateTorqueManageCheckDetail(personCheckDetail);
personCheckDetailService.updateTorqueManageCheckDetail(torqueManageTaskDetail);
return ResultBean.success("修改成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
@ -81,9 +81,9 @@ public class TorqueManageCheckController extends MesPcnBaseController {
*/
@PutMapping(value = "/detail/update-top-data")
@ApiOperation(value = "根据单号修改明细数据中扭矩规格值和管理NO")
public ResultBean updateTopMesQManageTaskDetail(MesProcessTorqueManageTaskDetail personCheckDetail) {
public ResultBean updateTopMesQManageTaskDetail(MesProcessTorqueManageTaskDetail torqueManageTaskDetail) {
try {
personCheckDetailService.updateTopTorqueManageCheckDetail(personCheckDetail);
personCheckDetailService.updateTopTorqueManageCheckDetail(torqueManageTaskDetail);
return ResultBean.success("修改成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {

39
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java
Unescape Escape View File

@ -63,8 +63,8 @@ public class TorqueManageCheckDetailService implements ITorqueManageCheckService
@Override
public void updateTorqueManageCheckDetail(MesProcessTorqueManageTaskDetail torqueManageTaskDetail) {
MesProcessTorqueManageTaskDetail detailById = torqueManageTaskDetailRepository.getById(torqueManageTaskDetail.getId());
if (null == detailById) {
MesProcessTorqueManageTaskDetail torqueManageTaskDetailDb = torqueManageTaskDetailRepository.getById(torqueManageTaskDetail.getId());
if (null == torqueManageTaskDetailDb) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
@ -90,7 +90,7 @@ public class TorqueManageCheckDetailService implements ITorqueManageCheckService
torqueManageTaskDetail.getFasteningIsStc() == MesPcnExtEnumUtil.TORQUE_MANAGE_CHECK_RESULT.NG.getValue() ||
torqueManageTaskDetail.getToolHeadNoWear() == null ||
torqueManageTaskDetail.getToolHeadNoWear() == MesPcnExtEnumUtil.TORQUE_MANAGE_CHECK_RESULT.NG.getValue()
) torqueManageTaskDetail.setCheckResult(MesPcnExtEnumUtil.TORQUE_MANAGE_CHECK_RESULT.NG.getValue());
) torqueManageTaskDetailDb.setCheckResult(MesPcnExtEnumUtil.TORQUE_MANAGE_CHECK_RESULT.NG.getValue());
else {
@ -104,8 +104,8 @@ public class TorqueManageCheckDetailService implements ITorqueManageCheckService
else if (checkValue(torqueManageTaskDetail.getTorqueValue4(), upLimitDouble, downLimitDouble)) isNG = true;
else if (checkValue(torqueManageTaskDetail.getTorqueValue5(), upLimitDouble, downLimitDouble)) isNG = true;
if (isNG) torqueManageTaskDetail.setCheckResult(MesPcnExtEnumUtil.TORQUE_MANAGE_CHECK_RESULT.NG.getValue());
else torqueManageTaskDetail.setCheckResult(MesPcnExtEnumUtil.TORQUE_MANAGE_CHECK_RESULT.OK.getValue());
if (isNG) torqueManageTaskDetailDb.setCheckResult(MesPcnExtEnumUtil.TORQUE_MANAGE_CHECK_RESULT.NG.getValue());
else torqueManageTaskDetailDb.setCheckResult(MesPcnExtEnumUtil.TORQUE_MANAGE_CHECK_RESULT.OK.getValue());
}
@ -119,16 +119,28 @@ public class TorqueManageCheckDetailService implements ITorqueManageCheckService
torqueManageTaskDetail.getFasteningIsStc() == MesPcnExtEnumUtil.TORQUE_MANAGE_CHECK_RESULT.NG.getValue() ||
torqueManageTaskDetail.getToolHeadNoWear() == null ||
torqueManageTaskDetail.getToolHeadNoWear() == MesPcnExtEnumUtil.TORQUE_MANAGE_CHECK_RESULT.NG.getValue()
) torqueManageTaskDetail.setCheckResult(MesPcnExtEnumUtil.TORQUE_MANAGE_CHECK_RESULT.NG.getValue());
) torqueManageTaskDetailDb.setCheckResult(MesPcnExtEnumUtil.TORQUE_MANAGE_CHECK_RESULT.NG.getValue());
else torqueManageTaskDetail.setCheckResult(MesPcnExtEnumUtil.TORQUE_MANAGE_CHECK_RESULT.OK.getValue());
else torqueManageTaskDetailDb.setCheckResult(MesPcnExtEnumUtil.TORQUE_MANAGE_CHECK_RESULT.OK.getValue());
}
}
torqueManageTaskDetail.setCheckTime(TimeTool.getNowTime(true));
torqueManageTaskDetail.setCheckUser(torqueManageTaskDetail.getModifyUser());
ConvertBean.serviceModelUpdate(torqueManageTaskDetail, torqueManageTaskDetail.getModifyUser());
torqueManageTaskDetailRepository.save(torqueManageTaskDetail);
torqueManageTaskDetailDb.setCheckTime(TimeTool.getNowTime(true));
torqueManageTaskDetailDb.setCheckUser(torqueManageTaskDetail.getModifyUser());
torqueManageTaskDetailDb.setRotationNoAbnormal(torqueManageTaskDetail.getRotationNoAbnormal());
torqueManageTaskDetailDb.setFasteningNoAbnormal(torqueManageTaskDetail.getFasteningNoAbnormal());
torqueManageTaskDetailDb.setFasteningIsStc(torqueManageTaskDetail.getFasteningIsStc());
torqueManageTaskDetailDb.setToolHeadNoWear(torqueManageTaskDetail.getToolHeadNoWear());
torqueManageTaskDetailDb.setScrewdriverNo(torqueManageTaskDetail.getScrewdriverNo());
if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueValue1())) torqueManageTaskDetailDb.setTorqueValue1(torqueManageTaskDetail.getTorqueValue1());
if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueValue2())) torqueManageTaskDetailDb.setTorqueValue2(torqueManageTaskDetail.getTorqueValue2());
if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueValue3())) torqueManageTaskDetailDb.setTorqueValue3(torqueManageTaskDetail.getTorqueValue3());
if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueValue4())) torqueManageTaskDetailDb.setTorqueValue4(torqueManageTaskDetail.getTorqueValue4());
if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueValue5())) torqueManageTaskDetailDb.setTorqueValue5(torqueManageTaskDetail.getTorqueValue5());
torqueManageTaskDetailDb.setSystemSyncStatus(MesPcnExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
torqueManageTaskDetailDb.setCheckResult(torqueManageTaskDetail.getCheckResult());
ConvertBean.serviceModelUpdate(torqueManageTaskDetailDb, torqueManageTaskDetail.getModifyUser());
torqueManageTaskDetailRepository.save(torqueManageTaskDetailDb);
//单据主表状态改为点检中
updateOrderJobStatus(torqueManageTaskDetail);
@ -146,9 +158,10 @@ public class TorqueManageCheckDetailService implements ITorqueManageCheckService
@Override
public void updateTopTorqueManageCheckDetail(MesProcessTorqueManageTaskDetail torqueManageTaskDetail) {
torqueManageTaskDetailRepository.updateByProperties(new String[]{MesPcnExtConstWords.ORDER_JOB_NO}, new Object[]{torqueManageTaskDetail.getOrderJobNo()},
new String[]{MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME, MesPcnExtConstWords.TORQUE_MANAGE_NO1, MesPcnExtConstWords.TORQUE_MANAGE_NO2, MesPcnExtConstWords.TORQUE_MANAGE_NO3, MesPcnExtConstWords.TORQUE_SPEC_VALUE},
new Object[]{AuthUtil.getSessionUser().getUserName(), TimeTool.getNowTime(true), torqueManageTaskDetail.getTorqueManageNo1(), torqueManageTaskDetail.getTorqueManageNo2(), torqueManageTaskDetail.getTorqueManageNo3(), torqueManageTaskDetail.getTorqueSpecValue()});
new String[]{MesPcnExtConstWords.SYSTEM_SYNC_STATUS, MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME, MesPcnExtConstWords.TORQUE_MANAGE_NO1, MesPcnExtConstWords.TORQUE_MANAGE_NO2, MesPcnExtConstWords.TORQUE_MANAGE_NO3, MesPcnExtConstWords.TORQUE_SPEC_VALUE},
new Object[]{MesPcnExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue(), AuthUtil.getSessionUser().getUserName(), TimeTool.getNowTime(true), torqueManageTaskDetail.getTorqueManageNo1(), torqueManageTaskDetail.getTorqueManageNo2(), torqueManageTaskDetail.getTorqueManageNo3(), torqueManageTaskDetail.getTorqueSpecValue()});
}
private void updateOrderJobStatus(MesProcessTorqueManageTaskDetail torqueManageTaskDetail) {

41
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckService.java
Unescape Escape View File

@ -158,7 +158,7 @@ public class TorqueManageCheckService implements IWorkOrderStartService {
new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.IS_DELETED,
MesPcnExtConstWords.ORDER_TYPE, MesPcnExtConstWords.CREATE_RULE, MesPcnExtConstWords.WORK_CENTER_CODE},
new Object[]{workOrderExt.getOrganizeCode(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
MesPcnExtEnumUtil.MES_OR_ORDER_TYPE.FAILURE_CASE_CHECK.getValue(), MesPcnExtEnumUtil.MES_OR_CREATE_RULE.WORK_ORDER_CREATE.getValue(), workOrderExt.getWorkCenterCode()});
MesPcnExtEnumUtil.MES_OR_ORDER_TYPE.TORQUE_MANAGE.getValue(), MesPcnExtEnumUtil.MES_OR_CREATE_RULE.WORK_ORDER_CREATE.getValue(), workOrderExt.getWorkCenterCode()});
Optional<MesOrderRule> orderRuleOp = CollectionUtils.isEmpty(orderRuleList) ? null :
orderRuleList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getShiftCode()) && o.getShiftCode().equals(workCenterExt.getShiftCode()))).findFirst();
if (null == orderRuleOp || !orderRuleOp.isPresent()) {
@ -204,6 +204,7 @@ public class TorqueManageCheckService implements IWorkOrderStartService {
BeanUtils.copyProperties(torqueManage, detail, MesPcnExtConstWords.ID);
detail.setOrderJobNo(mesOrderJob.getOrderNo());
detail.setWorkCenterCode(mesOrderJob.getWorkCenterCode());
detail.setWorkCenterName(processCell.getWorkCenterName());
detail.setWorkOrderNo(mesOrderJob.getWorkOrderNo());
detail.setShiftCode(workCenterExt.getShiftCode());
detail.setWorkCellCode(processCell.getWorkCellCode());
@ -211,7 +212,9 @@ public class TorqueManageCheckService implements IWorkOrderStartService {
detail.setProcessCode(processCell.getProcessCode());
detail.setProcessName(processCell.getProcessName());
detail.setPartNo(workOrderExt.getPartNo());
detail.setPartName(workOrderExt.getPartNameRdd());
detail.setOrganizeCode(workOrderExt.getOrganizeCode());
detail.setSystemSyncStatus(MesPcnExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
ConvertBean.serviceModelInitialize(detail, userInfo);
torqueManageTaskDetailRepository.insert(detail);
@ -229,14 +232,36 @@ public class TorqueManageCheckService implements IWorkOrderStartService {
StringJoiner key = new StringJoiner(MesPcnExtConstWords.COLON).add("MES-PAUSE-ORDER").add(workOrderExt.getOrderNo());
String pauseOrderKey = (String) redisMesPcn.getObject(key);
String workCenterWoPauseKey = new StringJoiner(MesPcnExtConstWords.COLON).add("MES-PAUSE-ORDER").add(workOrderExt.getWorkCenterCode()).toString();
if (StringUtils.isEmpty(pauseOrderKey)) {
msg = String.format("扭矩管理点检生成单据:工单[%s]在一分钟内有过暂停操作，操作频繁，等待一分钟后可再生成扭矩管理点检单", workOrderExt.getOrderNo());
log.info(msg);
checkErrorLogService.insertCheckErrorLog(checkErrorLog, msg, userInfo);
return true;
}
//String workOrderNo = (String) redisMesPcn.getObject(workCenterWoPauseKey);
//
//String pauseOrderKey = (String) redisMesPcn.getObject(key);
//if (StringUtils.isEmpty(pauseOrderKey)) {
// msg = String.format("扭矩管理点检生成单据:工单[%s]在一分钟内有过暂停操作，操作频繁，等待一分钟后可再生成扭矩管理点检单", workOrderExt.getOrderNo());
// log.info(msg);
// checkErrorLogService.insertCheckErrorLog(checkErrorLog, msg, userInfo);
// return true;
//}
//
//if (!StringUtils.isEmpty(workOrderNo) && workOrderNo.equals(workOrderExt.getOrderNo())) {
//
// DdlPackBean packBean = DdlPackBean.getDdlPackBean(workOrderExt.getOrganizeCode());
// DdlPreparedPack.getNumEqualPack(MesPcnExtEnumUtil.MES_OR_ORDER_TYPE.TORQUE_MANAGE.getValue(), MesPcnExtConstWords.ORDER_TYPE, packBean);
// DdlPreparedPack.getStringEqualPack(workOrderExt.getWorkCenterCode(), MesPcnExtConstWords.WORK_CENTER_CODE, packBean);
// DdlPreparedPack.getStringEqualPack(workCenterExt.getShiftCode(), MesPcnExtConstWords.SHIFT_CODE, packBean);
// DdlPreparedPack.getStringEqualPack(workCenterExt.getWorkTime(), MesPcnExtConstWords.WORK_TIME, packBean);
// DdlPreparedPack.getStringEqualPack(workOrderExt.getOrderNo(), MesPcnExtConstWords.WORK_ORDER_NO, packBean);
// List<MesOrderJob> orderJobList = orderJobRepository.findByHqlWhere(packBean);
//
// if (!CollectionUtils.isEmpty(orderJobList)) {
// msg = String.format("扭矩管理点检生成单据:工单[%s]已经生成过扭矩管理点检单", workOrderExt.getOrderNo());
// log.info(msg);
// checkErrorLogService.insertCheckErrorLog(checkErrorLog, msg, userInfo);
// return true;
// }
//}
//DdlPackBean packBean = DdlPackBean.getDdlPackBean(workOrderExt.getOrganizeCode());
//DdlPreparedPack.getNumEqualPack(MesPcnExtEnumUtil.MES_OR_ORDER_TYPE.TORQUE_MANAGE.getValue(), MesPcnExtConstWords.ORDER_TYPE, packBean);

Write Preview
Loading…
Cancel
Save