From 8d39b5ce375fcdf8397202e9a4d2732ffaae0a26 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期六, 03 八月 2024 10:12:13 +0800
Subject: [PATCH] 修改取消、完成任务错误问题

---
 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 64da155..3fc7046 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -2024,10 +2024,7 @@
                 var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == task.PalletNo).ToList();
                 //褰撳墠浠诲姟涓殑鍌ㄤ綅淇℃伅
                 var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.EndLocat);
-                if (locate == null)
-                {
-                    throw new Exception($"鏈煡璇㈠埌浠诲姟涓殑鍌ㄤ綅淇℃伅");
-                }
+                
                 //鑾峰彇绠辩爜淇℃伅
                 var box1 = Db.Queryable<BllBoxInfo>().First(a => a.PalletNo == task.PalletNo && a.IsDel == "0" && a.Status != "2");
 
@@ -2049,6 +2046,11 @@
                     locate.Status = "1";
                     Db.Updateable(locate).ExecuteCommand();
                     return;
+                }
+                // 鍒ゆ柇鍌ㄤ綅鏄惁涓虹┖
+                if (locate == null)
+                {
+                    throw new Exception($"鏈煡璇㈠埌浠诲姟涓殑鍌ㄤ綅淇℃伅");
                 }
                 //鍒ゆ柇鏄惁鏄洖娴佸叆搴撳畬鎴�
                 if (stockDetail.Any())
@@ -2790,13 +2792,11 @@
                     Db.Updateable(bind).ExecuteCommand();
                 }
                 var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.EndLocat);
-                if (locate == null)
+                if (locate != null)
                 {
-                    throw new Exception("鏈煡璇㈤亾鍌ㄤ綅淇℃伅");
+                    locate.Status = "0"; //淇敼鍌ㄤ綅鐘舵��
+                    Db.Updateable(locate).ExecuteCommand();
                 }
-
-                locate.Status = "0"; //淇敼鍌ㄤ綅鐘舵��
-                Db.Updateable(locate).ExecuteCommand();
 
                 //娣诲姞鎿嶄綔鏃ュ織璁板綍
                 var k = new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", taskNo, "鍙栨秷", $"鐐瑰嚮鍙栨秷鎸夐挳鍙栨秷浜嗕换鍔″彿涓猴細{taskNo}鐨勪换鍔�", (int)userId);
@@ -2804,6 +2804,7 @@
             }
             catch (Exception e)
             {
+                Db.RollbackTran();
                 throw new Exception(e.Message);
             }
         }

--
Gitblit v1.8.0