From 17efcdf2cf1b8b99fd300f3af420b75ffdf9c47b Mon Sep 17 00:00:00 2001
From: git_rabbit <zhaozhengyi1b@126.com>
Date: Fri, 30 Jan 2026 14:05:09 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=9D=90=E6=96=99=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8E=9F=E5=A7=8B=E5=B7=A5=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BC=98=E5=8C=96=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在MmInventoryDto中添加WorkorderRaw字段用于记录成品号之前的原始工单号
- 更新MmRecordOutboundDto中WorkorderRaw字段的注释说明
- 在库存服务中处理WorkorderRaw字段的映射
- 移除出库单处理中的冗余注释
---
 DOAN.Model/MES/Material/Dto/MmInventoryDto.cs       | 6 ++++++
 DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs  | 2 +-
 DOAN.Service/MES/Material/MmInventoryService.cs     | 2 ++
 DOAN.Service/MES/Material/MmRecordInboundService.cs | 1 -
 4 files changed, 9 insertions(+), 2 deletions(-)

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; }
 
+        /// <summary>
+        /// 成品号之前的原始工单号
+        /// </summary>
+        [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; }
 
         /// <summary>
-        /// 原材料工单号
+        /// 原始工单号
         /// </summary>
         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,