From a9ffa322f0cf794a7da8182e1be4ca34f5ea19b6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 25 七月 2025 13:34:36 +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/OrderService.java | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 2 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 b5ca616..dd14e75 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
@@ -232,6 +232,8 @@
//鍒犻櫎璁㈠崟宸ヨ壓琛�
// orderProcessDetailMapper.delete(new LambdaQueryWrapper<OrderProcessDetail>().eq(OrderProcessDetail::getOrderId, order.getOrderId()));
+ orderDetailMapper.deleteOrderFile(order.getOrderId());
+
insertOtherDetail(order.getOrderId(),OrderDetails,orderOtherMoneyList);
}
@@ -289,6 +291,14 @@
OrderDetails.get(i).setOtherColumns("{}");
}
+ 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());
+ }
+
+ if(OrderDetails.get(i).getShape()==null){
+ OrderDetails.get(i).setShape("1");
+ }
+
}
@@ -328,7 +338,11 @@
String archRiseS = String.format("%.1f",radius-radius*Math.cos(innerArc/2/radius));
Double archRise = Double.parseDouble(archRiseS);
orderDetail.setArchRise(archRise);
- //orderDetailMapper.update(orderDetail,new LambdaUpdateWrapper<OrderDetail>());
+
+ orderDetailMapper.update(null,new LambdaUpdateWrapper<OrderDetail>()
+ .set(OrderDetail::getArchRise,archRise)
+ .eq(OrderDetail::getId, orderDetail.getId())
+ );
});
@@ -400,7 +414,8 @@
}
//鍒犻櫎璁㈠崟
public Integer deleteOrder(String id) {
- return orderMapper.delete(
+ orderDetailMapper.deleteOrderFile(id);
+ return orderMapper.delete(
new QueryWrapper<Order>().eq("order_id",id)
);
}
@@ -411,12 +426,14 @@
Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
List<OrderDetail> orderDetails = orderDetailMapper.selectList(new QueryWrapper<OrderDetail>().eq("order_id",id));
List<OrderOtherMoney> orderOtherMoneyList = orderOtherMoneyMapper.findById(id);
+ List<Map<String,String>> orderFileList = orderMapper.selectOrderFileList(id);
Map<String,Object> map = new HashMap<>();
map.put("order",order);
map.put("orderDetails",orderDetails);
map.put("orderOtherMoneyList",orderOtherMoneyList);
+ map.put("orderFile",orderFileList);
return map;
}
//璁㈠崟瀹℃牳
@@ -968,4 +985,56 @@
}
}
+
+ public Object uploadDxf(Map<String,Object> object) {
+ String fileName = "";
+ if (object.get("fileName") != null) {
+ fileName = object.get("fileName").toString();
+ }
+ String fileData = "";
+ if (object.get("fileData") != null) {
+ fileData = object.get("fileData").toString();
+ }
+ byte[] dxfData = Base64.getDecoder().decode(fileData);
+ String orderId="NG25010101";
+ Integer orderNumber=1;
+ orderMapper.saveOrderFile(fileName, fileData,orderId,orderNumber);
+ return true;
+ }
+
+ public Map<String,Object> selectUploadDxf(Map<String,Object> object) {
+ String orderId = "";
+ if (object.get("orderId") != null) {
+ orderId = object.get("orderId").toString();
+ }
+ int orderNumber =0;
+ if (object.get("orderNumber") != null) {
+ orderNumber = Integer.parseInt(object.get("orderNumber").toString());
+ }
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",orderMapper.selectOrderFile(orderId,orderNumber));
+ return map;
+ }
+
+ public boolean updateOrderFile(Map<String,Object> object) {
+ String orderId = "";
+ if (object.get("orderId") != null) {
+ orderId = object.get("orderId").toString();
+ }
+ int orderNumber =0;
+ if (object.get("orderNumber") != null) {
+ orderNumber = Integer.parseInt(object.get("orderNumber").toString());
+ }
+ String dataBase64 = "";
+ if (object.get("dataBase64") != null) {
+ dataBase64 = object.get("dataBase64").toString();
+ }
+ Map<String,String> orderFile =orderMapper.selectOrderFile(orderId,orderNumber);
+ if(orderFile!=null){
+ orderMapper.updateOrderFile("map.dxf", dataBase64,orderId,orderNumber);
+ }else{
+ orderMapper.saveOrderFile("map.dxf", dataBase64,orderId,orderNumber);
+ }
+ return true;
+ }
}
--
Gitblit v1.8.0