From 86be28dd91854ff36dbc88d40a79efcb9b7229a6 Mon Sep 17 00:00:00 2001 From: 廖井涛 <2265517004@qq.com> Date: 星期日, 07 四月 2024 09:42:41 +0800 Subject: [PATCH] 提交物料模块修改 --- north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 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 625d8d2..db4977a 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); Map<String,Integer> getSelectMaterialInventoryPageTotal(Integer offset, Integer pageSize, MaterialInventory materialInventory); + + List<Map<String,Object>> getSelectMaterialInventoryEngineering(@Param("offset") Integer offset, + @Param("pageSize") Integer pageSize, + @Param("optimizeUse") OptimizeUse optimizeUse); + + + Map<String,Integer> getSelectMaterialInventoryEngineeringPageTotal(Integer offset, Integer pageSize, OptimizeUse optimizeUse); Boolean insertMaterialStore(@Param("type") String type, @Param("json") String json); @@ -75,6 +93,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,10 +134,17 @@ @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); ReturningWarehouse getSelectReturningWarehouse(@Param("offset") Integer offset, -- Gitblit v1.8.0