lsy/FT577-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

现场运行调整

Browse Source
This commit is contained in:
FT577
2026-09-21 11:01:26 +08:00
parent 2f862358ad
commit 45be4cb428
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
View File

@@ -94,7 +94,7 @@ public class ApiServiceImpl implements IApiService {
MydoJob mydoJob = mydoJobService.selectMydoJobByJobId(wmsMydoJob.getJobId());
mydoJob.setCargoSpaceId(wmsMydoJob.getCargoSpaceId());
mydoJobService.updateMydoJob(mydoJob);
return AjaxResult.success();
return AjaxResult.success(jobParam);
}
return AjaxResult.error();
}
@@ -109,7 +109,7 @@ public class ApiServiceImpl implements IApiService {
public AjaxResult reMaterial(JobParam jobParam) {
RequestLog requestLog = requestLogService.getRequestLog(WMS_RE_MATERIAL_URL, "重新分配物料", JSONUtil.toJsonStr(jobParam));
if ("1".equals(requestLog.getIsSuccessful())){
return AjaxResult.success();
return AjaxResult.success(jobParam);
}
return AjaxResult.error();
}

20
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/TaskHandler.java
View File

@@ -183,7 +183,8 @@ public class TaskHandler {
AjaxResult ajaxResult = apiService.reMaterial(param);
if (ajaxResult.isSuccess()){
mydoJobService.InvalidMydoJob(Long.valueOf(job.getTaskNo()), Integer.valueOf(job.getRoadwayId()));
// mydoJobService.InvalidMydoJob(Long.valueOf(job.getTaskNo()), Integer.valueOf(job.getRoadwayId()));
mydoJobService.cancelTask(job.getJobId());
//清空/重置【取货无货】的出库异常货位库存信息
basCargoSpaceService.resetCargoSpaceByStockoutException(job.getCargoSpaceId());
@@ -229,22 +230,27 @@ public class TaskHandler {
AjaxResult ajaxResult = apiService.reAssign(param);
if (ajaxResult.isSuccess()){
//获取返回的任务号和新分配的货位
TaskExceptionReceive mydoJobReAssign = BeanUtil.toBean(ajaxResult.get("data"), TaskExceptionReceive.class);
JobParam jobParam = BeanUtil.toBean(ajaxResult.get("data"), JobParam.class);
if (ObjUtil.isNull(jobParam)){
log.warn("【响应异常】入库重分请求异常，无响应数据，任务号:{}", jobParam.getTaskNo());
return;
}
MydoJob wmsJob = new MydoJob();
wmsJob.setWmsTaskNo(mydoJobReAssign.getTaskCode());
if (mydoJobService.selectMydoJobList(wmsJob).size() == 0) {
log.warn("【响应异常】该任务不存在，任务号:{}", mydoJobReAssign.getTaskCode());
wmsJob.setTaskNo(jobParam.getTaskNo());
if (ObjUtil.isNull(wmsJob)) {
log.warn("【响应异常】该任务不存在，任务号:{}", jobParam.getTaskNo());
return;
}
//更新任务参数
job = mydoJobService.selectMydoJobByTaskNo(Long.valueOf(job.getTaskNo()));
job.setCargoSpaceId(mydoJobReAssign.getSiteCode());
job.setCargoSpaceId(jobParam.getCargoSpaceId());
job.setExecutionPhase(TASK_EXCEPTION_PUT_REASSIGN);
job.setFaultFlag("2");
mydoJobService.updateMydoJob(job);
log.info("【入库异常】请求wms重分货位成功，异常货位:{}，新货位:{}，任务号:{}", oldCargo, mydoJobReAssign.getSiteCode(), job.getTaskNo());
log.info("【入库异常】请求wms重分货位成功，异常货位:{}，新货位:{}，任务号:{}", oldCargo, jobParam.getCargoSpaceId(), job.getTaskNo());
}else{
log.info("【入库异常】请求wms重分货位异常，异常上报请求失败，请咨询操作管理员，异常货位:{}，当前任务号:{}", oldCargo, job.getTaskNo());
}

4
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread_2.java
View File

@@ -157,9 +157,9 @@ public class DdjThread_2 implements Runnable {
MydoJob mydoJob = mydoJobService.selectMydoJobByTaskNo(rwh);
if (mydoJob != null && mydoJob.getExecutionPhase() != TASK_EXCEPTION_PUT) {
DdjDeviceExecutionQueue ddjDeviceExecutionQueue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByRwh(rwh, ddj.getId());
// DdjDeviceExecutionQueue ddjDeviceExecutionQueue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByRwh(rwh, ddj.getId());
//更新异常类型【FaultFlag】-1
if ("0".equals(mydoJob.getFaultFlag()) && "1".equals(ddjDeviceExecutionQueue.getSpare1())) {
if ("0".equals(mydoJob.getFaultFlag())) {
mydoJob.setStatus("1");
//把执行阶段标记为【入库放货有货】的异常
mydoJob.setExecutionPhase(TASK_EXCEPTION_PUT);