From 563faed107bb148bda0c8861bf4a10cec717f693 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Fri, 25 Jul 2025 08:48:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=88=A0=E9=99=A4=E7=A9=BA?= =?UTF-8?q?=E6=96=99=E7=AE=B1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CheckDifferenceRecordController.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java index 819245e..d4cc694 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java @@ -142,14 +142,9 @@ public class CheckDifferenceRecordController extends BaseController { if (StrUtil.isEmpty(record.getStockId())) { return AjaxResult.error("没有找到该库存ID：" + record.getStockId()); } - if (StrUtil.isEmpty(record.getTrayCode())) { - return AjaxResult.error("没有找到该托盘号：" + record.getTrayCode()); - } BasStock queryStock = new BasStock(); queryStock.setStockId(record.getStockId()); - queryStock.setTrayCode(record.getTrayCode()); - queryStock.setQuantity(record.getOldQuantity()); List stocks = basStockService.selectBasStockList(queryStock); if (stocks.isEmpty()) { @@ -191,11 +186,25 @@ public class CheckDifferenceRecordController extends BaseController { // 最后设置库存ID newStock.setStockId(basJobIdService.getJobId("KC")); basStockService.insertBasStock(newStock); + + //删除KTP库存 + BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(record.getWarehouseId()); + if ("1".equals(basWarehouse.getWarehouseType())||"2".equals(basWarehouse.getWarehouseType())){ + //查询是否存在空料箱库存数 + BasStock queryStock = new BasStock(); + queryStock.setTrayCode(record.getTrayCode()); + queryStock.setProductId("KTP000001"); + List stocks = basStockService.selectBasStockList(queryStock); + if (!stocks.isEmpty()){ + basStockService.deleteBasStockByStockId(stocks.get(0).getStockId()); + } + } + } else if ("3".equals(recordType)) { // 删除数据 // 检查要删除的库存是否存在 BasStock queryStock = new BasStock(); queryStock.setStockId(record.getStockId()); - queryStock.setTrayCode(record.getTrayCode()); + //queryStock.setTrayCode(record.getTrayCode()); List stocks = basStockService.selectBasStockList(queryStock); if (stocks.isEmpty()) { @@ -217,6 +226,7 @@ public class CheckDifferenceRecordController extends BaseController { basStock.setQuantity("1"); basStock.setStockStatus("1"); basStock.setOutQuantity("0"); + basStock.setProductStatus("1"); basStockService.insertBasStock(basStock); } }