From 87a1c3fda0360a3890f36eebf4fefb8b0621e61e Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 12 十一月 2025 08:00:11 +0800
Subject: [PATCH] 处理同托盘再次绑定同物料批次不增加库存问题;修改同物料批次拣货异常问题

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

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index bf46865..76aa178 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -446,22 +446,26 @@
                         var locateStr = stockDetail.LocatNo;
                         await Db.Deleteable(stockDetail).ExecuteCommandAsync();
 
-                        //鏀瑰彉鎵樼洏鐘舵��
-                        var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == palletNo && m.IsDel == "0");
-                        if (pallet == null)
+                        var detailOther = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.PalletNo == stockDetail.PalletNo && w.Id != stockDetail.Id).ToList();
+                        if (detailOther.Count <= 0)
                         {
-                            throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
-                        }
-                        pallet.Status = "0";
-                        await Db.Updateable(pallet).ExecuteCommandAsync();
+                            //鏀瑰彉鎵樼洏鐘舵��
+                            var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == palletNo && m.IsDel == "0");
+                            if (pallet == null)
+                            {
+                                throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+                            }
+                            pallet.Status = "0";
+                            await Db.Updateable(pallet).ExecuteCommandAsync();
 
-                        //鏇存敼鍌ㄤ綅鐘舵�佷负绌哄偍浣�
-                        var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == locateStr);
-                        if (locate != null)
-                        {
-                            locate.Status = "0";
-                            Db.Updateable(locate).ExecuteCommand();
-                        }
+                            //鏇存敼鍌ㄤ綅鐘舵�佷负绌哄偍浣�
+                            var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == locateStr);
+                            if (locate != null)
+                            {
+                                locate.Status = "0";
+                                Db.Updateable(locate).ExecuteCommand();
+                            }
+                        }                        
                     }
                     else
                     {

--
Gitblit v1.8.0