From 657c6ae96e46fa2c8b741d19c9454d0a9850c3d3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 13 二月 2025 16:16:41 +0800
Subject: [PATCH] 修改打印生产单大小片区分
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 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 bd8d140..c89cf0d 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
@@ -613,6 +613,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);
});
@@ -631,13 +644,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