From ad9938fa0d771aa46b6e25d1723c82fffd29778b Mon Sep 17 00:00:00 2001
From: Carl <manfulmr@outlook.com>
Date: Tue, 13 Jan 2026 13:57:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=B8=85=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E6=89=BE=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionMaterial/MmInventoryController.cs  | 12 ++++++++++++
 DOAN.Model/MES/Material/Dto/MmInventoryDto.cs    | 14 ++++++++++++++
 .../MES/Material/IService/IMmInventoryService.cs |  6 ++++++
 DOAN.Service/MES/Material/MmInventoryService.cs  | 16 ++++++++++++++++
 4 files changed, 48 insertions(+)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmInventoryController.cs b/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmInventoryController.cs
index 2c56970..629f8f7 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmInventoryController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmInventoryController.cs
@@ -244,5 +244,17 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM
             var result = ExportExcelMini(data, "inventory", "库存管理");
             return ExportExcel(result.Item2, result.Item1);
         }
+
+        /// <summary>
+        /// 获取出/入库记录数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("GetInOrOutRecord")]
+        public IActionResult GetInOrOutRecord(MmInventoryRecordDto parm)
+        {
+            var response = _MmInventoryService.GetInOrOutRecord(parm);
+
+            return SUCCESS(response);
+        }
     }
 }
\ No newline at end of file
diff --git a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
index 1732aa8..4bd548e 100644
--- a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
@@ -105,4 +105,18 @@ namespace DOAN.Model.BZFM.Dto
         [SugarColumn(ColumnName = "created_time")]
         public DateTime? CreatedTime { get; set; }
     }
+
+    /// <summary>
+    /// 库存清单查询进出库记录对象
+    /// </summary>
+    public class MmInventoryRecordDto : PagerInfo
+    {
+        public string MaterialCode { get; set; }
+
+        public string LocationCode { get; set; }
+
+        public string SupplierCode { get; set; }
+
+        public string BatchNo { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/DOAN.Service/MES/Material/IService/IMmInventoryService.cs b/DOAN.Service/MES/Material/IService/IMmInventoryService.cs
index fcb34fe..527254c 100644
--- a/DOAN.Service/MES/Material/IService/IMmInventoryService.cs
+++ b/DOAN.Service/MES/Material/IService/IMmInventoryService.cs
@@ -31,6 +31,12 @@ namespace DOAN.Service.BZFM.IBZFMService
         /// 获取出/入库操作类型下拉数据
         /// </summary>
         List<MmTransactionOption> GetTransactionOption();
+
+        /// <summary>
+        /// 获取出/入库记录
+        /// </summary>
+        PagedInfo<InboundReceiptDto> GetInOrOutRecord(MmInventoryRecordDto parm);
+
         /// <summary>
         /// 创建入库单 成功返回ok ReceiptType = 1蓝单 ReceiptType = 2 红单（逆向）
         /// </summary>
diff --git a/DOAN.Service/MES/Material/MmInventoryService.cs b/DOAN.Service/MES/Material/MmInventoryService.cs
index 6287f7a..0ea718d 100644
--- a/DOAN.Service/MES/Material/MmInventoryService.cs
+++ b/DOAN.Service/MES/Material/MmInventoryService.cs
@@ -668,5 +668,21 @@ namespace DOAN.Service.BZFM
 
             return query.ToPage(pager);
         }
+
+        /// <summary>
+        /// 查询出/入记录列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public PagedInfo<InboundReceiptDto> GetInOrOutRecord()
+        {
+            var predicate = QueryExp();
+
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .ToPage(parm);
+
+            return response;
+        }
     }
 }