From f59b70427b8593ccf465339579d7b35ce4ce4c08 Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Thu, 29 Aug 2024 17:12:24 +0800
Subject: [PATCH] bug

---
 .../IPrdMoTaskService.cs                      |  9 +++++++-
 .../Tnb.ProductionMgr/PrdMoTaskService.cs     | 23 +++++++++++++++++--
 QcMgr/Tnb.QcMgr/QcCheckTaskService.cs         |  4 ++--
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs
index fb5fbf2c..514a27a9 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs
@@ -66,6 +66,13 @@ namespace Tnb.ProductionMgr.Interfaces
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        Task<dynamic> PrdTaskRelease(PrdTaskReleaseUpInput input, ISqlSugarClient db = null);
+        Task<dynamic> PrdTaskRelease(PrdTaskReleaseUpInput input);
+        
+        /// <summary>
+        /// /生产任务下发，开始 、结束、完成
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        Task<dynamic> PrdTaskRelease2(PrdTaskReleaseUpInput input, ISqlSugarClient db = null);
     }
 }
diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
index bb8d4e55..7a503e1e 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
@@ -72,6 +72,7 @@ namespace Tnb.ProductionMgr
         private static readonly Dictionary<string, object> _dicWorkLine = new();
         private static readonly Dictionary<string, object> _dicProcess = new();
         private readonly ISqlSugarClient _db;
+        private ISqlSugarClient _db2;
         private readonly IBillRullService _billRuleService;
         private readonly IPrdInstockService _prdInstockService;
         private readonly WmsPrdInstockHService _wmsPrdInstockHService;
@@ -1114,7 +1115,7 @@ namespace Tnb.ProductionMgr
         /// <exception cref="ArgumentNullException"></exception>
         /// <exception cref="NotImplementedException"></exception>
         [HttpPost]
-        public async Task<dynamic> PrdTaskRelease(PrdTaskReleaseUpInput input,ISqlSugarClient db = null)
+        public async Task<dynamic> PrdTaskRelease(PrdTaskReleaseUpInput input)
         {
             int row = -1;
             if (input is null)
@@ -1132,9 +1133,14 @@ namespace Tnb.ProductionMgr
             }
 
             bool tranFlag = true;
-            if (db==null)
+            ISqlSugarClient db = null;
+            if (_db2!=null)
             {
                 tranFlag = false;
+                db = _db2;
+            }
+            else
+            {
                 db = _repository.AsSugarClient();
             }
 
@@ -1628,6 +1634,13 @@ namespace Tnb.ProductionMgr
                 
             return "保存成功";
         }
+
+        public async Task<dynamic> PrdTaskRelease2(PrdTaskReleaseUpInput input,ISqlSugarClient db)
+        {
+            this._db2 = db;
+            await PrdTaskRelease(input);
+            return "保存成功";
+        }
         
         public async void TimeCallback(object args)
         {
@@ -3946,6 +3959,12 @@ namespace Tnb.ProductionMgr
             return !result.IsSuccess ? throw Oops.Oh(ErrorCode.COM1008) : (dynamic)(result.IsSuccess ? "操作成功" : result.ErrorMessage);
             
         }
+
+        [HttpPost]
+        public async Task<PrdMoTask> GetSchedulingInfo(string id)
+        {
+            return await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == id);
+        }
     }
 
 
diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
index b50b55b5..7269c28b 100644
--- a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
+++ b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
@@ -393,12 +393,12 @@ namespace Tnb.QcMgr
                     {
                         PrdMoTask prdMoTask = await db.Queryable<PrdMoTask>().Where(x=>x.mo_task_code==QcCheckExecH.mo_task_code && x.id!=null).FirstAsync();
                         string pauseReason = QcCheckExecH.checktype == WmsWareHouseConst.XUNJIAN_ID ? "巡检不合格" : QcCheckExecH.checktype == WmsWareHouseConst.SHOUJIAN_ID ? "首检不合格" : "末检不合格";
-                         await _prdMoTaskService.PrdTaskRelease(new PrdTaskReleaseUpInput()
+                         await _prdMoTaskService.PrdTaskRelease2(new PrdTaskReleaseUpInput()
                         {
                             TaskIds = NPOI.Util.Arrays.AsList(prdMoTask.id),
                             Behavior = "Pause",
                             PauseReeson = pauseReason
-                        });
+                        },db);
                         List<string> carryCodes = await db.Queryable<PrdReport>().Where(x=>x.mo_task_id==prdMoTask.id).Select(x=>x.material_box_code).Distinct().ToListAsync();
                         await db.Updateable<WmsCarryH>()
                             .SetColumns(x => x.is_check == ((int)EnumCheckConclusion.暂控).ToString())