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

执行阶段

Browse Source
This commit is contained in:
liuhanqing
2025-09-25 09:14:29 +08:00
parent 10fb300a1e
commit 8382e25d79
5 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java
View File

@@ -157,6 +157,7 @@ public class Floor1BothWayInSsjThread implements Runnable {
if (StrUtil.isNotEmpty(ssj.getTrayCode())) {
MydoJob param = new MydoJob();
param.setStatus("3");
param.setExecutionPhase("0");
if ("L2005".equals(ssj.getDeviceCode())) {
param.setEntranceId("L2013");
}else {

8
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1SingleSsjThread.java
View File

@@ -22,6 +22,8 @@ import lombok.extern.slf4j.Slf4j;
import java.util.*;
import static com.ruoyi.common.TaskStatusCode.TASK_EP_DDJ;
import static com.ruoyi.common.TaskStatusCode.TASK_STATUS_RUNNING;
import static com.ruoyi.common.TaskType.DDJ_RWLX_2;
/**
@@ -170,6 +172,12 @@ public class Floor1SingleSsjThread implements Runnable {
ddjDeviceExecutionQueue.setScsj(DateUtil.formatDateTime(DateUtil.date()));
ddjDeviceExecutionQueue.setRwlx(DDJ_RWLX_2);
ddjDeviceExecutionQueueService.insertDdjDeviceExecutionQueue(ddjDeviceExecutionQueue);
//修改作业状态
mydoJob.setStatus(TASK_STATUS_RUNNING);
mydoJob.setExecutionPhase(TASK_EP_DDJ);
mydoJob.setStartTime(DateUtil.formatDateTime(DateUtil.date()));
mydoJobService.updateMydoJob(mydoJob);
}
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java
View File

@@ -113,7 +113,7 @@ public class LineSsjThread implements Runnable {
paramMap.put("trayCode", SsjDevice.getTrayCode());
paramMap.put("size", SsjDevice.getTraySize());
paramMap.put("floor", "2");
paramMap.put("extranceId", "G1005");
paramMap.put("entranceId", "G1005");
AjaxResult ajaxResult = apiService.createInMydoJob(paramMap);
if (ajaxResult.isSuccess()) {
//拿到正常作业，插到wcs作业表，下发给输送机任务号，覆盖任务号