From 7c274192786484237d4260aa2590cbbb6a64a95d Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 19 十二月 2025 11:42:29 +0800
Subject: [PATCH] 修改成品拣货逻辑

---
 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 351a2c9..3d5bf1a 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -126,7 +126,6 @@
                 bool isNew = false;
 
                 var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);
-                //var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
 
                 if (pinStockDetail != null)
                 {
@@ -137,13 +136,12 @@
 
                     if (palletNo != palletNoNew)//闈炴暣鎵樻嫞璐�                                                
                     {
-                        //var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id != pinStockDetail.Id).ToList();
                         var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew).ToList();
-                        //鍙厑璁哥粦瀹氬悓涓�涓嚭搴撳崟涓嬬殑鐗╂枡
-                        if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
-                        {
-                            throw Oops.Bah("鎷兼墭鎵樼洏涓婂彧鑳芥斁鍚屼竴涓嚭搴撳崟涓嬬殑鐗╂枡锛�");
-                        }
+                        ////鍙厑璁哥粦瀹氬悓涓�涓嚭搴撳崟涓嬬殑鐗╂枡
+                        //if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
+                        //{
+                        //    throw Oops.Bah("鎷兼墭鎵樼洏涓婂彧鑳芥斁鍚屼竴涓嚭搴撳崟涓嬬殑鐗╂枡锛�");
+                        //}
                     }
 
                     sdId = pinStockDetail.Id;
@@ -160,11 +158,11 @@
                     if (newPalletInfo.Status == "0")
                     {
                         var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && (m.SkuNo != stockDetail.SkuNo || m.LotNo != stockDetail.LotNo)).ToList();
-                        //鍙厑璁哥粦瀹氬悓涓�涓嚭搴撳崟涓嬬殑鐗╂枡
-                        if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
-                        {
-                            throw Oops.Bah("涓�涓墭鐩樺彧鑳芥帴鍙椾竴涓嚭搴撳崟鎷兼墭锛�");
-                        }
+                        ////鍙厑璁哥粦瀹氬悓涓�涓嚭搴撳崟涓嬬殑鐗╂枡
+                        //if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
+                        //{
+                        //    throw Oops.Bah("涓�涓墭鐩樺彧鑳芥帴鍙椾竴涓嚭搴撳崟鎷兼墭锛�");
+                        //}
                     }
                     else
                     {

--
Gitblit v1.8.0