update:
上报apms炉号
This commit is contained in:
parent
59f008f19e
commit
592d27b858
@ -491,6 +491,7 @@ public class AsynRunTaskService extends BaseService {
|
||||
webSocketServer.sendtoAll("任务 " + currTask.getTaskCode() + " 车辆从工业炉到缓存区过程中失败。");
|
||||
}
|
||||
}
|
||||
|
||||
//出库。起点为加工炉,终点为提升台
|
||||
@Async("asyncServiceExecutor")
|
||||
public void asynRunOutStockForKilnToYYT(Long currTaskId, String yeyaTaiCode, Long vehicleId) throws IOException {
|
||||
@ -589,6 +590,7 @@ public class AsynRunTaskService extends BaseService {
|
||||
webSocketServer.sendtoAll("出库任务车辆从加工炉到提升平台过程中失败。");
|
||||
}
|
||||
}
|
||||
|
||||
//出库。起点为缓存区库位,终点为提升台
|
||||
@Async("asyncServiceExecutor")
|
||||
public void asynRunOutStock(Long locationId, String yeyaTaiCode, Long vehicleId) throws IOException {
|
||||
@ -1225,6 +1227,7 @@ public class AsynRunTaskService extends BaseService {
|
||||
logger.info(currTask.getId() + "任务为多步骤任务且第一步为清洗,不生成洗炉炉号.");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 上报apms创建生产单并开始处理
|
||||
*
|
||||
@ -1250,7 +1253,10 @@ public class AsynRunTaskService extends BaseService {
|
||||
createItem.setWeight(e.getWeight().doubleValue());
|
||||
createItems.add(createItem);
|
||||
});
|
||||
apmsCreateSheet.setStoveCode(code);
|
||||
//apmsCreateSheet.setStoveCode(code);
|
||||
if (currTask.getStoveCode() != null) {
|
||||
apmsCreateSheet.setStoveCode(currTask.getStoveCode());
|
||||
}
|
||||
apmsCreateSheet.setItems(createItems);
|
||||
logger.info(currTask.getId() + "开始创建apms生产单号");
|
||||
R<ApmsCreateProcessSheetVo> processSheet = apmsController.createProcessSheet(apmsCreateSheet);
|
||||
@ -1281,6 +1287,7 @@ public class AsynRunTaskService extends BaseService {
|
||||
|
||||
/**
|
||||
* 上报apms开始加工
|
||||
*
|
||||
* @param currTask
|
||||
* @return
|
||||
*/
|
||||
@ -1291,7 +1298,10 @@ public class AsynRunTaskService extends BaseService {
|
||||
apmsStartProcess.setStartTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
|
||||
apmsStartProcess.setTechName(currTask.getCraftCodeId().toString());
|
||||
apmsStartProcess.setSheetNo(currTask.getSheetNo());
|
||||
apmsStartProcess.setStoveCode(code);
|
||||
if (currTask.getStoveCode() != null) {
|
||||
apmsStartProcess.setStoveCode(currTask.getStoveCode());
|
||||
}
|
||||
|
||||
R<ApmsStartProcess> apmsStartProcessR = apmsController.startProcess(apmsStartProcess);
|
||||
if (apmsStartProcessR.getCode() != 0) {
|
||||
logger.info("任务号" + currTask.getTaskCode() + "生产单号:" + currTask.getSheetNo() + "生产单开始生产上报apms失败");
|
||||
@ -1303,6 +1313,7 @@ public class AsynRunTaskService extends BaseService {
|
||||
|
||||
/**
|
||||
* 上报apms-end
|
||||
*
|
||||
* @param currTask
|
||||
* @return
|
||||
*/
|
||||
@ -1322,6 +1333,7 @@ public class AsynRunTaskService extends BaseService {
|
||||
|
||||
/**
|
||||
* 上报apms-finish
|
||||
*
|
||||
* @param currTask
|
||||
* @return
|
||||
*/
|
||||
@ -1350,8 +1362,10 @@ public class AsynRunTaskService extends BaseService {
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 车辆是否在线
|
||||
*
|
||||
* @param vehicleId 车辆id
|
||||
* @return true/false
|
||||
* @throws IOException plc访问失败
|
||||
@ -1381,6 +1395,7 @@ public class AsynRunTaskService extends BaseService {
|
||||
|
||||
/**
|
||||
* 传入车辆ID,检查另一辆车是否在线,如果在线,检查是否位置冲突,冲突则避让。若另一辆车不在线,则不检查是否冲突。
|
||||
*
|
||||
* @param vehicleId
|
||||
* @param currTask
|
||||
* @throws IOException
|
||||
@ -1437,6 +1452,7 @@ public class AsynRunTaskService extends BaseService {
|
||||
|
||||
/**
|
||||
* 判断任务是否为单步骤任务,多步骤任务第一步
|
||||
*
|
||||
* @param currTask 任务
|
||||
* @return 单步骤任务true,多步骤任务第一步true,其他false
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user