PDA签收列表过滤已取消车次

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
                 <where>
-                    lddl.is_deleted =0
+                    lddl.is_deleted =0 	AND t.num > 0
                     <if test="array != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(array)">
                         and lddl.id in
                         <foreach collection="array" item="item" open="(" close=")" separator=",">

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<IPage<WarehouseVisualizationVO>> selectStockUpAllocationWrap(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, Query query) {
-
 		IPage<WarehouseVisualizationVO> pages = warehouseGoodsAllocationService.selectStockUpAllocationWrap(warehouseGoodsAllocation, Condition.getPage(query));
 		return R.data(WarehouseVisualizaVOWrapper.build().pageVO(pages));
 	}