lhq/FT541-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

出库任务推送逻辑修改

Browse Source
This commit is contained in:
liuhanqing
2026-01-27 13:33:26 +08:00
parent 7393f62e0b
commit 772915a6c2
1 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
View File

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