From b3161057d7d5adb02f0633b6a67edd7279ff1f5f Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Tue, 18 Feb 2025 13:26:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E8=B4=A7=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DOAN.Service/Mobile/ReportFlowService.cs | 52 ++++++++++++++++--------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/DOAN.Service/Mobile/ReportFlowService.cs b/DOAN.Service/Mobile/ReportFlowService.cs
index c6c8547..52fb890 100644
--- a/DOAN.Service/Mobile/ReportFlowService.cs
+++ b/DOAN.Service/Mobile/ReportFlowService.cs
@@ -147,19 +147,28 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
         Worker = string.IsNullOrEmpty(NickName) ? Worker + "|异常人员|" : NickName;
         if (Exist)
         {
-            result = Context.Updateable<ProReportwork01>()
-                .Where(it => it.Workorder == workorder && it.ProcessId == processId)
-                .SetColumns(it => it.FinishNum == finish_num)
-                  .SetColumns(it => it.RouteId == 32)
-                .SetColumns(it => it.BadNum == bad_num)
-                .SetColumns(it => it.Worker == Worker)
-                .SetColumns(it => it.JobDateTime == DateTime.Now)
-                .SetColumns(it => it.UpdatedBy == Worker)
-                .SetColumns(it => it.UpdatedTime == DateTime.Now)
-                .ExecuteCommand();
-            Context.Updateable<ProWorkorder>().Where(it => it.Workorder == workorder)
-                .SetColumns(it => it.CustomerOrder == customer_order)
-                .ExecuteCommand();
+            UseTran2(() =>
+            {
+                result = Context.Updateable<ProReportwork01>()
+             .Where(it => it.Workorder == workorder && it.ProcessId == processId)
+             .SetColumns(it => it.FinishNum == finish_num)
+               .SetColumns(it => it.RouteId == 32)
+             .SetColumns(it => it.BadNum == bad_num)
+             .SetColumns(it => it.Worker == Worker)
+             .SetColumns(it => it.JobDateTime == DateTime.Now)
+             .SetColumns(it => it.UpdatedBy == Worker)
+             .SetColumns(it => it.UpdatedTime == DateTime.Now)
+             .ExecuteCommand();
+                Context.Updateable<ProWorkorder>().Where(it => it.Workorder == workorder)
+                    .SetColumns(it => it.CustomerOrder == customer_order)
+                    .ExecuteCommand();
+                //出货工序      
+                Context.Updateable<ProWorkorder>()
+                    .SetColumns(it => it.ShipmentNum == finish_num)
+                    .Where(it => it.Workorder == workorder).ExecuteCommand();
+            });
+
+
 
         }
         else
@@ -175,10 +184,19 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
             proReportwork01.JobDateTime = DateTime.Now;
             proReportwork01.CreatedBy = Worker;
             proReportwork01.CreatedTime = DateTime.Now;
-            result = Context.Insertable(proReportwork01).ExecuteCommand();
-            Context.Updateable<ProWorkorder>().Where(it => it.Workorder == workorder)
-              .SetColumns(it => it.CustomerOrder == customer_order)
-              .ExecuteCommand();
+            UseTran2(() =>
+            {
+                result = Context.Insertable(proReportwork01).ExecuteCommand();
+                Context.Updateable<ProWorkorder>().Where(it => it.Workorder == workorder)
+                  .SetColumns(it => it.CustomerOrder == customer_order)
+                  .ExecuteCommand();
+                //出货工序      
+                Context.Updateable<ProWorkorder>()
+                    .SetColumns(it => it.ShipmentNum == finish_num)
+                    .Where(it => it.Workorder == workorder).ExecuteCommand();
+
+            });
+
 
         }
         return result > 0;