From ceb1dea2b24d5c3216816f42fd0e514613656416 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 08 十二月 2025 16:11:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 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 1f99810..63f3dd4 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
@@ -15,6 +15,7 @@
import com.example.erp.exception.ServiceException;
import com.example.erp.service.sd.DeliveryService;
import com.example.erp.tools.DownExcel;
+import com.fasterxml.jackson.core.JsonProcessingException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +29,7 @@
@RestController
@Api(value="鍙戣揣controller",tags={"鍙戣揣鎿嶄綔鎺ュ彛"})
-@RequestMapping("/Delivery")
+@RequestMapping("/delivery")
public class DeliveryController {
@Autowired
DeliveryService deliveryService;
@@ -38,8 +39,8 @@
@ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
@SaCheckPermission("selectDelivery.search")
@PostMapping("/getSelectShippingOrder/{pageNum}/{pageSize}/{selectDate}")
- public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Delivery delivery){
- return Result.seccess(deliveryService.getSelectShippingOrder(pageNum,pageSize,selectDate,delivery));
+ public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Map<String,Object> config) throws JsonProcessingException {
+ return Result.success(deliveryService.getSelectShippingOrder(pageNum,pageSize,selectDate,config));
}
/*鍙戣揣鎶ヨ〃鏌ヨ*/
@@ -47,7 +48,7 @@
@SaCheckPermission("deliveryReport.search")
@PostMapping("/getSelectDeliveryDetailReport/{pageNum}/{pageSize}/{selectDate}")
public Result getSelectDeliveryDetailReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody DeliveryDetail deliveryDetail){
- return Result.seccess(deliveryService.getSelectDeliveryDetailReport(pageNum,pageSize,selectDate,deliveryDetail));
+ return Result.success(deliveryService.getSelectDeliveryDetailReport(pageNum,pageSize,selectDate,deliveryDetail));
}
/*鍙戣揣鎶ヨ〃鏌ヨ*/
@@ -55,7 +56,7 @@
@SaCheckPermission("deliveryReport.search")
@PostMapping("/getSelectDeliveryDetailProductReport/{pageNum}/{pageSize}/{selectDate}")
public Result getSelectDeliveryDetailProductReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody DeliveryDetail deliveryDetail){
- return Result.seccess(deliveryService.getSelectDeliveryDetailProductReport(pageNum,pageSize,selectDate,deliveryDetail));
+ return Result.success(deliveryService.getSelectDeliveryDetailProductReport(pageNum,pageSize,selectDate,deliveryDetail));
}
/*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
@@ -63,7 +64,7 @@
@SaCheckPermission("createDelivery.search")
@PostMapping("/getSelectShippingOrderDetail/{pageNum}/{pageSize}")
public Result getSelectShippingOrderDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
- return Result.seccess(deliveryService.getSelectShippingOrderDetail(pageNum,pageSize,orderDetail));
+ return Result.success(deliveryService.getSelectShippingOrderDetail(pageNum,pageSize,orderDetail));
}
/*搴撳瓨鍙彂璐ц鍗曟煡璇�*/
@@ -71,7 +72,7 @@
@SaCheckPermission("selectOrderList.search")
@PostMapping("/getSelectOrderInventory/{pageNum}/{pageSize}/{selectDate}")
public Result getSelectOrderInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Order order){
- return Result.seccess(deliveryService.getSelectOrderInventory(pageNum,pageSize,selectDate,order));
+ return Result.success(deliveryService.getSelectOrderInventory(pageNum,pageSize,selectDate,order));
}
/*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
@@ -79,40 +80,41 @@
@SaCheckPermission("createDelivery.search")
@PostMapping("/getSelectShippingOrderDetails/{pageNum}/{pageSize}")
public Result getSelectShippingOrderDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
- return Result.seccess(deliveryService.getSelectShippingOrderDetails(pageNum,pageSize,orderDetail));
+ return Result.success(deliveryService.getSelectShippingOrderDetails(pageNum,pageSize,orderDetail));
}
@ApiOperation("鍙戣揣鏂板鎺ュ彛")
@SaCheckPermission("createDelivery.add")
@PostMapping("/insertDelivery")
public Result insertDelivery( @RequestBody Map<String,Object> object){
- return Result.seccess(deliveryService.insertDelivery(object));
+ return Result.success(deliveryService.insertDelivery(object));
}
+
@ApiOperation("鍙戣揣瀹℃牳淇敼鎺ュ彛")
@SaCheckPermission("createDelivery.review")
@PostMapping("/updateDeliveryToExamine")
public Result updateDeliveryToExamine( @RequestBody Map<String,Object> object){
- return Result.seccess(deliveryService.updateDeliveryToExamine(object));
+ return Result.success(deliveryService.updateDeliveryToExamine(object));
}
@ApiOperation("鍙戣揣鍒犻櫎鎺ュ彛")
@SaCheckPermission("selectDelivery.delete")
@PostMapping("/deleteDelivery")
public Result deleteDelivery( @RequestBody Map<String,Object> object){
- return Result.seccess(deliveryService.deleteDelivery(object));
+ return Result.success(deliveryService.deleteDelivery(object));
}
@ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
@SaCheckPermission("selectDelivery.search")
@PostMapping("/getSelectDeliveryPrinting")
- public Result getSelectDeliveryPrinting( @RequestBody DeliveryDetail deliveryDetail){
- return Result.seccess(deliveryService.getSelectDeliveryPrinting(deliveryDetail));
+ public Result getSelectDeliveryPrinting( @RequestBody Map<String,Object> object) throws IllegalAccessException {
+ return Result.success(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.success(deliveryService.getSelectOrderPrinting(orderDetail,selectedValues));
}
@ApiOperation("鍙戣揣鏄庣粏鎶ヨ〃")
@@ -129,6 +131,12 @@
DownExcel.download(response, DeliveryDetailProductDTO.class, deliveryService.exportDeliveryDetailProductReport(dates),"orderReport");
}
+ @ApiOperation("鍙戣揣鍗曟墦鍗拌鏁�")
+ @PostMapping ("/updateDeliveryPrintNumber/{deliveryId}")
+ public Result updateDeliveryPrintNumber(@PathVariable String deliveryId) {
+
+ return Result.success(deliveryService.updateDeliveryPrintNumber(deliveryId));
+ }
--
Gitblit v1.8.0