From f9d7694d27475954449ce3073938af98a4798b07 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期五, 18 七月 2025 17:37:24 +0800
Subject: [PATCH] 修复去线边的任务,完成后自动解绑失败的问题

---
 wms/SpecHelper.cs |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/wms/SpecHelper.cs b/wms/SpecHelper.cs
index 6658c78..5ae0d67 100644
--- a/wms/SpecHelper.cs
+++ b/wms/SpecHelper.cs
@@ -315,12 +315,11 @@
                                 return;
                             }
 
-                            var locCnt = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == endLoc.S_CODE);
+                            var locCnt = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == tN_Task.S_CNTR_CODE);
 
                             if (locCnt != null)
                             {
-                                var cgInfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == locCnt.S_CNTR_CODE);
-
+                                
                                 if (db.Deleteable<TN_Loc_Container>(locCnt).ExecuteCommand() > 0)
                                 {
                                     LogHelper.Info($"鍒犻櫎璐т綅瀹瑰櫒缁戝畾鍏崇郴鎴愬姛锛寋JsonConvert.SerializeObject(locCnt)}");
@@ -332,6 +331,8 @@
                                     return;
                                 }
 
+                                var cgInfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == tN_Task.S_CNTR_CODE);
+
                                 if (cgInfo != null)
                                 {
                                     if (db.Deleteable<TN_CG_Detail>(cgInfo).ExecuteCommand() > 0)
@@ -345,6 +346,21 @@
                                         return;
                                     }
                                 }
+
+                                var cnt = db.Queryable<TN_Container>().First(it => it.S_CODE == cgInfo.S_CNTR_CODE);
+                                if (cnt != null)
+                                {
+                                    if (db.Deleteable<TN_Container>(cnt).ExecuteCommand() > 0)
+                                    {
+                                        LogHelper.Info($"鍒犻櫎瀹瑰櫒鎴愬姛锛寋JsonConvert.SerializeObject(cnt)}");
+                                    }
+                                    else
+                                    {
+                                        LogHelper.Info($"鍒犻櫎瀹瑰櫒澶辫触锛寋JsonConvert.SerializeObject(cnt)}");
+                                        tran.RollbackTran();
+                                        return;
+                                    }
+                                }
                             }
                         }
 

--
Gitblit v1.9.1