From f9e1f958bf1c4feea95fbc6d02222a9d002fe011 Mon Sep 17 00:00:00 2001 From: lsymicc Date: Fri, 22 May 2026 16:07:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=87=A0=E4=B8=AA=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E5=87=BA=E5=BA=93=E6=8E=A8=E9=80=81=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/impl/ApiServiceImpl.java | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java index 7f2bcdf..1041b1d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java @@ -492,17 +492,25 @@ public class ApiServiceImpl implements IApiService { requestLog.setIsSuccessful("1"); requestLogService.insertRequestLog(requestLog); - //检查任务是否存在，避免重复生成 - MydoJob job = new MydoJob(); - job.setWmsTaskNo(stockoutReceive.getTaskCode()); + // -------------------------检查推送的任务参数------------------------- + // 1.wms推送的任务号是否重复 + MydoJob job = new MydoJob().builder().wmsTaskNo(stockoutReceive.getTaskCode()).build(); List tasks = mydoJobService.selectMydoJobList(job); - - //校验：任务已存在 if (tasks.size() != 0) { - log.info("【请求异常】wms下发出库任务失败，该任务已存在，任务号:{}", stockoutReceive.getTaskCode()); - return AjaxResult.error("【请求异常】wms下发出库任务失败，任务号:" + stockoutReceive.getTaskCode()); + log.info("【请求错误】wms下发出库任务失败，该任务已存在，推送任务号:{}，推送出库货位:{}", stockoutReceive.getTaskCode(), stockoutReceive.getSiteCode()); + return AjaxResult.error("【请求错误】wms下发出库任务失败，该任务已存在，推送任务号:{}" + stockoutReceive.getTaskCode() + "，推送出库货位:" + stockoutReceive.getSiteCode()); } + // 2.wms推送的出库货位是否已经有任务 + job = new MydoJob().builder().cargoSpaceId(stockoutReceive.getSiteCode()).build(); + tasks = mydoJobService.selectMydoJobList(job); + if (tasks.size() != 0) { + log.info("【请求错误】wms下发出库任务失败，已经存在该货位的出库任务，推送任务号:{}，推送出库货位:{}", stockoutReceive.getTaskCode(), stockoutReceive.getSiteCode()); + return AjaxResult.error("【请求错误】wms下发出库任务失败，已经存在该货位的出库任务，推送任务号:{}" + stockoutReceive.getTaskCode() + "，推送出库货位:" + stockoutReceive.getSiteCode()); + } + + + //生成出库作业 MydoJob mydoJob = new MydoJob(); mydoJob.setJobId(mydoJobService.getJobId("CK")); @@ -625,12 +633,8 @@ public class ApiServiceImpl implements IApiService { } } - @PostConstruct - void qwe() { -// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); -// queryWrapper.eq(MydoJob::getTaskNo,"6666"); -// MydoJob mydoJob = mydoJobMapper.selectOne(queryWrapper); - +// @PostConstruct + void test() { }