From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +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/mm/MaterialInventoryMapper.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java
index edc21bb..01ea8c2 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java
@@ -1,6 +1,7 @@
package com.example.erp.mapper.mm;
import com.example.erp.dto.mm.FinishedOperateLogDTO;
+import com.example.erp.dto.mm.MaterialLogDTO;
import com.example.erp.entity.mm.*;
import com.example.erp.entity.pp.OptimizeUse;
import com.example.erp.entity.sd.Delivery;
@@ -248,7 +249,11 @@
@Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("materialLog") MaterialLog materialLog,String type);
- List<MaterialLog> exportMaterialLogReport(List<LocalDate> dates, String type);
+ List<MaterialLogDTO> exportMaterialLogReport(List<LocalDate> dates, String type);
+
+ List<MaterialLogDTO> exportMaterialLogReports(List<LocalDate> dates, String type);
+
+ List<MaterialLogDTO> exportMaterialLogOptimizeOutboundReport(List<LocalDate> dates, String type);
List<MaterialOutbound> getSelectMaterialOutboundProjectNo(@Param("projectNo") String projectNo);
--
Gitblit v1.8.0