From 3247273b3505b42c400251ee2fc0921affaadf40 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 29 十二月 2025 16:40:10 +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 | 51 +++++++++++++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 18 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 1c9a7b0..40bd59d 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
@@ -25,6 +25,7 @@
import com.example.erp.service.userInfo.SysErrorService;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -54,9 +55,9 @@
private final BasicOtherMoneyMapper basicOtherMoneyMapper;
private final OrderProcessDetailMapper orderProcessDetailMapper;
-
+ private final OrderFileMapper orderFileMapper;
private final DeliveryService deliveryService;
- public OrderService(OrderMapper orderMapper, OrderDetailMapper orderDetailMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, SysErrorService sysErrorService, OrderOtherMoneyMapper orderOtherMoneyMapper, ProductMapper productMapper, LogService logService, WorkOrderMapper workOrderMapper, FlowCardMapper flowCardMapper, BasicOtherMoneyMapper basicOtherMoneyMapper,DeliveryService deliveryService) {
+ public OrderService(OrderMapper orderMapper, OrderDetailMapper orderDetailMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, SysErrorService sysErrorService, OrderOtherMoneyMapper orderOtherMoneyMapper, ProductMapper productMapper, LogService logService, WorkOrderMapper workOrderMapper, FlowCardMapper flowCardMapper, BasicOtherMoneyMapper basicOtherMoneyMapper, DeliveryService deliveryService, OrderFileMapper orderFileMapper) {
this.orderMapper = orderMapper;
this.orderDetailMapper = orderDetailMapper;
this.orderGlassDetailMapper = orderGlassDetailMapper;
@@ -69,6 +70,8 @@
this.flowCardMapper = flowCardMapper;
this.basicOtherMoneyMapper = basicOtherMoneyMapper;
this.deliveryService = deliveryService;
+
+ this.orderFileMapper = orderFileMapper;
}
public boolean saveOrder(Map<String,Object> orderMap) throws Exception {
@@ -246,7 +249,11 @@
//鍒犻櫎璁㈠崟宸ヨ壓琛�
// orderProcessDetailMapper.delete(new LambdaQueryWrapper<OrderProcessDetail>().eq(OrderProcessDetail::getOrderId, order.getOrderId()));
- orderDetailMapper.deleteOrderFile(order.getOrderId());
+ orderFileMapper.update(null,
+ new LambdaUpdateWrapper<OrderFile>()
+ .eq(OrderFile::getOrderId, order.getOrderId())
+ .set(OrderFile::getOrderNumber, null)
+ );
insertOtherDetail(order.getOrderId(),OrderDetails,orderOtherMoneyList, position);
}
@@ -272,16 +279,13 @@
Product product = productMapper.selectById(OrderDetails.get(i).getProductId());
OrderDetails.get(i).setWeight(Double.valueOf(String.format("%.2f",product.getThickness()*OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()/1000000*2.5)));
- /*if(OrderDetails.get(i).getBendRadius()!=null && OrderDetails.get(i).getBendRadius()!=0){
- //鑾峰彇寮挗寮у害
- Double bendRadius = OrderDetails.get(i).getBendRadius();
- //鑾峰彇瀹�
- Double width = OrderDetails.get(i).getWidth();
- //鑾峰彇鎷遍珮
- String archRiseS = String.format("%.1f",bendRadius-(bendRadius*Math.cos(width/2/bendRadius)));
- Double archRise = Double.parseDouble(archRiseS);
- OrderDetails.get(i).setArchRise(archRise);
- }*/
+
+ //鍒ゆ柇娆″簭鍙锋枃浠舵槸鍚︾浉鍚�
+ if(OrderDetails.get(i).getFileId()!=null){
+ orderFileMapper.update(null,new LambdaUpdateWrapper<OrderFile>()
+ .set(OrderFile::getOrderNumber,OrderDetails.get(i).getOrderNumber())
+ .eq(OrderFile::getId,OrderDetails.get(i).getFileId()));
+ }
Map<String,Object> otherColumns = JSON.parseObject(OrderDetails.get(i).getOtherColumns(), new TypeReference<Map<String, Object>>(){});
int finalI = i;
@@ -303,14 +307,23 @@
}else{
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(),OrderDetails.get(i).getFileJson());
- }
+// 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(),
+// OrderDetails.get(i).getFileJson());
+// }
if(OrderDetails.get(i).getShape()==null){
OrderDetails.get(i).setShape("1");
}
}
+ //鍒犻櫎璁㈠崟鏂囦欢娌℃湁搴忓彿澶氫綑鐨勬暟鎹�
+ orderFileMapper.delete(new LambdaQueryWrapper<OrderFile>()
+ .eq(OrderFile::getOrderId, orderId)
+ .isNull(OrderFile::getOrderNumber));
+
//寰�鏄庣粏琛ㄦ彃鏁版嵁
orderDetailMapper.insertBatch(OrderDetails);
@@ -330,6 +343,7 @@
.eq(OrderGlassDetail::getOrderId, orderId)
.eq(OrderGlassDetail::getOrderNumber, orderDetail.getOrderNumber())
);
+
for(OrderGlassDetail orderGlassDetail:orderGlassDetails) {
//鑾峰彇褰撳墠灞傛暟涓庝箣鍓嶅眰鏁扮殑鍘氬害
@@ -424,7 +438,7 @@
}
//鍒犻櫎璁㈠崟
public Integer deleteOrder(String id) {
- orderDetailMapper.deleteOrderFile(id);
+ orderFileMapper.delete(new QueryWrapper<OrderFile>().eq("order_id",id));
return orderMapper.delete(
new QueryWrapper<Order>().eq("order_id",id)
);
@@ -434,7 +448,8 @@
//鏌ヨ璁㈠崟涓昏〃涓庡壇琛ㄤ俊鎭�
public Map<String,Object> getOrderById(String id) {
Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
- List<OrderDetail> orderDetails = orderDetailMapper.selectList(new QueryWrapper<OrderDetail>().eq("order_id",id));
+ List<OrderDetail> orderDetails = orderDetailMapper.selectListWithFileById(id);
+
List<OrderOtherMoney> orderOtherMoneyList = orderOtherMoneyMapper.findById(id);
List<Map<String,String>> orderFileList = orderMapper.selectOrderFileList(id);
Integer deliveryCount = orderMapper.selectDeliveryStateConut(id);
--
Gitblit v1.8.0