From 964db60bb3d2e9a0a695b71554a98765e900732a Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期六, 16 三月 2024 10:58:34 +0800
Subject: [PATCH] Merge branch 'yyk'

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

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 14130cd..c3031a1 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -1789,9 +1789,9 @@
                 }
                 //鏍规嵁鍗曟嵁鍙疯幏鍙栧叆搴撳崟鎬诲崟
                 var notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo);
-                if (notice.Status != "0" && notice.Status != "1")
+                if (notice.Status != "0" && notice.Status != "1" && notice.Status != "2")
                 {
-                    throw new Exception("-1:鍏ュ簱鍗曠姸鎬佷笉鏄瓑寰呮墽琛屾垨鎵ц瀹屾垚!");
+                    throw new Exception("-1:璇ュ崟鎹凡鍏冲崟!");
                 }
                 if (string.IsNullOrEmpty(model.LotNo))
                 {

--
Gitblit v1.8.0