From 5c6361217f63d1d6abcf2f9e78c43be3ebf3c891 Mon Sep 17 00:00:00 2001 From: lsymicc Date: Tue, 2 Jun 2026 10:29:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=B4=A7=E4=BD=8D=E5=8F=82?= =?UTF-8?q?=E6=95=B0=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 | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) 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 2a4185b..979b16b 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 @@ -23,6 +23,7 @@ import com.ruoyi.api.domain.wcs2wms.exception.TaskExceptionReceive; import com.ruoyi.api.domain.wcs2wms.exception.TaskExceptionRequest; import com.ruoyi.api.domain.wcs2wms.stockout.StockoutReceive; import com.ruoyi.api.service.IApiService; +import com.ruoyi.bas.cargospace.domain.BasCargoSpace; import com.ruoyi.bas.cargospace.service.IBasCargoSpaceService; import com.ruoyi.bas.port.domain.WcsPort; import com.ruoyi.bas.port.service.IWcsPortService; @@ -497,10 +498,30 @@ public class ApiServiceImpl implements IApiService { "【wms推送出库】请求码:{}，wms任务号:{}，推送出库货位:{}，推送类型:{}",stockoutReceive.getReqCode(), stockoutReceive.getTaskCode(), stockoutReceive.getSiteCode(), stockoutReceive.getTaskTypeCode() ); - // 0.检查货位参数空 + BasCargoSpace cargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(stockoutReceive.getSiteCode()); + + // 0.检查货位参数是否合法 if(stockoutReceive.getSiteCode() == null || stockoutReceive.getSiteCode() == ""){ log.info("【请求错误】wms推送出库任务失败，参数错误，推送任务号:{}，推送出库货位:{}", stockoutReceive.getTaskCode(), stockoutReceive.getSiteCode()); return AjaxResult.error("【请求错误】wms推送出库任务失败，参数错误，推送任务号:{}" + stockoutReceive.getTaskCode() + "，推送出库货位:" + stockoutReceive.getSiteCode()); + }else{ + //排号检查 + if (cargoSpace.getThePlatoon() > 2 || cargoSpace.getThePlatoon() < 0){ + log.info("【请求错误】wms推送出库任务失败，参数错误，推送任务号:{}，推送排:{}", stockoutReceive.getTaskCode(), cargoSpace.getThePlatoon()); + return AjaxResult.error("【请求错误】wms推送出库任务失败，错误，推送任务号:" + stockoutReceive.getTaskCode() + "，推送出库排号:" + cargoSpace.getThePlatoon() + "，仓库中不存在该位置！"); + } + + //列号检查 + if (cargoSpace.getTheColumn() > 33 || cargoSpace.getTheColumn() < 0){ + log.info("【请求错误】wms推送出库任务失败，参数错误，推送任务号:{}，推送列:{}", stockoutReceive.getTaskCode(), cargoSpace.getTheColumn()); + return AjaxResult.error("【请求错误】wms推送出库任务失败，错误，推送任务号:" + stockoutReceive.getTaskCode() + "，推送出库列号:" + cargoSpace.getTheColumn() + "，仓库中不存在该位置！"); + } + + //层号检查 + if (cargoSpace.getTheFloor() > 6 || cargoSpace.getTheFloor() < 0){ + log.info("【请求错误】wms推送出库任务失败，参数错误，推送任务号:{}，推送层:{}", stockoutReceive.getTaskCode(), cargoSpace.getThePlatoon()); + return AjaxResult.error("【请求错误】wms推送出库任务失败，错误，推送任务号:" + stockoutReceive.getTaskCode() + "，推送出库层号:" + cargoSpace.getThePlatoon() + "，仓库中不存在该位置！"); + } } // 1.wms推送的任务号是否重复