From 8d6b17bfa56fd767c6f9de666eb0dd44c6b032cd Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 五月 2025 15:42:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java | 71 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 2 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..af97ddb 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;
@@ -50,10 +51,16 @@
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);
+
+ Boolean deleteMaterialLogById(@Param("id") Long id);
Integer getMaximum(@Param("type") String type);
@@ -63,9 +70,9 @@
Integer getReturningWarehouseCount(@Param("returningId") String returningId);
- Integer getMaterialInventoryCount(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture);
+ List<MaterialInventory> getMaterialInventoryCount(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture);
- Integer getMaterialInventoryCountNull(@Param("materialCode") Long materialCode);
+ List<MaterialInventory> getMaterialInventoryCountNull(@Param("materialCode") Long materialCode);
List<MaterialInventory> getMaterialInventoryCountId(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture);
@@ -77,6 +84,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 +116,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 +188,15 @@
@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 updateMaterialInventoryOut(@Param("materialCode") Long materialCode,@Param("quantity") Integer quantity,
+ @Param("dateOfManufacture") String dateOfManufacture);
+
+ Boolean updateMaterialInventoryNullOut(@Param("materialCode") Long materialCode,@Param("quantity") Integer quantity);
+
Boolean insertMaterialInventory(@Param("materialCode") Long materialCode,@Param("singlePieceArea") Double singlePieceArea,
@Param("totalArea") Double totalArea,
@Param("materialInventory") MaterialInventory materialInventory);
@@ -202,4 +230,43 @@
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);
+
+ 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);
}
--
Gitblit v1.8.0