|
|
@@ -390,6 +390,13 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService |
|
|
|
if (!status.equals(currTask.getStatus())) { |
|
|
|
//修改为加工中,多步骤任务修改为加工中,查询缓存区,查询前置任务状态,并修改 |
|
|
|
if (status == 1) { |
|
|
|
currTask.setStatus(1); |
|
|
|
currTask.setIsIn(1); |
|
|
|
currTask.setUpdaterId(99); |
|
|
|
currTask.setUpdateTime(LocalDateTime.now()); |
|
|
|
currTask.setBeginTime(LocalDateTime.now()); |
|
|
|
//生产炉号 |
|
|
|
createStoveCode(currTask); |
|
|
|
InStockInfo inStockInfo = inStockInfoServiceBiz.getOne(new QueryWrapper<InStockInfo>().eq(InStockInfo.TASK_ID, currTask.getId())); |
|
|
|
if (inStockInfo != null) { |
|
|
|
//更新库位状态为未占用 |
|
|
@@ -420,6 +427,8 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService |
|
|
|
currTask1.setUpdaterId(99); |
|
|
|
currTask1.setUpdateTime(LocalDateTime.now()); |
|
|
|
currTaskServiceBiz.updateById(currTask1); |
|
|
|
apmsEndProcess(currTask1); |
|
|
|
apmsStartProcess(currTask); |
|
|
|
} else if (currTask.getId().equals(autoExeTask.getThTaskId())) { |
|
|
|
//该任务为自动任务第三条,修改自动任务第二条的状态 |
|
|
|
CurrTask currTask2 = currTaskServiceBiz.getById(autoExeTask.getFTaskId()); |
|
|
@@ -429,15 +438,11 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService |
|
|
|
currTask2.setUpdaterId(99); |
|
|
|
currTask2.setUpdateTime(LocalDateTime.now()); |
|
|
|
currTaskServiceBiz.updateById(currTask2); |
|
|
|
apmsEndProcess(currTask2); |
|
|
|
apmsStartProcess(currTask); |
|
|
|
} |
|
|
|
} |
|
|
|
currTask.setStatus(1); |
|
|
|
currTask.setIsIn(1); |
|
|
|
currTask.setUpdaterId(99); |
|
|
|
currTask.setUpdateTime(LocalDateTime.now()); |
|
|
|
currTask.setBeginTime(LocalDateTime.now()); |
|
|
|
//生产炉号 |
|
|
|
createStoveCode(currTask); |
|
|
|
|
|
|
|
currTaskServiceBiz.updateById(currTask); |
|
|
|
logger.info("修改任务" + currTask.getId() + "状态为加工中成功"); |
|
|
|
} |
|
|
@@ -781,6 +786,51 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService |
|
|
|
return true; |
|
|
|
} |
|
|
|
} |
|
|
|
/** |
|
|
|
* 上报apms开始加工 |
|
|
|
* |
|
|
|
* @param currTask |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private Boolean apmsStartProcess(CurrTask currTask) { |
|
|
|
String code = kilnInfoServiceBiz.getById(currTask.getKilnId()).getCode(); |
|
|
|
ApmsStartProcess apmsStartProcess = new ApmsStartProcess(); |
|
|
|
apmsStartProcess.setStartUser("QJJP03"); |
|
|
|
apmsStartProcess.setStartTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); |
|
|
|
apmsStartProcess.setTechName(currTask.getCraftCodeId().toString()); |
|
|
|
apmsStartProcess.setSheetNo(currTask.getSheetNo()); |
|
|
|
if (currTask.getStoveCode() != null) { |
|
|
|
apmsStartProcess.setStoveCode(currTask.getStoveCode()); |
|
|
|
} |
|
|
|
|
|
|
|
R<ApmsStartProcess> apmsStartProcessR = apmsControl.startProcess(apmsStartProcess); |
|
|
|
if (apmsStartProcessR.getCode() != 0) { |
|
|
|
logger.info("任务号" + currTask.getTaskCode() + "生产单号:" + currTask.getSheetNo() + "生产单开始生产上报apms失败"); |
|
|
|
return false; |
|
|
|
} |
|
|
|
logger.info("任务号" + currTask.getTaskCode() + "生产单号:" + currTask.getSheetNo() + "生产单开始生产上报apms成功"); |
|
|
|
return true; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 上报apms-end |
|
|
|
* |
|
|
|
* @param currTask |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private Boolean apmsEndProcess(CurrTask currTask) { |
|
|
|
ApmsEndProcess apmsEndProcess = new ApmsEndProcess(); |
|
|
|
apmsEndProcess.setEndTime(currTask.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); |
|
|
|
apmsEndProcess.setEndUser("QJJP03"); |
|
|
|
apmsEndProcess.setSheetNo(currTask.getSheetNo()); |
|
|
|
R<ApmsEndProcessVo> apmsEndProcessVoR = apmsControl.endProcess(apmsEndProcess); |
|
|
|
if (apmsEndProcessVoR.getCode() != 0) { |
|
|
|
logger.info("任务号" + currTask.getTaskCode() + "生产单号:" + currTask.getSheetNo() + "生产单完成处理上报apms失败"); |
|
|
|
return false; |
|
|
|
} |
|
|
|
logger.info("任务号" + currTask.getTaskCode() + "生产单号:" + currTask.getSheetNo() + "生产单完成处理上报apms成功"); |
|
|
|
return true; |
|
|
|
} |
|
|
|
/** |
|
|
|
* 生成炉号 |
|
|
|
* 多步骤任务除了第一步为清洗炉外,每步都生成炉号 |
|
|
|