diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java index c1c4fc9..d336981 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java @@ -17,7 +17,6 @@ import com.ruoyi.bas.weightRule.domain.BasCargoSpaceWeightRule; import com.ruoyi.bas.weightRule.service.IBasCargoSpaceWeightRuleService; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.job.mydojob.domain.MydoJob; import com.ruoyi.job.mydojob.service.IMydoJobService; import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; @@ -25,7 +24,6 @@ import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService; import com.ruoyi.log.domain.RequestLog; import com.ruoyi.log.service.IRequestLogService; import com.ruoyi.out.outStockout.service.IOutStockoutService; -import com.ruoyi.pda.domain.TrayCodeMsg; import com.ruoyi.pda.mapper.PdaMapper; import com.ruoyi.pda.service.PdaService; import lombok.extern.slf4j.Slf4j; @@ -66,10 +64,9 @@ public class ToWcsServiceImpl implements IToWcsService { @Override - //@Scheduled(fixedDelay=1500) + @Scheduled(fixedDelay = 3000) public void pushOutMydoJob() { //查询所有未推送的料箱出库作业 - MydoJob mydoJobParam = new MydoJob(); List list = new ArrayList<>(); list.add("20"); list.add("21"); @@ -77,41 +74,59 @@ public class ToWcsServiceImpl implements IToWcsService { list.add("23"); list.add("24"); list.add("26"); - mydoJobParam.setInOutIds(list); - MydoJob mydoJobParam1 = new MydoJob(); - mydoJobParam1.setInOutIds(list); for (int i = 1; i <= 6; i++) { - mydoJobParam.setRoadwayId(String.valueOf(i)); - mydoJobParam.setStatus("3"); - List roadwayRunningMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam); - if (CollUtil.isEmpty(roadwayRunningMydoJobs)){ - mydoJobParam1.setStatus("1"); - mydoJobParam1.setRoadwayId(String.valueOf(i)); - List roadwayWaitingMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam1); - if (CollUtil.isNotEmpty(roadwayWaitingMydoJobs)){ - MydoJob outMydoJob = roadwayWaitingMydoJobs.get(0); - if ("01".equals(outMydoJob.getWarehouseId())){ - RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB_1, JSONUtil.toJsonStr(outMydoJob), "推送出库任务"); - if ("1".equals(requestLog.getIsSuccessful())){ - outMydoJob.setStatus("3"); - outMydoJob.setExecutionPhase("1"); - outMydoJob.setStartTime(DateUtil.formatDateTime(new Date())); - mydoJobService.updateMydoJob(outMydoJob); - } - }else if ("02".equals(outMydoJob.getWarehouseId())){ - RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB_2, JSONUtil.toJsonStr(outMydoJob), "推送出库任务"); - if ("1".equals(requestLog.getIsSuccessful())){ - outMydoJob.setStatus("3"); - outMydoJob.setExecutionPhase("1"); - outMydoJob.setStartTime(DateUtil.formatDateTime(new Date())); - mydoJobService.updateMydoJob(outMydoJob); + MydoJob mydoJobParam = new MydoJob(); + MydoJob mydoJobParam1 = new MydoJob(); + mydoJobParam.setInOutIds(list); + mydoJobParam1.setInOutIds(list); + if (i <= 3) { + for (int exitId = 1; exitId <= 2; exitId++) { + mydoJobParam.setRoadwayId(String.valueOf(i)); + mydoJobParam.setStatus("3"); + mydoJobParam.setExitId(exitId + ""); + List roadwayRunningMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam); + if (CollUtil.isEmpty(roadwayRunningMydoJobs)) { + mydoJobParam1.setStatus("1"); + mydoJobParam1.setRoadwayId(String.valueOf(i)); + mydoJobParam1.setExitId(exitId + ""); + List roadwayWaitingMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam1); + if (CollUtil.isNotEmpty(roadwayWaitingMydoJobs)) { + MydoJob outMydoJob = roadwayWaitingMydoJobs.get(0); + if ("01".equals(outMydoJob.getWarehouseId())) { + RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB_1, JSONUtil.toJsonStr(outMydoJob), "推送出库任务"); + if ("1".equals(requestLog.getIsSuccessful())) { + outMydoJob.setStatus("3"); + outMydoJob.setExecutionPhase("1"); + outMydoJob.setStartTime(DateUtil.formatDateTime(new Date())); + mydoJobService.updateMydoJob(outMydoJob); + } + } + } + } + } + } else { + mydoJobParam.setRoadwayId(String.valueOf(i)); + mydoJobParam.setStatus("3"); + List roadwayRunningMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam); + if (CollUtil.isEmpty(roadwayRunningMydoJobs)) { + mydoJobParam1.setStatus("1"); + mydoJobParam1.setRoadwayId(String.valueOf(i)); + List roadwayWaitingMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam1); + if (CollUtil.isNotEmpty(roadwayWaitingMydoJobs)) { + MydoJob outMydoJob = roadwayWaitingMydoJobs.get(0); + if ("02".equals(outMydoJob.getWarehouseId())) { + RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB_2, JSONUtil.toJsonStr(outMydoJob), "推送出库任务"); + if ("1".equals(requestLog.getIsSuccessful())) { + outMydoJob.setStatus("3"); + outMydoJob.setExecutionPhase("1"); + outMydoJob.setStartTime(DateUtil.formatDateTime(new Date())); + mydoJobService.updateMydoJob(outMydoJob); + } } } } - } } - }