From 95270d9f2d0c93b52569268737902c4f09216c6b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 13 九月 2024 12:04:39 +0800
Subject: [PATCH] 返工查询后端筛选提交
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 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..1772c5c 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.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,12 +23,29 @@
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);
@@ -60,6 +78,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 +95,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);
@@ -112,9 +136,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);
@@ -156,4 +187,25 @@
@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);
+
}
--
Gitblit v1.8.0