From 1b804d3e0c990bd45be003170a5e1cd8138b3743 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期六, 23 三月 2024 15:00:52 +0800
Subject: [PATCH] 修改信息

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

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 3b03e81..7172e55 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -67,6 +67,11 @@
                 {
                     throw new Exception("鎵樼洏鐮佷负绌猴紝璇疯緭鍏ユ墭鐩樼爜");
                 }
+                var palletInfo = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
+                if (!string.IsNullOrEmpty(palletInfo.WareHouseNo))
+                {
+                    throw new Exception("璇ユ墭鐩樿繕鏈嚭搴�");
+                }
                 if (type == "1")//骞冲簱鍑哄簱鑾峰彇鍗曟嵁
                 {
                     var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "1" && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToList();
@@ -242,7 +247,19 @@
                         {
                             foreach (var demo in list)
                             {
-                                var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 == demo.BoxNo);
+                                //if (!string.IsNullOrWhiteSpace(boxNo3))
+                                //{
+                                //    var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 == demo.BoxNo);
+                                //}
+                                //else if (!string.IsNullOrWhiteSpace(boxNo))
+                                //{
+                                //    if (expr)
+                                //    {
+                                        
+                                //    }
+                                    
+                                //}
+                                var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 != null && m.BoxNo3 == demo.BoxNo);
                                 if (com != null)
                                 {
                                     demo.PickedQty = com.CompleteQty;

--
Gitblit v1.8.0