From 8565eb60fde412c4b1e0ee362573e4bf1db3b1fb Mon Sep 17 00:00:00 2001 From: Lenovo Date: Mon, 21 Sep 2026 11:01:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E8=BF=90=E8=A1=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/WcsServiceController.java | 2 +- .../api/domain/wcsJobHandle/WmsJobHandler.java | 2 +- .../ruoyi/api/service/impl/ApiWcsService.java | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/WcsServiceController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/WcsServiceController.java index 3e79f13..af2d947 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/WcsServiceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/WcsServiceController.java @@ -85,7 +85,7 @@ public class WcsServiceController extends BaseController { @PostMapping("/reAssign") public AjaxResult reAssign(@RequestBody WmsJobHandler wmsJobHandler) { AjaxResult ajaxResult = apiWcsService.reAssign(wmsJobHandler); - RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobHandler), "入库重分货位",ajaxResult); + RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobHandler), "入库重分货位", ajaxResult); requestLogService.insertRequestLog(requestLog); return ajaxResult; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcsJobHandle/WmsJobHandler.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcsJobHandle/WmsJobHandler.java index 5dfce76..68f61b7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcsJobHandle/WmsJobHandler.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcsJobHandle/WmsJobHandler.java @@ -23,7 +23,7 @@ public class WmsJobHandler { String cargoSpaceId; /** 任务类型 */ - int wmsType; + Integer wmsType; /** 备注 */ String remark; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java index 8c27940..3e6607f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java @@ -678,7 +678,7 @@ public class ApiWcsService implements IApiWcsService { BasCargoSpace cargoSpaceNew = basCargoSpaceService.selectBasCargoSpaceForStockin( new BasCargoSpace().builder().roadwayId(mydoJob.getRoadwayId()).cargoAreaId(basCargoSpaceParam.getCargoAreaId()).theType(mydoJob.getTrayType()).build() ); - if (ObjUtil.isNotNull(cargoSpaceNew)) { + if (ObjUtil.isNull(cargoSpaceNew)) { log.info("【入库重分】重分失败，该区域没有可用的空货位，货区:{}，托盘类型:{}", basCargoSpaceParam.getCargoAreaId(), mydoJob.getTrayType()); return AjaxResult.error("该区域没有可用的空货位"); } else { @@ -691,14 +691,14 @@ public class ApiWcsService implements IApiWcsService { cargoSpaceNew.setStatus(CargoSpaceCode.CARGOSPACE_STATUS_PRE_STOCKIN); basCargoSpaceService.updateBasCargoSpace(cargoSpaceNew); - return AjaxResult.success( - new WmsJobHandler().builder() - .cargoSpaceId(cargoSpaceNew.getCargoSpaceId()) - .trayCode(mydoJob.getTrayCode()) - .jobId(wmsJobHandler.getJobId()) - .reqCode(wmsJobHandler.getReqCode()) - .build() - ); + WmsJobHandler jobReturn = new WmsJobHandler().builder() + .cargoSpaceId(cargoSpaceNew.getCargoSpaceId()) + .trayCode(mydoJob.getTrayCode()) + .jobId(wmsJobHandler.getJobId()) + .reqCode(wmsJobHandler.getReqCode()) + .build(); + + return AjaxResult.success(jobReturn); } }