From 3d98d742e5b215b792fb0b618a145a2ec9535c7f Mon Sep 17 00:00:00 2001
From: git_rabbit <zhaozhengyi1b@126.com>
Date: Mon, 2 Mar 2026 19:50:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=96=B0=E6=97=B6=E6=9C=BA=E5=92=8C?=
 =?UTF-8?q?=E6=9D=90=E6=96=99=E5=87=BA=E5=BA=93=E8=AE=B0=E5=BD=95=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E7=AC=A6=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复ReportFlowService中工单信息更新逻辑，将其移至正确的位置以确保数据一致性
修正MmInventoryService中材料出库记录的操作符赋值错误，并补充遗漏的Operator字段
---
 DOAN.Service/MES/Material/MmInventoryService.cs | 3 ++-
 DOAN.Service/Mobile/ReportFlowService.cs        | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/DOAN.Service/MES/Material/MmInventoryService.cs b/DOAN.Service/MES/Material/MmInventoryService.cs
index fd21a19..27d2c65 100644
--- a/DOAN.Service/MES/Material/MmInventoryService.cs
+++ b/DOAN.Service/MES/Material/MmInventoryService.cs
@@ -378,7 +378,7 @@ namespace DOAN.Service.BZFM
                     {
                         OutboundNo = outboundNo,
                         BatchNo = parm.BatchNo,
-                        StoveCode = parm.Operator = parm.Operator,
+                        StoveCode = parm.StoveCode,
                         MaterialCode = mmMaterial.MaterialCode,
                         MaterialName = mmMaterial.MaterialName,
                         SupplierCode = mmMaterial.SupplierCode,
@@ -397,6 +397,7 @@ namespace DOAN.Service.BZFM
                         WorkorderRaw = parm.WorkorderRaw,
                         OrderNo = parm.OrderNo,
                         Remarks = parm.Remarks,
+                        Operator = parm.Operator,
                     };
                     Context.Insertable(newRecord).ExecuteCommand();
                     Context.Ado.CommitTran();
diff --git a/DOAN.Service/Mobile/ReportFlowService.cs b/DOAN.Service/Mobile/ReportFlowService.cs
index 4d416f9..9d90a8c 100644
--- a/DOAN.Service/Mobile/ReportFlowService.cs
+++ b/DOAN.Service/Mobile/ReportFlowService.cs
@@ -535,8 +535,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
             }
 
             workorderInfo.CustomerOrder = customer_order;
-            // 修改工单信息，绑定出货记录
-            Context.Updateable(workorderInfo).ExecuteCommand();
+            
             // 修改采购订单出货数
 
             orderPurchase.DeliveryQuantity += finish_num;
@@ -569,6 +568,8 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
             workorderInfo.ShipmentNum += finish_num;
             if (workorderInfo.ProductNum >= workorderInfo.ShipmentNum)
             {
+                // 修改工单信息，绑定出货记录
+                Context.Updateable(workorderInfo).ExecuteCommand();
                 // Todo找还有库存的成品库
 
                 // 暂时默认成品入库与出库批次号都为000