From a6f59f0908e5787d55c098c17f4eec365cf6477a Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 23 十一月 2024 11:41:25 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 77 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 625d8d2..0f77b7a 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,8 @@
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;
import com.example.erp.entity.sd.DeliveryDetail;
import com.example.erp.entity.sd.OrderDetail;
@@ -22,20 +24,41 @@
Map<String,Integer> getSelectMaterialInventoryDatePageTotal(Integer offset, Integer pageSize,String startDate, String endDate, MaterialInventory materialInventory);
+ List<Map<String,Object>> getSelectMaterialInventoryEngineeringDate(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
+ @Param("materialInventory") MaterialInventory materialInventory);
+
+
+ Map<String,Integer> getSelectMaterialInventoryEngineeringDatePageTotal(Integer offset, Integer pageSize,String startDate, String endDate, MaterialInventory materialInventory);
+
+
+
+
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("ids") List<Long> ids);
+
+
+ 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);
@@ -60,6 +83,8 @@
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);
Integer getMaterialOutboundDetailMaximum(@Param("materialOutboundId") String materialOutboundId);
@@ -75,6 +100,10 @@
Boolean updateReturningWarehouseDetail(@Param("number") String number, @Param("returningWarehouseNumber") Integer returningWarehouseNumber,
@Param("materialInventoryId") Long materialInventoryId);
+ Boolean updateMaterialInventoryAvailableOptOut(@Param("useId") Integer useId,
+ @Param("quantity") Integer quantity);
+ Boolean updateMaterialInventoryAvailableOptInt(@Param("useId") Integer useId,
+ @Param("quantity") Integer quantity);
Boolean updateMaterialInventoryAvailableOut(@Param("inventoryId") Long inventoryId,
@Param("quantity") Integer quantity);
@@ -94,6 +123,8 @@
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,
@Param("materialOutbound") MaterialOutbound materialOutbound);
@@ -112,9 +143,16 @@
@Param("pageSize") Integer pageSize,
@Param("materialOutboundDetail") MaterialOutboundDetail materialOutboundDetail);
+ List<MaterialOutboundDetail> SelectMaterialOutboundDetail(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize,
+ @Param("materialOutboundDetail") MaterialOutboundDetail materialOutboundDetail);
List<Map<String,Object>> getSelectMaterialOutboundDetail(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,
@Param("materialOutboundDetail") MaterialOutboundDetail materialOutboundDetail);
+
+ List<Map<String,Object>> getSelectMaterialOutboundEngineering(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize,
+ @Param("materialOutboundDetail") MaterialOutboundDetail materialOutboundDetail);
Map<String,Integer> getSelectMaterialOutboundDetailPageTotal(Integer offset, Integer pageSize,MaterialOutboundDetail materialOutboundDetail);
@@ -140,6 +178,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);
@@ -156,4 +198,37 @@
@Param("totalArea") Double totalArea,
@Param("returningWarehouseDetail") ReturningWarehouseDetail returningWarehouseDetail);
+ 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);
+
}
--
Gitblit v1.8.0