From a04d735ab3f2e9c52ebf52c35dfa1506d86d416d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 24 七月 2025 17:01:57 +0800
Subject: [PATCH] 修改流程卡打印获取第一个工序不正确问题，在制品汇总报表添加批次
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 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 cae036a..2492db1 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
@@ -1,11 +1,15 @@
package com.example.erp.mapper.sd;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.erp.dto.sd.OrderDTO;
+import com.example.erp.dto.sd.OrderDetailProductDTO;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import org.apache.ibatis.annotations.Mapper;
+import java.time.LocalDate;
import java.util.List;
+import java.util.Map;
@Mapper
public interface OrderDetailMapper extends BaseMapper<OrderDetail> {
@@ -14,5 +18,38 @@
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);
+
+ List<OrderDTO> exportOrderReport(List<LocalDate> dates);
+
+ List<OrderDetail> getOrderProductSummary(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail);
+
+ Map<String,Integer> getOrderProductSummaryTotal(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail, String product);
+
+ List<OrderDTO> exportOrderProductSummary(List<LocalDate> dates);
+
+ List<OrderDetailProductDTO> exportOrderReportProduct(List<LocalDate> dates);
+
+ Map<String, String> getOrderProductDetailTag(String orderId);
+
+ List<Map<String,Object>> getOrderProductDistinctById(String orderId);
+
+ List<Map<String,Object>> getOrderProductDistinctByIds(String orderId,List<String> productId);
+
+ List<OrderDetail> getOrderProductByProductId(Object productId, String orderId);
+
+ List<Map<String,Object>> getOrderProductByProductIds(Object productId, String orderId);
+
+ List<Order> getOrderSummaryReport(Integer offset, Integer pageSize, String startDate, String endDate, Order order);
+
+ Map<String,Integer> getOrderSummaryReportTotal(Integer offset, Integer pageSize, String startDate, String endDate, Order order, String type);
+
+ List<Order> exportOrderSummary(List<LocalDate> dates);
+
+ boolean deleteOrderFile(String orderId);
+
+
}
--
Gitblit v1.8.0