From f531e28a01f6e4faa6b7ea15cb140cd71c059d17 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期一, 08 十二月 2025 16:31:33 +0800
Subject: [PATCH] 自动分配AutoAllot和手动分配AddHandOutAllot增加w02货架库直接待拣货

---
 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 9a1b206..236c173 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -2880,7 +2880,9 @@
                                 CreateUser = userId,
                                 CreateTime = DateTime.Now
                             };
-                            if (s.WareHouseNo == "W04")
+                            //2025骞�12鏈�08鏃ヨ揣鏋跺簱鍜屽钩搴擄紝鐩存帴寰呮嫞璐�
+                            List<string> wareHouseList = new List<string>() { "W02", "W04" };
+                            if (wareHouseList.Contains(s.WareHouseNo))
                             {
                                 allot.Status = "2";//寰呮嫞璐�
                                 xQty += allot.Qty;
@@ -3336,7 +3338,9 @@
                             CreateUser = userId,
                             CreateTime = DateTime.Now
                         };
-                        if (stock.WareHouseNo == "W04")
+                        //2025骞�12鏈�08鏃ヨ揣鏋跺簱鍜屽钩搴擄紝鐩存帴寰呮嫞璐�
+                        List<string> wareHouseList = new List<string>() { "W02", "W04" };
+                        if (wareHouseList.Contains(stock.WareHouseNo))
                         {
                             allot.Status = "2";//寰呮嫞璐�
                             xQty += allot.Qty;
@@ -6525,19 +6529,22 @@
                         throw new Exception("鏈煡璇㈠埌浠诲姟淇℃伅");
                     }
                     //鑾峰彇瀵瑰簲搴撲綅淇℃伅
-                    var startlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
+                    //var startlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
+                    var startlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.LocatNo == task.StartLocat);
                     if (startlocat == null)
                     {
                         throw new Exception("鏈煡璇㈠埌鍌ㄤ綅淇℃伅");
                     }
                     startlocat.Status = "0";//淇敼鍒嗛厤淇℃伅鐘舵��
                     //鑾峰彇鍌ㄤ綅淇℃伅
-                    var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
+                    //var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
+                    var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.LocatNo == task.StartLocat);
                     //鑾峰彇绉诲簱浠籨鍔″搴旂洰鏍囧偍浣嶄俊鎭�
                     SysStorageLocat endlocat = new SysStorageLocat();
                     if (task.Type == "2")
                     {
-                        endlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.EndLocat);
+                        //endlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.EndLocat);
+                        endlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.LocatNo == task.EndLocat);
                         if (endlocat == null)
                         {
                             throw new Exception("鏈煡璇㈠埌鐩爣鍌ㄤ綅淇℃伅");
@@ -6601,7 +6608,8 @@
                         //鑾峰彇搴撳瓨
                         var datastock = Db.Queryable<DataStock>().First(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo);
                         //鑾峰彇鍌ㄤ綅淇℃伅
-                        var locate = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == stockDetail.LocatNo);
+                        //var locate = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == stockDetail.LocatNo);
+                        var locate = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.LocatNo == stockDetail.LocatNo);
 
                         //鍒ゆ柇鏄惁涓虹┖鎵樼洏
                         if (stockDetail.SkuNo == "100099")

--
Gitblit v1.8.0