From b9469d414ac5ff53e951d33480f2e242fceb550a Mon Sep 17 00:00:00 2001 From: FT577-Server Date: Thu, 15 Oct 2026 09:38:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=95=B4=E6=89=98=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E8=87=AA=E5=8A=A8=E7=A9=BA=E6=89=98=E5=9B=9E?= =?UTF-8?q?=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/service/impl/PdaServiceImpl.java | 48 +++++++++++-------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java index 745b25e..c08dd02 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java @@ -759,9 +759,10 @@ public class PdaServiceImpl implements IPdaService { String taskNo; int taskType; if (stocks.isEmpty()){ - jobId = basJobIdService.getId(JobIdType.MYDOJOB_STOCKIN_EMPTY_PALLET); - taskNo = basTaskNoService.getTaskNo(TaskIdType.TASK_STOCKIN_EMPTY_PALLET); - taskType = TaskType.TASKTYPE_STOCKIN_EMPTY_TRAY; +// jobId = basJobIdService.getId(JobIdType.MYDOJOB_STOCKIN_EMPTY_PALLET); +// taskNo = basTaskNoService.getTaskNo(TaskIdType.TASK_STOCKIN_EMPTY_PALLET); +// taskType = TaskType.TASKTYPE_STOCKIN_EMPTY_TRAY; + return AjaxResult.success("【整托出库】确认成功，回流数量:0"); }else{ jobId = basJobIdService.getId(JobIdType.MYDOJOB_PICK_RETURN); taskNo = basTaskNoService.getTaskNo(TaskIdType.TASK_STOCKIN_BACK); @@ -785,10 +786,15 @@ public class PdaServiceImpl implements IPdaService { } if (cargoParam == null) { - log.warn("【货位分配】该类型托盘立库中无可用货位"); + log.warn("【回流入库-货位分配】该类型托盘立库中无可用货位"); return AjaxResult.error("【货位分配失败】该类型托盘立库中无可用货位"); } + if (basCargoSpaceService.selectBasCargoSpaceIsFull(cargoParam, 10)){ + log.warn("【回流入库-货位分配】该类型托盘立库中无可用货位,预留空位:{}", 10); + return AjaxResult.error("【货位分配失败】该类型托盘立库中无可分配货位"); + } + BasCargoSpace cargoStockin = basCargoSpaceService.selectBasCargoSpaceForStockin(cargoParam); //>>>生成wms的入库主作业 @@ -808,15 +814,15 @@ public class PdaServiceImpl implements IPdaService { .trayType(type) .build(); - mydoJobService.insertMydoJob(mydoJobBack); + mydoJobService.insertMydoJob(mydoJobBack);//tip:此处不生成子作业，任务完成后直接使用库存中的版辊更新状态 log.info("【wms出库回流】<回流入库>作业，作业号:{}，任务号:{}，托盘号:{}，分配货位:{}",mydoJobBack.getJobId() ,mydoJobBack.getTaskNo() ,mydoJobBack.getTrayCode(), cargoStockin.getCargoSpaceId()); - return AjaxResult.success("确认成功"); + return AjaxResult.success("【拣选出库】确认成功，回流数量:"); }else{ log.info("【提示】<常规入库>wms已存在该条码作业，请确认该条码的任务状态后重试，托盘号:{}",mydoJob.getTrayCode()); } - return AjaxResult.success("确认失败"); + return AjaxResult.error("确认失败"); } @@ -1002,20 +1008,20 @@ public class PdaServiceImpl implements IPdaService { int trayType = mydoJobService.getTrayTypeByTrayCode(trayCode); //空托盘回流 if (stocks.isEmpty()){ - inTrayMsgService.insertInTrayMsg( - new InTrayMsg().builder() - .trayCode(trayCode) - .quantity(BigDecimal.ONE) - .productId(ProductType.EMPTY_TRAY) - .warehouseId("01") - .rollerNumber(ProductType.EMPTY_TRAY) - .trayType(trayType) - .status(1) - .createTime(DateUtil.date()) - .build() - ); - - log.info("【空托回流绑定】<回流入库>生成绑定信息成功,托盘号:{}", trayCode); +// inTrayMsgService.insertInTrayMsg( +// new InTrayMsg().builder() +// .trayCode(trayCode) +// .quantity(BigDecimal.ONE) +// .productId(ProductType.EMPTY_TRAY) +// .warehouseId("01") +// .rollerNumber(ProductType.EMPTY_TRAY) +// .trayType(trayType) +// .status(1) +// .createTime(DateUtil.date()) +// .build() +// ); +// +// log.info("【空托回流绑定】<回流入库>生成绑定信息成功,托盘号:{}", trayCode); }else{ for (BasStock stock : stocks){