From c12e4a831b4210ec886b2537824a464d74b59ff5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 10 三月 2025 14:46:28 +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 | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 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 f4a2065..0a9cc5e 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
@@ -123,7 +123,15 @@
log.setFunction("saveOrderTitle淇濆瓨琛ㄥご:"+order.getOrderId());
Order order1 = orderMapper.selectOrderId(order.getOrderId());
+ //浣跨敤璁㈠崟鍘熸湰鐨勭姸鎬佸拰璁＄畻鏂瑰紡
order.setCalculateType(order1.getCalculateType());
+ order.setCreateOrder(order1.getCreateOrder());
+ order.setProcessReview(order1.getProcessReview());
+ order.setOrderReview(order1.getOrderReview());
+ order.setProductionOrder(order1.getProductionOrder());
+ order.setProcessingCard(order1.getProcessingCard());
+ order.setWarehousing(order1.getWarehousing());
+ order.setDelivery(order1.getDelivery());
LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Order::getOrderId, order.getOrderId());
@@ -614,6 +622,19 @@
orderProductDetailMap.put("productId",map.get("productId"));
orderProductDetailMap.put("productName",map.get("productName"));
List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
+ orderDetails.forEach(orderDetail->{
+
+ List<OrderGlassDetail> orderGlassDetails =
+ orderGlassDetailMapper.selectList(
+ new QueryWrapper<OrderGlassDetail>().
+ eq("order_id",orderId).
+ eq("order_number",orderDetail.getOrderNumber())
+ );
+ Integer differentSize = orderGlassDetailMapper.getDifferentSizeNumber(orderId,orderDetail.getOrderNumber());
+ orderDetail.setDifferentSize(differentSize);
+ orderDetail.setOrderGlassDetails(orderGlassDetails);
+ });
+
orderProductDetailMap.put("productDetail",orderDetails);
orderProductDetail.add(orderProductDetailMap);
});
@@ -632,13 +653,24 @@
}else{
orderProductDistinct = orderDetailMapper.getOrderProductDistinctById(orderId);
}
-
List<Map<String,Object>> orderProductDetail = new ArrayList<>();
orderProductDistinct.forEach(map->{
Map<String,Object> orderProductDetailMap = new HashMap<>();
orderProductDetailMap.put("productId",map.get("productId"));
orderProductDetailMap.put("productName",map.get("productName"));
List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
+ orderDetails.forEach(orderDetail->{
+
+ List<OrderGlassDetail> orderGlassDetails =
+ orderGlassDetailMapper.selectList(
+ new QueryWrapper<OrderGlassDetail>().
+ eq("order_id",orderId).
+ eq("order_number",orderDetail.getOrderNumber())
+ );
+ Integer differentSize = orderGlassDetailMapper.getDifferentSizeNumber(orderId,orderDetail.getOrderNumber());
+ orderDetail.setDifferentSize(differentSize);
+ orderDetail.setOrderGlassDetails(orderGlassDetails);
+ });
orderProductDetailMap.put("productDetail",orderDetails);
--
Gitblit v1.8.0