From 43322d13c1876b1705f8ba1eb2ef32e7a433cacc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 十二月 2025 16:57:06 +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 | 13 ++++++++++++-
1 files changed, 12 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 b1f55a8..8b86f54 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;
@@ -73,6 +74,10 @@
List<MaterialInventory> getMaterialInventoryCount(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture,String producer);
List<MaterialInventory> getMaterialInventoryCountNull(@Param("materialCode") Long materialCode,String producer);
+
+ List<MaterialInventory> getMaterialInventoryCount1(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture,String producer,Long id);
+
+ List<MaterialInventory> getMaterialInventoryCountNull1(@Param("materialCode") Long materialCode,String producer,Long id);
List<MaterialInventory> getMaterialInventoryCountId(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture,String producer);
@@ -244,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);
@@ -275,4 +284,6 @@
Boolean updateMaterialInventoryAll(@Param("materialInventoryId") Long materialInventoryId,@Param("materialInventory") MaterialInventory materialInventory);
Boolean updateMaterialInventoryOne(@Param("materialInventoryId") Long materialInventoryId,@Param("materialInventory") MaterialInventory materialInventory);
+
+ List<MaterialInventory> selectGetStockList();
}
--
Gitblit v1.8.0