From edbaa2b80abdc9e5de779dcd0bdda33b2f16f0b4 Mon Sep 17 00:00:00 2001 From: wxw <Administrator@DESKTOP-5BIMHQ3> Date: 星期一, 14 七月 2025 15:57:48 +0800 Subject: [PATCH] 修改问题 --- Wms/WMS.BLL/HttpServer.cs | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Wms/WMS.BLL/HttpServer.cs b/Wms/WMS.BLL/HttpServer.cs index 97b2d33..55e1e9a 100644 --- a/Wms/WMS.BLL/HttpServer.cs +++ b/Wms/WMS.BLL/HttpServer.cs @@ -1468,7 +1468,7 @@ var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == task.PalletNo).ToList(); //鍒ゆ柇鏄惁鏄洖娴佸叆搴撳畬鎴� - if (!stockDetail.Any()) + if (!stockDetail.Any() && task.EndLocat!= "B100101")//B100101鏄┖鎵樼洏鏀堕泦鍣紝涓嶇敤鏍¢獙搴撳瓨 { throw new Exception("娌℃湁鏌ヨ鍒板簱瀛樹俊鎭�"); } @@ -1774,7 +1774,11 @@ } else if (locateEnd.Status != "0") { - throw new Exception("鐩爣鍌ㄤ綅鐘舵�佷笉鏄┖鍌ㄤ綅"); + var logEnd = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.Status == "1" && w.EndLocat == locateEnd.LocatNo); + if (logEnd != null && logEnd.PalletNo != palletNo) + { + throw new Exception("鐩爣鍌ㄤ綅鐘舵�佷笉鏄┖鍌ㄤ綅"); + } } #endregion -- Gitblit v1.8.0