From c0ed9488d0c19ae59cf6fe175d3f31681e357d02 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期日, 04 二月 2024 16:51:51 +0800
Subject: [PATCH] 1
---
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 353c602..676cfdc 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -543,7 +543,7 @@
if (!string.IsNullOrWhiteSpace(bind.LocatNo))
{
isNullLocat = 1;
- locat = Db.Queryable<SysStorageLocat>().First(a=>a.IsDel == "0" && a.WareHouseNo == bind.WareHouseNo && a.RoadwayNo == bind.RoadwayNo && a.LocatNo == bind.LocatNo);
+ locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == bind.WareHouseNo && a.RoadwayNo == bind.RoadwayNo && a.LocatNo == bind.LocatNo);
//鍒ゆ柇鍌ㄤ綅鍦板潃鏄惁涓烘鍦ㄥ叆搴�
if (locat.Status != "2")
{
@@ -1089,9 +1089,9 @@
#endregion
#endregion
- }
+ }
storageLocat.Status = "1";
- storageLocat.UpdateTime= serverTime; //淇敼鏃堕棿
+ storageLocat.UpdateTime = serverTime; //淇敼鏃堕棿
storageLocat.UpdateUser = model.CreateUser; //淇敼浜�
//淇敼鍌ㄤ綅鐘舵��
Db.Updateable(storageLocat).ExecuteCommand();
@@ -1693,7 +1693,7 @@
noticeList.Add(entry);
}
- }
+ }
}
return noticeList;
}
@@ -1715,10 +1715,15 @@
{
#region 鍒ゆ柇
+ //0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欏叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
+ var TypeLot = "1, 2, 5, 6, 7";
+
if (string.IsNullOrEmpty(model.AsnNo))
{
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:鐗╂枡涓嶅彲涓虹┖!");
@@ -1729,7 +1734,12 @@
}
if (string.IsNullOrEmpty(model.LotNo))
{
- throw new Exception("-1:鐗╂枡鎵规涓嶅彲涓虹┖!");
+ //鍒ゆ柇鏄惁涓轰笉闄愬埗鎵规鍗曟嵁
+ if (!TypeLot.Contains(notice.Type))
+ {
+ throw new Exception("-1:鐗╂枡鎵规涓嶅彲涓虹┖!");
+ }
+
}
else
{
--
Gitblit v1.8.0