diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 6737211..c52287c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.context.annotation.ComponentScan; +import org.springframework.scheduling.annotation.EnableScheduling; /** * 启动程序 @@ -11,6 +12,7 @@ import org.springframework.context.annotation.ComponentScan; * @author ruoyi */ @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) +@EnableScheduling public class RuoYiApplication { public static void main(String[] args) 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 e12aff1..0901389 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 @@ -1,6 +1,7 @@ package com.ruoyi.api.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.json.JSONUtil; import com.ruoyi.api.domain.AgvMoveParam; @@ -14,6 +15,7 @@ import com.ruoyi.job.mydojob.service.IMydoJobService; import com.ruoyi.log.domain.RequestLog; import com.ruoyi.log.service.IRequestLogService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import java.util.*; @@ -38,6 +40,7 @@ public class ToWcsServiceImpl implements IToWcsService { @Override + @Scheduled(fixedDelay=1500) public void pushOutMydoJob() { //查询所有未推送的料箱出库作业 MydoJob mydoJobParam = new MydoJob(); @@ -49,8 +52,9 @@ public class ToWcsServiceImpl implements IToWcsService { for (MydoJob outMydoJob : outMydoJobs) { RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB, JSONUtil.toJsonStr(outMydoJob), "推送出库任务"); if ("1".equals(requestLog.getIsSuccessful())){ - outMydoJob.setStatus("2"); - //outMydoJob.setStartTime(DateUtil.formatDateTime(DateUtil.date())); + outMydoJob.setStatus("3"); + outMydoJob.setExecutionPhase("1"); + outMydoJob.setStartTime(DateUtil.formatDateTime(new Date())); mydoJobService.updateMydoJob(outMydoJob); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java index 310ce9b..fffa424 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java @@ -192,6 +192,7 @@ public class ToWmsServiceImpl implements IToWmsService { mydoJob.setTrayCode(basJobIdService.getJobId("TP")); mydoJob.setWarehouseId("01"); mydoJob.setRoadwayId(getRoadway(size)); + mydoJob.setLineId(erpBill); BasRoadway basRoadway = basRoadwayService.selectBasRoadwayById(mydoJob.getRoadwayId()); if ("1".equals(requestEnter.getFloor())) { if ("Y".equals(basRoadway.getInLocked())) { @@ -353,18 +354,15 @@ public class ToWmsServiceImpl implements IToWmsService { mydoJobService.manualCompleted(inMydoJob, 1); break; case "2": - if (StrUtil.isEmpty(wmsJobRequest.getPickSsj())) { - return AjaxResult.error(MessageUtils.message("error.message3")); - } + if (StrUtil.isEmpty(wmsJobRequest.getTaskNo())) { - return AjaxResult.error(MessageUtils.message("error.message2")); + return AjaxResult.error("任务号不能为空"); } //出库 mydoJobParam.setTaskNo(wmsJobRequest.getTaskNo()); - //mydoJobParam.setTrayCode(wmsJobRequest.getTrayCode()); List outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam); if (outMydoJobs.isEmpty()) { - return AjaxResult.error(MessageUtils.message("warn.message")); + return AjaxResult.error("任务不存在"); } MydoJob outJob = outMydoJobs.get(0); outJob.setExecutionPhase("2");