diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/Ddj1Thread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/Ddj1Thread.java index 53f99bf..aadb5d3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/Ddj1Thread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/Ddj1Thread.java @@ -30,6 +30,7 @@ import java.util.*; import static com.ruoyi.common.Constant.WAREHOUSE_01; import static com.ruoyi.common.TaskStatusCode.*; +import static com.ruoyi.common.TaskType.DDJ_RWLX_2; import static com.ruoyi.common.TaskType.DDJ_RWLX_3; @@ -208,6 +209,7 @@ public class Ddj1Thread implements Runnable { inJob = BeanUtil.toBean(result.get("data"), MydoJob.class); inJob.setStatus(TASK_STATUS_CREATE); inJob.setExecutionPhase(TASK_EP_ROADWAY_SSJ); + inJob.setRoadwayId(Convert.toStr(ddj.getId())); mydoJobService.insertMydoJob(inJob); } else { log.error(result.get("msg").toString()); @@ -250,7 +252,7 @@ public class Ddj1Thread implements Runnable { log.info("任务已存在 rwh{}", inJob.getTaskNo()); } } - } /*else { + } else { Integer mbph = ddj.getMbph(); Integer mblh = ddj.getMblh(); Integer mbch = ddj.getMbch(); @@ -259,9 +261,24 @@ public class Ddj1Thread implements Runnable { DdjDeviceExecutionQueue ddjQueue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByRwh(rwh, ddj.getId()); if (ObjUtil.isNull(ddjQueue)) { DdjDeviceExecutionQueue ddjDeviceExecutionQueue = new DdjDeviceExecutionQueue(); + ddjDeviceExecutionQueue.setUuid(IdUtil.simpleUUID()); + ddjDeviceExecutionQueue.setRwh(rwh); + ddjDeviceExecutionQueue.setDevName(ddj.getName()); + ddjDeviceExecutionQueue.setDevId(ddj.getId()); + ddjDeviceExecutionQueue.setRwzt(0); + ddjDeviceExecutionQueue.setYph(1); + ddjDeviceExecutionQueue.setYlh(1); + ddjDeviceExecutionQueue.setYch(1); + ddjDeviceExecutionQueue.setMbph(mbph); + ddjDeviceExecutionQueue.setMblh(mblh); + ddjDeviceExecutionQueue.setMbch(mbch); + ddjDeviceExecutionQueue.setDdjxf("0"); + ddjDeviceExecutionQueue.setMlfs(5); + ddjDeviceExecutionQueue.setScsj(DateUtil.formatDateTime(DateUtil.date())); + ddjDeviceExecutionQueue.setRwlx(DDJ_RWLX_2); ddjDeviceExecutionQueueService.insertDdjDeviceExecutionQueue(ddjDeviceExecutionQueue); } - }*/ + } } }