From fd7fd05a94784b3f799e3c9668353cc630f9a07f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 01 九月 2025 09:24:46 +0800
Subject: [PATCH] 修改显示的时间类型
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 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 5b7e0ba..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){
@@ -318,31 +320,36 @@
orderDetails.forEach(orderDetail -> {
//鑾峰彇鏈�灏忓姬搴�
- OrderGlassDetail orderGlassDetail = orderGlassDetailMapper
- .selectOne(new LambdaQueryWrapper<OrderGlassDetail>()
+ List<OrderGlassDetail> orderGlassDetails = orderGlassDetailMapper
+ .selectList(new LambdaQueryWrapper<OrderGlassDetail>()
.eq(OrderGlassDetail::getOrderId, orderId)
.eq(OrderGlassDetail::getOrderNumber, orderDetail.getOrderNumber())
- .orderByDesc(OrderGlassDetail::getArc)
- .last("limit 1")
);
- //鑾峰彇褰撳墠搴忓彿浜у搧Math.cos(
- Product product = productMapper.selectById(orderDetail.getProductId());
- //鍐呭崐寰�
- Double radius = orderDetail.getBendRadius() - product.getTotalThickness();
- //鍐呯墖鍐呭姬闀�
- Double innerArc = orderGlassDetail.getArc()
- -orderGlassDetail.getArc()*product.getTotalThickness()/orderDetail.getBendRadius();
+ for(OrderGlassDetail orderGlassDetail:orderGlassDetails) {
+ //鑾峰彇褰撳墠灞傛暟涓庝箣鍓嶅眰鏁扮殑鍘氬害
+ Double glassThickness = productMapper
+ .getGlassThickness(orderDetail.getProductId(), orderGlassDetail.getTechnologyNumber());
+ //鍐呭崐寰�
+ Double radius = orderDetail.getBendRadius() - glassThickness;
- //鎷遍珮
- String archRiseS = String.format("%.1f",radius-radius*Math.cos(innerArc/2/radius));
- Double archRise = Double.parseDouble(archRiseS);
- orderDetail.setArchRise(archRise);
- orderDetailMapper.update(null,new LambdaUpdateWrapper<OrderDetail>()
- .set(OrderDetail::getArchRise,archRise)
- .eq(OrderDetail::getId, orderDetail.getId())
- );
+ //鍐呯墖鍐呭姬闀�
+ Double innerArc = orderGlassDetails.get(0).getArc()
+ - orderGlassDetails.get(0).getArc() * glassThickness / orderDetail.getBendRadius();
+
+ //鎷遍珮
+ String archRiseS = String.format("%.1f", radius - radius * Math.cos(innerArc / 2 / radius));
+ Double archRise = Double.parseDouble(archRiseS);
+ orderGlassDetailMapper.update(null, new LambdaUpdateWrapper<OrderGlassDetail>()
+ .set(OrderGlassDetail::getArchRise, archRise)
+ .eq(OrderGlassDetail::getId, orderGlassDetail.getId())
+ );
+
+// orderDetailMapper.update(null,new LambdaUpdateWrapper<OrderDetail>()
+// .set(OrderDetail::getArchRise,archRise)
+// .eq(OrderDetail::getId, orderDetail.getId())
+ }
});
@@ -998,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;
}
@@ -1016,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();
@@ -1029,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