From a8378db2feef3b08edc0a6594bec187051d3b754 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 13:32:33 +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/OrderFileController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderFileController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderFileController.java
index e3e5813..f24ef32 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderFileController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderFileController.java
@@ -19,12 +19,30 @@
private final OrderFileService orderFileService;
@PostMapping("/updateOrderFileByOrderNumber/{orderId}/{orderNumber}")
- public Result updateOrderFileByOrderNumber(@RequestParam("file") MultipartFile file, @PathVariable String orderId, @PathVariable String orderNumber) throws IOException {
+ public Result updateOrderFileByOrderNumber(
+ @RequestParam("file") MultipartFile file,
+ @RequestParam("name") String name,
+ @RequestParam("width") Float width,
+ @RequestParam("height") Float height,
+ @PathVariable String orderId,
+ @PathVariable String orderNumber) throws IOException {
- return Result.success(orderFileService.updateOrderFileByOrderNumber(file,orderId,orderNumber));
+ return Result.success(
+ orderFileService.updateOrderFileByOrderNumber(file,name,orderId,orderNumber,width,height)
+ );
}
@PostMapping("/getOrderFilePicture")
public Result getOrderFilePicture(@RequestBody List<Map<String,Object>> orderDetails) throws NoSuchFieldException {
return Result.success(orderFileService.getOrderFilePicture(orderDetails));
}
+
+ @PostMapping("/getOrderNumberFile/{orderId}/{orderNumber}")
+ public Result getOrderNumberFile(@PathVariable String orderId,@PathVariable String orderNumber){
+ return Result.success(orderFileService.getOrderNumberFile(orderId,orderNumber));
+ }
+ @PostMapping("/deleteOrderNumberFile/{orderId}/{orderNumber}")
+ public Result deleteOrderNumberFile(@PathVariable String orderId,@PathVariable String orderNumber){
+ return Result.success(orderFileService.deleteOrderNumberFile(orderId,orderNumber));
+ }
+
}
--
Gitblit v1.8.0