diff --git a/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs b/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs index 84328ff..1e93a71 100644 --- a/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs +++ b/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs @@ -1,10 +1,9 @@ - namespace DOAN.Model.BZFM.Dto { /// /// 入库记录表查询对象 /// - public class MmRecordInboundQueryDto : PagerInfo + public class MmRecordInboundQueryDto : PagerInfo { public string SupplierCode { get; set; } @@ -66,8 +65,6 @@ namespace DOAN.Model.BZFM.Dto public string MaterialCode { get; set; } public string InboundNo { get; set; } - - [ExcelColumn(Name = "入库类型")] public string TransactionTypeLabel { get; set; } } @@ -81,26 +78,34 @@ namespace DOAN.Model.BZFM.Dto public DateTime? CreatedTime { get; set; } public string Remarks { get; set; } public string Operator { get; set; } + + public string StoveCode { get; set; } public string SupplierName { get; set; } public string SupplierCode { get; set; } public DateTime? ExpiryDate { get; set; } public DateTime? ProductionDate { get; set; } public string BatchNo { get; set; } + [Required(ErrorMessage = "入库类型不能为空")] public string TransactionType { get; set; } + [Required(ErrorMessage = "入库数量不能为空")] public decimal Quantity { get; set; } public string LocationName { get; set; } public string LocationCode { get; set; } public string WarehouseName { get; set; } + [Required(ErrorMessage = "仓库编码不能为空")] public string WarehouseCode { get; set; } public string MaterialName { get; set; } + [Required(ErrorMessage = "物料编码不能为空")] public string MaterialCode { get; set; } public string InboundNo { get; set; } + [ExcelColumn(Name = "入库类型")] public string TransactionTypeLabel { get; set; } + // 1-蓝单正向 2-红单逆向 public int ReceiptType { get; set; } = 1; } @@ -171,4 +176,4 @@ namespace DOAN.Model.BZFM.Dto [SugarColumn(ColumnName = "created_time")] public DateTime? CreatedTime { get; set; } } -} \ No newline at end of file +} diff --git a/DOAN.Model/MES/Material/MmRecordInbound.cs b/DOAN.Model/MES/Material/MmRecordInbound.cs index 0a6a4b0..59b041f 100644 --- a/DOAN.Model/MES/Material/MmRecordInbound.cs +++ b/DOAN.Model/MES/Material/MmRecordInbound.cs @@ -28,6 +28,12 @@ namespace DOAN.Model.BZFM /// public string Operator { get; set; } + /// + /// 炉号 + /// + [SugarColumn(ColumnName = "stove_code")] + public string StoveCode { get; set; } + /// /// 供应商名称 /// diff --git a/DOAN.Service/MES/Material/MmInventoryService.cs b/DOAN.Service/MES/Material/MmInventoryService.cs index 3446921..77885cb 100644 --- a/DOAN.Service/MES/Material/MmInventoryService.cs +++ b/DOAN.Service/MES/Material/MmInventoryService.cs @@ -227,7 +227,6 @@ namespace DOAN.Service.BZFM LocationName = mmLocation.LocationName, WarehouseCode = mmLocation.WarehouseCode, WarehouseName = mmLocation.WarehouseName, - BatchNo = parm.BatchNo, CurrentQty = delta, Unit = parm.Unit, @@ -253,10 +252,12 @@ namespace DOAN.Service.BZFM InboundNo = inboundNo, BatchNo = parm.BatchNo, Operator = parm.Operator, + StoveCode = parm.StoveCode, MaterialCode = mmMaterial.MaterialCode, MaterialName = mmMaterial.MaterialName, SupplierCode = mmMaterial.SupplierCode, SupplierName = mmMaterial.SupplierName, + LocationCode = mmLocation.LocationCode, LocationName = mmLocation.LocationName, WarehouseCode = mmLocation.WarehouseCode,