From 74bcd25a8828b0b5fdf4c3bdaf7e79606b0bcf9a Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期三, 27 三月 2024 11:30:26 +0800
Subject: [PATCH] Merge branch 'yyk'

---
 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 46fad24..b563a8d 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -1233,6 +1233,20 @@
 
                 #endregion
 
+                #region 楠岃瘉鍌ㄤ綅鐘舵�佹槸鍚︽甯�
+
+                var locat = Db.Queryable<SysStorageLocat>().First(a=>a.IsDel == "0" && a.LocatNo == result.LocatNo);
+                if (locat == null)
+                {
+                    throw new Exception("鏈幏鍙栧埌瀵瑰簲鍌ㄤ綅淇℃伅锛岃妫�鏌�!");
+                }
+                if (locat.Status != "1")
+                {
+                    throw new Exception("褰撳墠鍌ㄤ綅涓嶆槸鏈夌墿鍝侊紝璇锋鏌�!");
+                }
+
+                #endregion
+
                 //鑾峰彇搴撳瓨鏄庣粏淇℃伅
                 var stockDetail = Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.PalletNo == palletNo).ToList();
                 //楠岃瘉搴撳瓨鏄庣粏淇℃伅鏄惁瀛樺湪
@@ -1284,6 +1298,10 @@
                         item.AreaNo = "";//鎵�灞炲尯鍩熸洿鏀癸紙鏀逛负绌猴級
                         Db.Updateable(item).ExecuteCommand();
                     }
+                    //鍙樻洿鍌ㄤ綅鐘舵��
+                    locat.Status = "0";//鍌ㄤ綅鏇存敼锛堟敼涓虹┖鍌ㄤ綅锛�
+                    Db.Updateable(locat).ExecuteCommand();
+
                     //鍑哄簱娴佹按锛堟洿鏀圭姸鎬侊級
                     var allot = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "1" && m.PalletNo == palletNo && m.SONo == soNo).ToList();
 

--
Gitblit v1.8.0