From f7a2fcdda7f1120498c5c5f75c5a99955fc54b43 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 16 十二月 2025 16:54:09 +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 | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 f07cd86..1094e5b 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
@@ -1,8 +1,6 @@
package com.example.erp.controller.sd;
-import com.aspose.cad.internal.V.S;
import com.example.erp.common.Result;
-import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.service.sd.OrderFileService;
import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor;
@@ -21,12 +19,26 @@
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,
+ @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));
}
@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