From 51e70875c122a5c70b93a2cf083530cad6545494 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 02 八月 2025 14:37:50 +0800
Subject: [PATCH] 修改PDA空托出库问题
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 7bb5981..0b84754 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -2822,8 +2822,8 @@
//鑾峰彇褰撳墠鏃堕棿
DateTime serverTime = Db.GetDate();
//鑾峰彇搴撳瓨鏄庣粏鏄惁灏忎簬绛変簬璇ュ灈鏁�
-
- var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0" && !string.IsNullOrWhiteSpace(s.WareHouseNo)).ToListAsync();
+
+ var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0" && s.WareHouseNo == "W02").ToListAsync();
if (stockDetail.Count > 0)
{
//鍒ゆ柇鏄惁澶т簬闇�瑕佸灈鏁�
@@ -2840,16 +2840,26 @@
{
throw Oops.Bah("搴撳瓨淇℃伅涓嶅瓨鍦紝璇锋牳鏌�!");
}
-
+ //鐩爣鍌ㄤ綅淇℃伅
+ var endLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.OutMode);
+ if (endLocat == null)
+ {
+ throw Oops.Bah("搴撳瓨淇℃伅涓嶅瓨鍦紝璇锋牳鏌�!");
+ }
+ //if (endLocat.Status != "0")
+ //{
+ // throw Oops.Bah("鐩爣鍌ㄤ綅涓嶆槸绌哄偍浣嶏紝璇锋牳鏌�!");
+ //}
int i = 0;
+ //寮�鍚簨鍔�
Db.BeginTran();
//閬嶅巻搴撳瓨淇℃伅
foreach (var s in stockDetail)
{
//鑾峰彇鍌ㄤ綅淇℃伅
- var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && (l.WareHouseNo == "W01"||l.WareHouseNo == "W02"));
+ var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && l.WareHouseNo == "W02");
if (locat == null)
{
@@ -2863,7 +2873,7 @@
locat.Status = "3"; //3 鍑哄簱涓�
locat.UpdateTime = serverTime; //淇敼鏃堕棿
locat.UpdateUser = userId; //淇敼浜�
- //淇敼鍌ㄤ綅淇℃伅
+ //淇敼鍌ㄤ綅淇℃伅
await Db.Updateable(locat).ExecuteCommandAsync();
//澧炲姞搴撳瓨閿佸畾鏁伴噺
@@ -2908,7 +2918,7 @@
Status = "1",
LogisticsId = 0,
IsAdvance = "0",
- OutMode = model.OutMode,//鍑哄簱鍙�
+ OutMode = model.OutMode,//鍑哄簱鐩爣鍌ㄤ綅
CreateUser = userId,
CreateTime = DateTime.Now
@@ -2959,7 +2969,7 @@
EndRoadway = endroad,
Order = 999,
- Type = locat.WareHouseNo == "W01"?PLCTypeEnum.ShuttleCar : PLCTypeEnum.AGV
+ Type = PLCTypeEnum.AGV,//locat.WareHouseNo == "W01"?PLCTypeEnum.ShuttleCar : PLCTypeEnum.AGV
});
await Db.Insertable(exTask).ExecuteCommandAsync();
--
Gitblit v1.8.0