From d3a16b479dc45a4892b5bfd9f6eceda93480450b Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 06 三月 2025 19:47:34 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllTransServer/RcsServer.cs | 5 +++--
Wms/WMS.BLL/SysServer/PalletsServer.cs | 18 +++++++++++-------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/Wms/WMS.BLL/BllTransServer/RcsServer.cs b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
index 63f8680..71e0415 100644
--- a/Wms/WMS.BLL/BllTransServer/RcsServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
@@ -1190,7 +1190,7 @@
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
- public bool CreateTaskForAgv(TaskDetial taskDetial, string url)
+ public bool CreateTaskForAgv(TaskDetial taskDetial, string url,string priority=null)
{
bool result = false;
@@ -1240,6 +1240,7 @@
agvTask.positionCodePath = pahtList;//灏忚溅璺緞
agvTask.podCode = "";
agvTask.userCallCode = "";//taskDetial.Endport;//鐩爣浣嶇疆
+ agvTask.priority = priority;//浼樺厛绾�
//鍒ゆ柇瀹瑰櫒绫诲瀷
if (taskDetial.WareHouseNo == "M04")//鍠峰共杞﹂棿
{
@@ -1412,7 +1413,7 @@
};
//缁欎笅杞︿笅鍙戜换鍔�
logTaskEntry.SendDate = DateTime.Now;//鍙戦�佹椂闂�
- var agvResult = CreateTaskForAgv(task, url);
+ var agvResult = CreateTaskForAgv(task, url, "70");
if (agvResult)//鎴愬姛
{
//璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
diff --git a/Wms/WMS.BLL/SysServer/PalletsServer.cs b/Wms/WMS.BLL/SysServer/PalletsServer.cs
index 8691b93..d024fa9 100644
--- a/Wms/WMS.BLL/SysServer/PalletsServer.cs
+++ b/Wms/WMS.BLL/SysServer/PalletsServer.cs
@@ -163,14 +163,18 @@
{
throw new Exception("鏈煡鍒拌澶囨墍灞炲尯鍩熶俊鎭�");
}
- if (!areaInfo.AreaName.Contains("鎺ユ枡璁惧"))
+ //125璁惧鏄帴鏂欏拰娣锋枡涓�浣撴満
+ if (deviceCode != "125")
{
- throw new Exception("鍙兘缁戝畾鎺ユ枡璁惧");
- }
- if (areaInfo.WareHouseNo != "M03")
- {
- throw new Exception("鍙湁澶у崟浣撹溅闂存墠鑳界粦瀹氳澶�");
- }
+ if (!areaInfo.AreaName.Contains("鎺ユ枡璁惧"))
+ {
+ throw new Exception("鍙兘缁戝畾鎺ユ枡璁惧");
+ }
+ if (areaInfo.WareHouseNo != "M03")
+ {
+ throw new Exception("鍙湁澶у崟浣撹溅闂存墠鑳界粦瀹氳澶�");
+ }
+ }
}
//寮�鍚簨鍔�
db.BeginTran();
--
Gitblit v1.8.0