From 3631e0c56b5308624eb2f67ffab17353cd1ef351 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 17 Apr 2024 10:43:39 +0800 Subject: [PATCH] =?UTF-8?q?PDA=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=B7=B2=E5=8F=96=E6=B6=88=E8=BD=A6=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionSignforMapper.xml | 5 +++-- .../controller/WarehouseGoodsAllocationController.java | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 6990f8df1..7e7d54eb4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -754,7 +754,7 @@ lddl.kind kind, lddl.vehicle_name vehicleName, lddl.driver_name driverName, - (SELECT COALESCE (sum(ldr.reservation_num),0) + (SELECT COALESCE (sum(ldr.reservation_num + ldr.reservation_stock_list_num),0) FROM logpm_distribution_signfor lds join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id @@ -793,8 +793,9 @@ logpm_distribution_delivery_list lddl left join logpm_distribution_delivery_self ldds on lddl.id =ldds.delivery_id left join logpm_distribution_signfor ldsf on ldsf.delivery_id = lddl.id + LEFT JOIN (SELECT count(ldr.id) AS num,lds.delivery_id FROM logpm_distribution_signfor AS lds LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id WHERE lds.is_deleted = 0 AND ldr.is_deleted = 0 GROUP BY lds.delivery_id) AS t ON t.delivery_id = lddl.id - lddl.is_deleted =0 + lddl.is_deleted =0 AND t.num > 0 and lddl.id in diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java index bc864d793..a02c617e7 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java @@ -497,7 +497,6 @@ public class WarehouseGoodsAllocationController extends BladeController { @ApiOperationSupport(order = 20) @ApiOperation(value = "货位 查询包件", notes = "传入warehouseGoodsAllocation") public R> selectStockUpAllocationWrap(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, Query query) { - IPage pages = warehouseGoodsAllocationService.selectStockUpAllocationWrap(warehouseGoodsAllocation, Condition.getPage(query)); return R.data(WarehouseVisualizaVOWrapper.build().pageVO(pages)); }