From a99c1f36e52c75e0020127c62d39c1eddae4a036 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 28 七月 2025 17:07:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
index c0c3aff..b37f462 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
@@ -28,7 +28,7 @@
@RestController
@Api(value="鍙戣揣controller",tags={"鍙戣揣鎿嶄綔鎺ュ彛"})
-@RequestMapping("/Delivery")
+@RequestMapping("/delivery")
public class DeliveryController {
@Autowired
DeliveryService deliveryService;
@@ -104,15 +104,15 @@
@ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
@SaCheckPermission("selectDelivery.search")
@PostMapping("/getSelectDeliveryPrinting")
- public Result getSelectDeliveryPrinting( @RequestBody DeliveryDetail deliveryDetail) throws IllegalAccessException {
- return Result.seccess(deliveryService.getSelectDeliveryPrinting(deliveryDetail));
+ public Result getSelectDeliveryPrinting( @RequestBody Map<String,Object> object) throws IllegalAccessException {
+ return Result.seccess(deliveryService.getSelectDeliveryPrinting(object));
}
@ApiOperation("璁㈠崟鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
@SaCheckPermission("selectDelivery.search")
- @PostMapping("/getSelectOrderPrinting")
- public Result getSelectOrderPrinting( @RequestBody OrderDetail orderDetail){
- return Result.seccess(deliveryService.getSelectOrderPrinting(orderDetail));
+ @PostMapping("/getSelectOrderPrinting/{selectedValues}")
+ public Result getSelectOrderPrinting(@PathVariable List<String> selectedValues, @RequestBody OrderDetail orderDetail){
+ return Result.seccess(deliveryService.getSelectOrderPrinting(orderDetail,selectedValues));
}
@ApiOperation("鍙戣揣鏄庣粏鎶ヨ〃")
--
Gitblit v1.8.0