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);
}
+
+ ///
+ /// 获取出/入库记录数据
+ ///
+ ///
+ [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; }
}
+
+ ///
+ /// 库存清单查询进出库记录对象
+ ///
+ 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
/// 获取出/入库操作类型下拉数据
///
List GetTransactionOption();
+
+ ///
+ /// 获取出/入库记录
+ ///
+ PagedInfo GetInOrOutRecord(MmInventoryRecordDto parm);
+
///
/// 创建入库单 成功返回ok ReceiptType = 1蓝单 ReceiptType = 2 红单(逆向)
///
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);
}
+
+ ///
+ /// 查询出/入记录列表
+ ///
+ ///
+ ///
+ public PagedInfo GetInOrOutRecord()
+ {
+ var predicate = QueryExp();
+
+ var response = Queryable()
+ .Where(predicate.ToExpression())
+ .ToPage(parm);
+
+ return response;
+ }
}
}