From 0ef25f5a127a36e2ed43d2884e066322e22e4d6e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 30 六月 2025 08:54:11 +0800
Subject: [PATCH] 添加洛阳配置文件
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index 162ce35..44b6171 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -47,8 +47,9 @@
private final ProductDetailMapper productDetailMapper;
private final OrderDetailMapper orderDetailMapper;
+ private final OrderMapper orderMapper;
- public FlowCardService(FlowCardMapper flowCardMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, LogService logService, ProductMapper productMapper, ProductDetailMapper productDetailMapper, OrderDetailMapper orderDetailMapper) {
+ public FlowCardService(FlowCardMapper flowCardMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, LogService logService, ProductMapper productMapper, ProductDetailMapper productDetailMapper, OrderDetailMapper orderDetailMapper, OrderMapper orderMapper) {
this.flowCardMapper = flowCardMapper;
this.orderGlassDetailMapper = orderGlassDetailMapper;
this.orderProcessDetailMapper = orderProcessDetailMapper;
@@ -56,6 +57,7 @@
this.productMapper = productMapper;
this.productDetailMapper = productDetailMapper;
this.orderDetailMapper = orderDetailMapper;
+ this.orderMapper = orderMapper;
}
//娴佺▼鍗＄鐞嗘煡璇�
@@ -1007,11 +1009,15 @@
)
);
+ Order order = orderMapper.
+ selectOne(new QueryWrapper<Order>()
+ .eq("order_id", flowCardList.get(0).getOrderId()));
+ order.setMoney(null);
Map<String,Object> map = new HashMap<>();
map.put("product",product);
map.put("flowCard",flowCardList);
-
+ map.put("order",order);
return map;
@@ -1320,6 +1326,10 @@
}
+ public List exportDateProcessSv(Map<String, Object> dates) {
+ List<LocalDate> date= (List<LocalDate>) dates.get("date");
+ return flowCardMapper.exportDateProcessMp(date);
+ }
}
--
Gitblit v1.8.0