diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index 8b848b7f0..5ff2508e2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -423,8 +423,8 @@ public class DistributionDeliveryListController extends BladeController { @GetMapping("/judgmentOrderRemove") @ApiOperationSupport(order = 2) @ApiOperation(value = "判断是否可以在商配计划中移除", notes = "customArgs") - public R judgmentOrderRemove(@RequestParam Long deliveryId,@RequestParam Long orderId) { - boolean result = distributionDeliveryListService.judgmentOrderRemove(deliveryId,orderId); + public R judgmentOrderRemove(@RequestParam Long deliveryId,@RequestParam String orderIds) { + boolean result = distributionDeliveryListService.judgmentOrderRemove(deliveryId,orderIds); return R.data(result); } 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 8eb6112b0..9084228b8 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 @@ -733,6 +733,7 @@ logpm_distribution_signfor lds JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id WHERE lds.is_deleted = 0 AND lds.delivery_id = #{id} + GROUP BY lds.reservation_id