From 8b206b257cf0deb95d388dab146345bd7029f400 Mon Sep 17 00:00:00 2001 From: git_rabbit Date: Fri, 9 Jan 2026 14:12:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=89=E5=8F=B7=E5=8F=AF=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DOAN.Model/MES/Material/Dto/MmInventoryDto.cs | 3 +- .../MES/Material/Dto/MmRecordInboundDto.cs | 4 ++ .../MES/Material/MmInventoryService.cs | 5 +- .../MES/Material/MmRecordInboundService.cs | 50 +++++++++++++------ 4 files changed, 41 insertions(+), 21 deletions(-) diff --git a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs index 03b54a3..1732aa8 100644 --- a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs +++ b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs @@ -30,9 +30,10 @@ namespace DOAN.Model.BZFM.Dto public string MaterialName { get; set; } - public string WarehouseCode { get; set; } + public string WarehouseCode { get; set; } + public string WarehouseName { get; set; } [Required(ErrorMessage = "库位编码不能为空")] diff --git a/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs b/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs index 04eb49f..9a6ed56 100644 --- a/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs +++ b/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs @@ -16,6 +16,8 @@ namespace DOAN.Model.BZFM.Dto public string InboundNo { get; set; } public string TransactionType { get; set; } + + public string StoveCode { get; set; } } /// @@ -31,6 +33,8 @@ namespace DOAN.Model.BZFM.Dto public string Operator { get; set; } + public string StoveCode { get; set; } + public string SupplierName { get; set; } public string SupplierCode { get; set; } diff --git a/DOAN.Service/MES/Material/MmInventoryService.cs b/DOAN.Service/MES/Material/MmInventoryService.cs index 77885cb..089d398 100644 --- a/DOAN.Service/MES/Material/MmInventoryService.cs +++ b/DOAN.Service/MES/Material/MmInventoryService.cs @@ -257,7 +257,6 @@ namespace DOAN.Service.BZFM MaterialName = mmMaterial.MaterialName, SupplierCode = mmMaterial.SupplierCode, SupplierName = mmMaterial.SupplierName, - LocationCode = mmLocation.LocationCode, LocationName = mmLocation.LocationName, WarehouseCode = mmLocation.WarehouseCode, @@ -564,7 +563,7 @@ namespace DOAN.Service.BZFM message = $"库位名称不可为空，第{row + 1}行"; break; } - + //09 创建时间 NPOI.SS.UserModel.ICell currentCell_08 = currentRow.GetCell(8); inventory.CreatedTime = currentCell_08?.DateCellValue ?? DateTime.Now; @@ -579,8 +578,6 @@ namespace DOAN.Service.BZFM { return null; } - - } // TODO 3.调用SplitInsert方法实现导入操作,注意主键列的配置(建议优化为，ID相同则修改，不同则新增) diff --git a/DOAN.Service/MES/Material/MmRecordInboundService.cs b/DOAN.Service/MES/Material/MmRecordInboundService.cs index f62d39b..4d22c6c 100644 --- a/DOAN.Service/MES/Material/MmRecordInboundService.cs +++ b/DOAN.Service/MES/Material/MmRecordInboundService.cs @@ -15,7 +15,10 @@ namespace DOAN.Service.BZFM /// /// 入库记录表Service业务层处理 /// - [AppService(ServiceType = typeof(IMmRecordInboundService), ServiceLifetime = LifeTime.Transient)] + [AppService( + ServiceType = typeof(IMmRecordInboundService), + ServiceLifetime = LifeTime.Transient + )] public class MmRecordInboundService : BaseService, IMmRecordInboundService { /// @@ -25,7 +28,6 @@ namespace DOAN.Service.BZFM /// public PagedInfo GetList(MmRecordInboundQueryDto parm) { - var predicate = QueryExp(parm); var response = Queryable() @@ -35,7 +37,6 @@ namespace DOAN.Service.BZFM return response; } - /// /// 获取详情 /// @@ -43,9 +44,7 @@ namespace DOAN.Service.BZFM /// public MmRecordInbound GetInfo(int Id) { - var response = Queryable() - .Where(x => x.Id == Id) - .First(); + var response = Queryable().Where(x => x.Id == Id).First(); return response; } @@ -84,12 +83,32 @@ namespace DOAN.Service.BZFM parm.CreatedTime[0] = parm.CreatedTime[0].Date; parm.CreatedTime[1] = parm.CreatedTime[1].Date; } - var predicate = Expressionable.Create() - .AndIF(!string.IsNullOrEmpty(parm.SupplierCode), it => it.SupplierCode.Contains(parm.SupplierCode)) - .AndIF(!string.IsNullOrEmpty(parm.Operator), it => it.Operator.Contains(parm.Operator)) - .AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode)) - .AndIF(!string.IsNullOrEmpty(parm.InboundNo), it => it.InboundNo.Contains(parm.InboundNo)) - .AndIF(!string.IsNullOrEmpty(parm.TransactionType), it => it.TransactionType.Contains(parm.TransactionType)) + var predicate = Expressionable + .Create() + .AndIF( + !string.IsNullOrEmpty(parm.SupplierCode), + it => it.SupplierCode.Contains(parm.SupplierCode) + ) + .AndIF( + !string.IsNullOrEmpty(parm.Operator), + it => it.Operator.Contains(parm.Operator) + ) + .AndIF( + !string.IsNullOrEmpty(parm.MaterialCode), + it => it.MaterialCode.Contains(parm.MaterialCode) + ) + .AndIF( + !string.IsNullOrEmpty(parm.StoveCode), + it => it.StoveCode.Contains(parm.StoveCode) + ) + .AndIF( + !string.IsNullOrEmpty(parm.InboundNo), + it => it.InboundNo.Contains(parm.InboundNo) + ) + .AndIF( + !string.IsNullOrEmpty(parm.TransactionType), + it => it.TransactionType.Contains(parm.TransactionType) + ) .AndIF( parm.CreatedTime != null && parm.CreatedTime[0] > DateTime.MinValue, it => it.CreatedTime >= parm.CreatedTime[0] @@ -135,7 +154,8 @@ namespace DOAN.Service.BZFM //01 创建时间 NPOI.SS.UserModel.ICell currentCell_01 = currentRow.GetCell(1); - recordinbound.CreatedTime = currentCell_01?.DateCellValue ?? DateTime.Now; + recordinbound.CreatedTime = + currentCell_01?.DateCellValue ?? DateTime.Now; //02 入库单号 NPOI.SS.UserModel.ICell currentCell_02 = currentRow.GetCell(2); @@ -272,8 +292,6 @@ namespace DOAN.Service.BZFM { return null; } - - } // TODO 3.调用SplitInsert方法实现导入操作,注意主键列的配置(建议优化为，ID相同则修改，不同则新增) @@ -357,4 +375,4 @@ namespace DOAN.Service.BZFM return query.ToPage(pager); } } -} \ No newline at end of file +}