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/mapper/sd/OrderDetailMapper.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java
index f76f5aa..379da63 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java
@@ -18,7 +18,7 @@
boolean updateOrderMoney( List<OrderDetail> orderDetails);
- List<OrderDetail> getOrderReport(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail);
+ List<OrderDetail> getOrderReport(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail, Integer model, Integer scope);
//type涓轰簡鍖哄埆闇�涓嶉渶瑕佹牴鎹骇鍝佸垎绫�
Map<String,Integer> getOrderReportTotal(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail, String type);
@@ -50,4 +50,7 @@
List<Order> exportOrderSummary(List<LocalDate> dates);
+
+
+ List<OrderDetail> selectListWithFileById(String id);
}
--
Gitblit v1.8.0