From d09b97c6973fe9b7981b9a96260f8c37bc259342 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 10 Jan 2025 08:43:24 +0800 Subject: [PATCH] 01/10 --- .../com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java | 1 + .../biz/warehouseinventory/WarehouseInventoryMapper.xml | 2 +- .../warehouseoutlocation/WarehouseOutLocationService.java | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java index c1320fc..d5c2301 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java @@ -221,6 +221,7 @@ public class WarehouseInventoryRest { availableCountVo.setInitialCount(warehouseOutLocation.getCount()); availableCountVo.setCount(warehouseOutLocation.getCount()); availableCountVo.setLocationSid(warehouseOutLocation.getSid()); + availableCountVo.setUseCount(availableCountVo.getUseCount().add(warehouseOutLocation.getCount())); } availableCountVo.setGoodsSkuSid(skuSid); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml index 8e1fe00..ee3cdaa 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml @@ -453,7 +453,7 @@ b.rackName, b.sid as rackSid, b.rackCode, - a.count AS useCount, + (a.count - a.allocateCount )AS useCount, a.goodsSpuName, a.goodsSkuTitle, a.goodsSkuOwnSpec diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseoutlocation/WarehouseOutLocationService.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutlocation/WarehouseOutLocationService.java index a4b88eb..f3b65a0 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseoutlocation/WarehouseOutLocationService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutlocation/WarehouseOutLocationService.java @@ -107,7 +107,11 @@ public class WarehouseOutLocationService extends MybatisBaseService> details(String sid) { ResultBean> rb = ResultBean.fireFail(); List warehouseOutLocationVo = baseMapper.details(sid);