From c10fb6af1cfd32564af2e9b1fcfa6456bc978265 Mon Sep 17 00:00:00 2001 From: lsymicc Date: Wed, 10 Jun 2026 14:31:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=87=BA=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/api/service/impl/ApiServiceImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 74e9127..7dd46db 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 @@ -28,6 +28,7 @@ import com.ruoyi.bas.cargospace.service.IBasCargoSpaceService; import com.ruoyi.bas.port.domain.WcsPort; import com.ruoyi.bas.port.service.IWcsPortService; import com.ruoyi.common.GoodsType; +import com.ruoyi.common.TaskType; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.job.domain.MydoJob; @@ -47,6 +48,7 @@ import java.util.Map; import static com.ruoyi.common.Constant.*; import static com.ruoyi.common.ConvType.CONV_STOCKOUT; +import static com.ruoyi.common.TaskType.STOCKIN; import static com.ruoyi.common.TaskStatusCode.TASK_EP_CREATED; /** @@ -540,6 +542,14 @@ public class ApiServiceImpl implements IApiService { return AjaxResult.error("【请求错误】wms下发出库任务失败，已经存在该货位的出库任务，推送任务号:{}" + stockoutReceive.getTaskCode() + "，推送出库货位:" + stockoutReceive.getSiteCode()); } + // 3.是否已经有正在执行的入库任务 + job = new MydoJob().builder().inOrOut(STOCKIN).build(); + tasks = mydoJobService.selectMydoJobList(job); + if (tasks.size() != 0) { + log.info("【警告】wms下发出库任务失败，已经存在正在执行的入库任务，请稍后重试"); + return AjaxResult.error("【警告】wms下发出库任务失败，已经存在正在执行的入库任务，请稍后重试"); + } + //生成出库作业 MydoJob mydoJob = new MydoJob(); mydoJob.setJobId(mydoJobService.getJobId("CK"));