From c9fe2c53364abe0e0e495a1b756267f865159e2e Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期三, 25 六月 2025 12:17:26 +0800
Subject: [PATCH] Merge branch 'csc'

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

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 4839936..4cc999e 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -2040,7 +2040,7 @@
                 if (string.IsNullOrWhiteSpace(boxNo))//鏁存墭鎷ｈ揣
                 {
                     List<DataBoxInfo> boxInfos;
-                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo);//鎵惧埌鎵樼洏涓婃墍鏈夌鐮�
+                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);//鎵惧埌鎵樼洏涓婃墍鏈夌鐮�
                     boxInfos = await boxInfo.ToListAsync();
                     if (boxInfo.Count() <= 0)
                     {
@@ -2112,14 +2112,20 @@
                     {
                         await Db.Updateable(stock).ExecuteCommandAsync();
                     }
-                    //鏀瑰彉鎵樼洏鐘舵�佷负锛氭湭浣跨敤
-                    var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
-                    if (pallet == null)
+                    //鍒ゆ柇鎵樼洏涓婅繕鏈夋病鏈夊叾浠栫墿鏂�
+                    var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
+                    if (palletData == null)
                     {
-                        throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+                        //鏀瑰彉鎵樼洏鐘舵�佷负锛氭湭浣跨敤
+                        var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
+                        if (pallet == null)
+                        {
+                            throw Oops.Bah("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+                        }
+                        pallet.Status = "0";
+                        await Db.Updateable(pallet).ExecuteCommandAsync();
                     }
-                    pallet.Status = "0";
-                    await Db.Updateable(pallet).ExecuteCommandAsync();
+                    
                     //淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
                     noticeDetail.CompleteQty += pickQty;
                     await Db.Updateable(noticeDetail).ExecuteCommandAsync();
@@ -2541,7 +2547,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();
                 }
@@ -2642,6 +2650,7 @@
                         throw Oops.Bah("闇�瑕佸灈鏁板ぇ浜庡簱瀛樺灈鏁帮紝璇烽噸鏂拌緭鍏�!");
                     }
                 }
+                stockDetail = new AllotSku().GetDataListOrder(stockDetail);
                 //鑾峰彇搴撳瓨鎬昏〃淇℃伅
                 var stock = await Db.Queryable<DataStock>().FirstAsync(s => s.IsDel == "0" && s.SkuNo == "100099");
                 //楠岃瘉搴撳瓨鎬昏〃鏄惁涓虹┖
@@ -2745,7 +2754,7 @@
                         Type = "1",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟  2 绉诲簱浠诲姟
                         Status = "1",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
                         OrderType = "1",//0 鍏ュ簱鍗� 1 鍑哄簱鍗�  2 鐩樼偣鍗�  3 绉诲簱鍗�
-                        CreateTime = serverTime, //鍒涘缓鏃堕棿
+                        CreateTime = Db.GetDate(), //鍒涘缓鏃堕棿
                         CreateUser = userId, //鍒涘缓浜�
                         Msg = "Pda绌烘墭浠�" + s.LocatNo + "鍒�" + model.OutMode + "鐨勫嚭搴撲换鍔�", //鍏抽敭淇℃伅
                         //FinishDate = serverTime, //瀹屾垚鏃堕棿

--
Gitblit v1.8.0