From a3dfc8966bb702c4ccb20f2a2afda7b7c39bd98d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 06 十一月 2024 15:17:08 +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 | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 07f788a..fccaa51 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,5 +1,6 @@
package com.example.erp.mapper.mm;
+import com.example.erp.dto.mm.FinishedOperateLogDTO;
import com.example.erp.entity.mm.*;
import com.example.erp.entity.pp.OptimizeUse;
import com.example.erp.entity.sd.Delivery;
@@ -77,6 +78,8 @@
List<ReturningWarehouseDetail> getIsNotReturningWarehouseDetail(@Param("returningId") String returningId);
Boolean insertMaterialOutbound(@Param("materialOutbound") MaterialOutbound materialOutbound, @Param("number") String number);
+
+ Boolean updateMaterialOutbound(@Param("materialOutbound") MaterialOutbound materialOutbound, @Param("number") String number);
Boolean insertReturningWarehouse(@Param("returningWarehouse") ReturningWarehouse returningWarehouse, @Param("number") String number);
@@ -202,4 +205,20 @@
Boolean updateSurplusMaterialsIntQuantity( @Param("surplusMaterials") SurplusMaterials surplusMaterials);
+ Map<String,Object> getPrintCreateOutbound(String materialOutboundId);
+
+ List<Map<String,Object>> getPrintCreateOutboundDetail(String materialOutboundId);
+
+ MaterialInventory getMaterialInventoryById(@Param("id") Long id);
+
+ List<MaterialLog> getMaterialLogReport(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
+ @Param("materialLog") MaterialLog materialLog,String type);
+
+ Map<String,Integer> getMaterialLogReportTotal(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
+ @Param("materialLog") MaterialLog materialLog,String type);
+
+ List<MaterialLog> exportMaterialLogReport(List<LocalDate> dates, String type);
+
}
--
Gitblit v1.8.0