From c250003dc425746c0b31598b8966a785a5aac473 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 24 二月 2024 11:17:47 +0800
Subject: [PATCH] pda开发agv转运
---
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 58006e1..bc3aad1 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -1761,8 +1761,6 @@
{
throw new Exception("-1:鍗曟嵁鍙蜂笉鍙负绌�!");
}
- //鏍规嵁鍗曟嵁鍙疯幏鍙栧叆搴撳崟鎬诲崟
- var notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo);
if (model.AsnDetailId == null || model.AsnDetailId == 0)
{
throw new Exception("-1:鐗╂枡涓嶅彲涓虹┖!");
@@ -1770,6 +1768,12 @@
if (string.IsNullOrEmpty(model.PalletNo))
{
throw new Exception("-1:鎵樼洏鍙蜂笉鍙负绌�!");
+ }
+ //鏍规嵁鍗曟嵁鍙疯幏鍙栧叆搴撳崟鎬诲崟
+ var notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo);
+ if (notice.Status != "0" && notice.Status != "1")
+ {
+ throw new Exception("-1:鍏ュ簱鍗曠姸鎬佷笉鏄瓑寰呮墽琛屾垨鎵ц瀹屾垚!");
}
if (string.IsNullOrEmpty(model.LotNo))
{
@@ -1815,6 +1819,12 @@
if (pallet == null)
{
throw new Exception("鏈煡璇㈠埌鎵樼洏淇℃伅锛岃鏍稿疄锛�");
+ }
+ //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱澶�
+ var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
+ if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo))
+ {
+ throw new Exception("璇ユ墭鐩樻湭鍦ㄥ簱澶栵紝璇锋牳瀹烇紒");
}
// 楠岃瘉鍏ュ簱鍗曟槑缁嗘槸鍚﹀瓨鍦�
var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo && m.LotNo.Contains(model.LotNo));
@@ -2079,6 +2089,13 @@
//楠岃瘉搴撳瓨鏄惁鎷ユ湁璇ユ墭淇℃伅
if (stockDetail != null && stockDetail.Count > 0)
{
+ foreach (var item in stockDetail)
+ {
+ if (!string.IsNullOrEmpty(item.WareHouseNo))
+ {
+ throw new Exception("璇ユ墭鐩樻湭鍦ㄥ簱澶栵紝璇锋牳鏌�!");
+ }
+ }
iscount = 1; //鍥炴祦鍏ュ簱
}
#endregion
--
Gitblit v1.8.0