From 3ab330b8aefb3cd781c9b8730b4ab7ac65e7e9d7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 三月 2025 09:14: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 | 80 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 4 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 641552a..9e20ef4 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;
@@ -35,25 +36,29 @@
List<Map<String,Object>> getSelectMaterialInventory(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,
- @Param("materialInventory") MaterialInventory materialInventory);
+ @Param("materialInventory") MaterialInventory materialInventory, @Param("ids") List<Long> ids);
- Map<String,Integer> getSelectMaterialInventoryPageTotal(Integer offset, Integer pageSize, MaterialInventory materialInventory);
+ Map<String,Integer> getSelectMaterialInventoryPageTotal(Integer offset, Integer pageSize, MaterialInventory materialInventory, @Param("ids") List<Long> ids);
List<Map<String,Object>> getSelectMaterialInventoryEngineering(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,
- @Param("optimizeUse") OptimizeUse optimizeUse);
+ @Param("optimizeUse") OptimizeUse optimizeUse, @Param("ids") List<Long> ids);
- Map<String,Integer> getSelectMaterialInventoryEngineeringPageTotal(Integer offset, Integer pageSize, OptimizeUse optimizeUse);
+ Map<String,Integer> getSelectMaterialInventoryEngineeringPageTotal(Integer offset, Integer pageSize, OptimizeUse optimizeUse, @Param("ids") List<Long> ids);
Boolean insertMaterialStore(@Param("type") String type,
@Param("json") String json);
+
+ Boolean deleteMaterialInventory(@Param("ids") List<Long> ids);
Boolean updateMaterialStore(@Param("type") String type,
@Param("json") String json, @Param("id") Long id);
Boolean deleteMaterialOutbound(@Param("materialOutboundId") String materialOutboundId);
+
+ Boolean deleteMaterialLog(@Param("materialOutboundId") String materialOutboundId);
Integer getMaximum(@Param("type") String type);
@@ -77,6 +82,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);
@@ -107,14 +114,24 @@
Boolean updateMaterialInventoryInventoryInt(@Param("inventoryId") Long inventoryId,
@Param("quantity") Integer quantity);
+ Boolean updateMaterialInventoryInventoryPlanQuantityOut(@Param("inventoryId") Long inventoryId,
+ @Param("quantity") Integer quantity);
+ Boolean updateMaterialInventoryInventoryPlanQuantityInt(@Param("inventoryId") Long inventoryId,
+ @Param("quantity") Integer quantity);
+
Boolean updateMaterialInventoryAvailableInventoryOut(@Param("inventoryId") Long inventoryId,
@Param("quantity") Integer quantity);
+
+ Boolean updateMaterialInventoryAvailableInventoryOutMes(@Param("inventoryId") Long inventoryId,
+ @Param("quantity") Integer quantity);
Boolean updateMaterialInventoryAvailableInventoryInt(@Param("inventoryId") Long inventoryId,
@Param("quantity") Integer quantity);
Boolean deleteMaterialOutboundDetail(@Param("materialOutboundId") String materialOutboundId);
Boolean deleteReturningWarehouseDetail(@Param("returningId") String returningId);
+
+ Boolean deleteReturningWarehouse(@Param("returningId") String returningId);
List<MaterialOutbound> getSelectMaterialOutboundDate(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,String startDate, String endDate,
@@ -169,6 +186,10 @@
@Param("totalArea") Double totalArea,
@Param("materialInventory") MaterialInventory materialInventory);
+ Boolean updateMaterialInventoryNull(@Param("materialCode") Long materialCode,@Param("singlePieceArea") Double singlePieceArea,
+ @Param("totalArea") Double totalArea,
+ @Param("materialInventory") MaterialInventory materialInventory);
+
Boolean insertMaterialInventory(@Param("materialCode") Long materialCode,@Param("singlePieceArea") Double singlePieceArea,
@Param("totalArea") Double totalArea,
@Param("materialInventory") MaterialInventory materialInventory);
@@ -187,4 +208,55 @@
Boolean updateMaterialInventoryArea(@Param("materialCode") Long materialCode,@Param("singlePieceArea") Double singlePieceArea);
+ List<SurplusMaterials> getSelectSurplusMaterialsDate(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
+ @Param("surplusMaterials") SurplusMaterials surplusMaterials);
+
+ Map<String,Integer> getSelectSurplusMaterialsDatePageTotal(Integer offset, Integer pageSize,String startDate, String endDate,SurplusMaterials surplusMaterials);
+
+ SurplusMaterials selectSurplusMaterialsCount( @Param("surplusMaterials") SurplusMaterials surplusMaterials);
+ Boolean insertSurplusMaterials( @Param("surplusMaterials") SurplusMaterials surplusMaterials);
+
+ Boolean insertSurplusMaterialsLog(@Param("surplusMaterials") SurplusMaterials surplusMaterials,String creator, String type);
+
+ Boolean updateSurplusMaterialsOutQuantity( @Param("surplusMaterials") SurplusMaterials surplusMaterials);
+
+ 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);
+
+ List<MaterialOutbound> getSelectMaterialOutboundProjectNo(@Param("projectNo") String projectNo);
+
+ OptimizeUse getSelectOptimizeUses(@Param("projectNo") String projectNo,@Param("width") Double width,@Param("height") Double height);
+
+ List<MaterialOutboundDetail> getSelectMaterialOutboundOptimizeUses(@Param("materialOutboundId") String materialOutboundId,@Param("useId") Integer useId);
+
+ Boolean updateMaterialOutboundOptimizeUses(@Param("useId") Integer useId,@Param("quantity") Integer quantity);
+
+ Boolean insertMaterialOutboundDetailOptimizeUses(@Param("materialOutboundId") String materialOutboundId,@Param("number") Integer number,
+ @Param("inventoryId") Long inventoryId,@Param("materialCode") Long materialCode,@Param("inventoryArea") String inventory_area,
+ @Param("useId") Integer useId,@Param("outboundQuantity") Integer outboundQuantity,
+ @Param("singlePieceArea") Double singlePieceArea,@Param("dateOfManufacture") LocalDate dateOfManufacture);
+
+ Boolean insertMaterialOutboundOptimizeUses(@Param("materialOutboundId") String materialOutboundId,@Param("projectNo") String projectNo,
+ @Param("name") String name);
+
+ Boolean updateOptimizeUsesMes(@Param("useId") Integer useId,@Param("quantity") Integer quantity);
+
+ String selectProjectNo(@Param("useId") Integer useId);
+
}
--
Gitblit v1.8.0