diff --git a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs index c92c97d..6bee835 100644 --- a/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs +++ b/DOAN.Model/MES/Material/Dto/MmInventoryDto.cs @@ -223,6 +223,12 @@ namespace DOAN.Model.BZFM.Dto [SugarColumn(ColumnName = "workorder")] public string Workorder { get; set; } + /// + /// 成品号之前的原始工单号 + /// + [ExcelColumn(Name = "原始工单号")] + public string WorkorderRaw { get; set; } + [ExcelColumn(Name = "备注")] [SugarColumn(ColumnName = "remarks")] public string Remarks { get; set; } diff --git a/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs b/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs index c659861..534e4e5 100644 --- a/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs +++ b/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs @@ -128,7 +128,7 @@ namespace DOAN.Model.BZFM.Dto public string Workorder { get; set; } /// - /// 原材料工单号 + /// 原始工单号 /// public string WorkorderRaw { get; set; } diff --git a/DOAN.Service/MES/Material/MmInventoryService.cs b/DOAN.Service/MES/Material/MmInventoryService.cs index 6b1a335..8ef0dd5 100644 --- a/DOAN.Service/MES/Material/MmInventoryService.cs +++ b/DOAN.Service/MES/Material/MmInventoryService.cs @@ -736,6 +736,7 @@ namespace DOAN.Service.BZFM Operator = it.Operator, CreatedTime = it.CreatedTime, Workorder = it.Workorder, + WorkorderRaw = it.WorkorderRaw, StoveCode = it.StoveCode, Remarks = it.Remarks, }) @@ -779,6 +780,7 @@ namespace DOAN.Service.BZFM Operator = it.Operator, CreatedTime = it.CreatedTime, Workorder = it.Workorder, + WorkorderRaw = it.WorkorderRaw, OrderNo = it.OrderNo, Remarks = it.Remarks, }) diff --git a/DOAN.Service/MES/Material/MmRecordInboundService.cs b/DOAN.Service/MES/Material/MmRecordInboundService.cs index 38f7236..1116bd8 100644 --- a/DOAN.Service/MES/Material/MmRecordInboundService.cs +++ b/DOAN.Service/MES/Material/MmRecordInboundService.cs @@ -413,7 +413,6 @@ namespace DOAN.Service.BZFM inboundInfo.Remarks += $"[已领料{parm.Quantity}]"; Context.Updateable(inboundInfo).ExecuteCommand(); // 填写出库单 - //做出库红单 OutboundReceiptDto revokeRecepitDto = new() { ReceiptType = 1,