From a0db8ecfc7f6a560804e94b5834435ce460c00b9 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 30 十二月 2025 08:16:52 +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/service/sd/OrderFileService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
index 67aa1d4..6053a1e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
@@ -11,6 +11,7 @@
import com.example.erp.common.Result;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderFile;
+import com.example.erp.mapper.sd.OrderDetailMapper;
import com.example.erp.mapper.sd.OrderFileMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -26,6 +27,7 @@
@RequiredArgsConstructor
public class OrderFileService {
private final OrderFileMapper orderFileMapper;
+ private final OrderDetailMapper orderDetailMapper;
public List<OrderFile> getOrderFilePicture(List<Map<String,Object>> orderDetails) throws NoSuchFieldException {
Set<String> seenKeys = new HashSet<>();
List<Map<String,Object>> result = new ArrayList<>();
@@ -69,7 +71,7 @@
public Object updateOrderFileByOrderNumber(MultipartFile file,String name,String orderId,String orderNumber,Float width,Float height) throws IOException {
//鍒ゆ柇鏄惁瑙勫畾鐨勬牸寮忓悗缂�鍚�
- if(!isAllowedFile(name)){
+ if(!isAllowedFile(name) || orderNumber == null || orderId == null){
return null;
}
@@ -125,7 +127,9 @@
.eq(OrderFile::getOrderNumber, orderNumber)
);
}
-
+ orderDetailMapper.update(null,new LambdaUpdateWrapper<OrderDetail>()
+ .setSql("file_name = '" + name + "'")
+ .eq(OrderDetail::getOrderId, orderId));
return orderFile;
} catch (Exception e) {
--
Gitblit v1.8.0