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 | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 af97ddb..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;
@@ -70,14 +71,18 @@
Integer getReturningWarehouseCount(@Param("returningId") String returningId);
- List<MaterialInventory> getMaterialInventoryCount(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture);
+ List<MaterialInventory> getMaterialInventoryCount(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture,String producer);
- List<MaterialInventory> getMaterialInventoryCountNull(@Param("materialCode") Long materialCode);
+ 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);
+ List<MaterialInventory> getMaterialInventoryCountId(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture,String producer);
- List<MaterialInventory> getMaterialInventoryCountNullId(@Param("materialCode") Long materialCode);
+ List<MaterialInventory> getMaterialInventoryCountNullId(@Param("materialCode") Long materialCode,String producer);
List<MaterialOutboundDetail> getIsNotMaterialOutboundDetail( @Param("materialOutboundId") String materialOutboundId);
@@ -193,9 +198,9 @@
@Param("materialInventory") MaterialInventory materialInventory);
Boolean updateMaterialInventoryOut(@Param("materialCode") Long materialCode,@Param("quantity") Integer quantity,
- @Param("dateOfManufacture") String dateOfManufacture);
+ @Param("dateOfManufacture") String dateOfManufacture,@Param("producer") String producer);
- Boolean updateMaterialInventoryNullOut(@Param("materialCode") Long materialCode,@Param("quantity") Integer quantity);
+ Boolean updateMaterialInventoryNullOut(@Param("materialCode") Long materialCode,@Param("quantity") Integer quantity,@Param("producer") String producer);
Boolean insertMaterialInventory(@Param("materialCode") Long materialCode,@Param("singlePieceArea") Double singlePieceArea,
@Param("totalArea") Double totalArea,
@@ -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);
@@ -269,4 +278,10 @@
List<MaterialLog> getOptimizeOutboundReport(Integer offset, Integer pageSize, String startDate, String endDate, MaterialLog materialLog, String type);
Map<String,Integer> getOptimizeOutboundReportTotal(Integer offset, Integer pageSize, String startDate, String endDate, MaterialLog materialLog, String type);
+
+ List<Map<String,Object>> getSelectMaterialInventoryMes();
+
+ Boolean updateMaterialInventoryAll(@Param("materialInventoryId") Long materialInventoryId,@Param("materialInventory") MaterialInventory materialInventory);
+
+ Boolean updateMaterialInventoryOne(@Param("materialInventoryId") Long materialInventoryId,@Param("materialInventory") MaterialInventory materialInventory);
}
--
Gitblit v1.8.0