From 137bb18abe92045492294e0f8303af3103a37b93 Mon Sep 17 00:00:00 2001
From: DESKTOP-9BNTV8O <DESKTOP-9BNTV8O@163.com>
Date: 星期一, 10 三月 2025 09:47:41 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllTransServer/RcsServer.cs | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/Wms/WMS.BLL/BllTransServer/RcsServer.cs b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
index 63f8680..4eda808 100644
--- a/Wms/WMS.BLL/BllTransServer/RcsServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
@@ -65,7 +65,12 @@
//寮�濮嬩簨鍔�
Db.BeginTran();
-
+ //鍒ゆ柇鍙枡璁惧鏄惁鏄疉鍖虹殑娣锋枡璁惧03锛岃璁惧鏄帴鏂欐贩鏂欎竴浣撴満锛孉GV鍙《搴旇鍙噣妗舵帴鏂�
+ if (houseNo=="M03" && model.Location == "125" && model.Type=="1")
+ {
+ model.Type = "0";
+ }
+ string agvMsg = string.Empty;
switch (model.Type)
{
case "0"://鎺ユ枡璁惧鍙噣妗�
@@ -284,7 +289,7 @@
throw new Exception($"璧峰鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦紝妗跺彿锛歿item.LocatNo}");
}
- taskNo = new Common().GetMaxNo("TK");//浠诲姟鍙�
+ taskNo = new Common().GetMaxNo("TN");//浠诲姟鍙�
var logTaskEntry2 = new LogTask
{
TaskNo = taskNo,
@@ -318,7 +323,7 @@
};
//缁欎笅杞︿笅鍙戜换鍔�
logTaskEntry2.SendDate = DateTime.Now;//鍙戦�佹椂闂�
- var agvResult2 = CreateTaskForAgv(task2, url);
+ var agvResult2 = CreateTaskForAgv(task2, url, out agvMsg);
if (agvResult2)//鎴愬姛
{
//璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
@@ -338,6 +343,7 @@
else//澶辫触
{
logTaskEntry2.IsSuccess = 0;
+ logTaskEntry2.Information = agvMsg;
Db.Insertable(logTaskEntry2).ExecuteCommand();
}
@@ -357,7 +363,7 @@
throw new Exception($"璧峰鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦紝妗跺彿锛歿pallet.LocatNo}");
}
- taskNo = new Common().GetMaxNo("TK");//浠诲姟鍙�
+ taskNo = new Common().GetMaxNo("TN");//浠诲姟鍙�
//浠诲姟淇℃伅
var logTaskEntry = new LogTask
{
@@ -393,7 +399,7 @@
};
//缁欎笅杞︿笅鍙戜换鍔�
logTaskEntry.SendDate = DateTime.Now;//鍙戦�佹椂闂�
- var agvResult = CreateTaskForAgv(task, url);
+ var agvResult = CreateTaskForAgv(task, url, out agvMsg);
if (agvResult)//鎴愬姛
{
//璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
@@ -413,6 +419,7 @@
else//澶辫触
{
logTaskEntry.IsSuccess = 0;
+ logTaskEntry.Information = agvMsg;
Db.Insertable(logTaskEntry).ExecuteCommand();
}
@@ -638,7 +645,7 @@
break;
}
- taskNo = new Common().GetMaxNo("TK");//浠诲姟鍙�
+ taskNo = new Common().GetMaxNo("TN");//浠诲姟鍙�
//浠诲姟淇℃伅
var logTaskEntry = new LogTask
{
@@ -670,9 +677,10 @@
Crtype = "0",//鍏ュ簱
WareHouseNo = houseNo
};
+ string agvMsg = string.Empty;
//缁欎笅杞︿笅鍙戜换鍔�
logTaskEntry.SendDate = DateTime.Now;//鍙戦�佹椂闂�
- var agvResult = CreateTaskForAgv(task, url);
+ var agvResult = CreateTaskForAgv(task, url, out agvMsg);
if (agvResult)//鎴愬姛
{
//璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
@@ -692,6 +700,7 @@
else//澶辫触
{
logTaskEntry.IsSuccess = 0;
+ logTaskEntry.Information = agvMsg;
Db.Insertable(logTaskEntry).ExecuteCommand();
}
//鎻愪氦浜嬪姟
@@ -776,7 +785,8 @@
Crtype = "2",
};
string taskNo = "";
- CreateTaskForAgv(ztask, url);
+ string agvMsg = string.Empty;
+ CreateTaskForAgv(ztask, url, out agvMsg);
statrtLocat.Status = "3";//鍑哄簱涓�
//淇敼璧峰鍌ㄤ綅鐘舵��
@@ -818,7 +828,8 @@
Crtype = "1",
};
string taskNo = "";
- CreateTaskForAgv(task,url);
+ string agvMsg = string.Empty;
+ CreateTaskForAgv(task, url, out agvMsg);
}
catch (Exception ex)
{
@@ -1149,9 +1160,10 @@
Pallno = logTaskEntry.PalletNo,
Crtype = logTaskEntry.Type,
};
+ string agvMsg = string.Empty;
//缁欎笅杞︿笅鍙戜换鍔�
logTaskEntry.SendDate = DateTime.Now;//鍙戦�佹椂闂�
- var agvResult = CreateTaskForAgv(task, url);
+ var agvResult = CreateTaskForAgv(task, url, out agvMsg);
if (agvResult)//鎴愬姛
{
//璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
@@ -1171,6 +1183,7 @@
else//澶辫触
{
logTaskEntry.IsSuccess = 0;
+ logTaskEntry.Information = agvMsg;
Db.Insertable(logTaskEntry).ExecuteCommand();
}
@@ -1190,7 +1203,7 @@
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
- public bool CreateTaskForAgv(TaskDetial taskDetial, string url)
+ public bool CreateTaskForAgv(TaskDetial taskDetial, string url, out string agvMsg, string priority=null)
{
bool result = false;
@@ -1240,6 +1253,7 @@
agvTask.positionCodePath = pahtList;//灏忚溅璺緞
agvTask.podCode = "";
agvTask.userCallCode = "";//taskDetial.Endport;//鐩爣浣嶇疆
+ agvTask.priority = priority;//浼樺厛绾�
//鍒ゆ柇瀹瑰櫒绫诲瀷
if (taskDetial.WareHouseNo == "M04")//鍠峰共杞﹂棿
{
@@ -1271,6 +1285,8 @@
if (agvModel.Code == "0")
{
result = true;//缁欎笅杞︿笅鍙戜换鍔℃垚鍔�
+
+ agvMsg = "";
}
else
{
@@ -1285,6 +1301,8 @@
}
var logStr = $@".\log\AGV\AGV{logMsg}" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
LogFile.SaveLogToFile($"AGV{logMsg}寮傚父锛�( {agvModel.Message} ),", logStr);
+
+ agvMsg = agvModel.Message;
}
return result;
#endregion
@@ -1376,7 +1394,7 @@
#endregion
//缁欎笅杞︿笅鍙戠Щ搴撲换鍔�
- var taskNo = new Common().GetMaxNo("TK");//浠诲姟鍙�
+ var taskNo = new Common().GetMaxNo("TN");//浠诲姟鍙�
//浠诲姟淇℃伅
var logTaskEntry = new LogTask
{
@@ -1410,9 +1428,10 @@
Crtype = "1",//鍙《
WareHouseNo = palletInfoYi.WareHouseNo//杞﹂棿缂栫爜
};
+ string agvMsg = string.Empty;
//缁欎笅杞︿笅鍙戜换鍔�
logTaskEntry.SendDate = DateTime.Now;//鍙戦�佹椂闂�
- var agvResult = CreateTaskForAgv(task, url);
+ var agvResult = CreateTaskForAgv(task, url, out agvMsg, "70");
if (agvResult)//鎴愬姛
{
//璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
@@ -1432,6 +1451,10 @@
}
else//澶辫触
{
+ logTaskEntry.IsSuccess = 0;
+ logTaskEntry.Information = agvMsg;
+ Db.Insertable(logTaskEntry).ExecuteCommand();
+
throw new Exception($"缁欏皬杞︿笅鍙戠Щ搴撲换鍔″け璐ワ紝妗跺彿锛歿palletInfoYi.PalletNo}");
}
}
--
Gitblit v1.8.0