From 8a7469560023a6efa8178f17542f4be4005b33af Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 24 六月 2025 16:17:33 +0800
Subject: [PATCH] Merge branch 'wxw'

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

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index bdd23ce..a93a59a 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -2541,7 +2541,9 @@
                 {
                     stockDetail.Status = "0";
                 }
-                if (stockDetail.Qty <= 0)
+                //鍒ゆ柇鎵樼洏涓婅繕鏈夋病鏈夊叾浠栫墿鏂�
+                var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
+                if (stockDetail.Qty <= 0 && palletData == null)
                 {
                     await Db.Deleteable(stockDetail).ExecuteCommandAsync();
                 }

--
Gitblit v1.8.0