From 174a6b7bc81a21f8cf950760d3e17fd5f4b7c4dd Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 21 八月 2025 11:15:03 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index b0a7bd5..8671a1e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -21,6 +21,8 @@
import com.example.erp.mapper.sd.*;
import com.example.erp.service.userInfo.LogService;
import com.example.erp.service.userInfo.SysErrorService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -292,7 +294,7 @@
}
if(OrderDetails.get(i).getFileName()!=null&&!OrderDetails.get(i).getFileName().trim().isEmpty()){
- orderMapper.saveOrderFile(OrderDetails.get(i).getFileName(), OrderDetails.get(i).getFileData(),orderId,OrderDetails.get(i).getOrderNumber());
+ orderMapper.saveOrderFile(OrderDetails.get(i).getFileName(), OrderDetails.get(i).getFileData(),orderId,OrderDetails.get(i).getOrderNumber(),OrderDetails.get(i).getFileJson());
}
if(OrderDetails.get(i).getShape()==null){
@@ -1003,7 +1005,7 @@
byte[] dxfData = Base64.getDecoder().decode(fileData);
String orderId="NG25010101";
Integer orderNumber=1;
- orderMapper.saveOrderFile(fileName, fileData,orderId,orderNumber);
+ //orderMapper.saveOrderFile(fileName, fileData,orderId,orderNumber);
return true;
}
@@ -1021,7 +1023,7 @@
return map;
}
- public boolean updateOrderFile(Map<String,Object> object) {
+ public boolean updateOrderFile(JSONObject object) throws JsonProcessingException {
String orderId = "";
if (object.get("orderId") != null) {
orderId = object.get("orderId").toString();
@@ -1034,11 +1036,16 @@
if (object.get("dataBase64") != null) {
dataBase64 = object.get("dataBase64").toString();
}
+ String fileJson = null;
+ ObjectMapper om = new ObjectMapper();
+ if (object.get("fileJson") != null) {
+ fileJson = om.writeValueAsString(object.get("fileJson"));
+ }
Map<String,String> orderFile =orderMapper.selectOrderFile(orderId,orderNumber);
if(orderFile!=null){
- orderMapper.updateOrderFile("map.dxf", dataBase64,orderId,orderNumber);
+ orderMapper.updateOrderFile("map.dxf", dataBase64,orderId,orderNumber,fileJson);
}else{
- orderMapper.saveOrderFile("map.dxf", dataBase64,orderId,orderNumber);
+ orderMapper.saveOrderFile("map.dxf", dataBase64,orderId,orderNumber,fileJson);
}
return true;
}
--
Gitblit v1.8.0