From 97b37bd89e705fa9b3107e8ba54ce0a00f36a7d2 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期四, 16 一月 2025 08:39:15 +0800
Subject: [PATCH] AGV小车调度修改
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 7 ++-
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 66 ++++++++++++++++++++++++++-------
2 files changed, 57 insertions(+), 16 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index b146a20..59aeddc 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1065,12 +1065,13 @@
};
List<AgvSchedulingTask> agvTaskList = new List<AgvSchedulingTask>();
- Random r = new Random();
- long ran =DateTime.Now.Ticks;
+
AgvSchedulingTask agvTask = new AgvSchedulingTask();
- agvTask.TaskCode = taskNo;
+ Random r = new Random();
+ long ran = DateTime.Now.Ticks;
agvTask.ReqCode = ran.ToString();
+ agvTask.TaskCode = taskNo;
agvTask.TaskTyp = tasktype;
agvTask.PositionCodePath = position;
agvTask.CtnrTyp = "1";
@@ -1084,7 +1085,7 @@
// 姝ｅ紡杩愯绋嬪簭鏀惧紑
string str = "";
- var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
+ var list2 = agvTaskList.Select(m => m.TaskCode).ToList();
var jsonData = JsonConvert.SerializeObject(agvTaskList);
jsonData = jsonData.Substring(1, jsonData.Length - 1);
jsonData = jsonData.Substring(0, jsonData.Length - 1);
@@ -1269,7 +1270,7 @@
break;
}
- //缂撳瓨搴撲綅杞崲 3妤煎師杈呮枡Y003_001锛孻003_002锛孻003_003 1妤糦138_001鍒癥138_021澶栧寘缂撳瓨鍖� 1妤糦128_001鍒癥128_015鍐呭寘缂撳瓨鍖�
+ //缂撳瓨搴撲綅杞崲 3妤煎師杈呮枡Y003_001鍒癥003_009 1妤糦138_001鍒癥138_021澶栧寘缂撳瓨鍖� 1妤糦128_001鍒癥128_015鍐呭寘缂撳瓨鍖�
if (storageLocatEnd.AreaNo == "B12")
{
switch (EndLocat.ToString().Substring(4, 1))
@@ -1304,7 +1305,10 @@
};
AgvSchedulingTask agvTask = new AgvSchedulingTask();
- agvTask.ReqCode = taskNo;
+ Random r = new Random();
+ long ran = DateTime.Now.Ticks;
+ agvTask.ReqCode = ran.ToString();
+ agvTask.TaskCode = taskNo;
agvTask.TaskTyp = tasktype;
agvTask.PositionCodePath = position;
@@ -1352,7 +1356,7 @@
{
// 姝ｅ紡杩愯绋嬪簭鏀惧紑
string str = "";
- var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
+ var list2 = agvTaskList.Select(m => m.TaskCode).ToList();
var jsonData = JsonConvert.SerializeObject(agvTaskList);
jsonData = jsonData.Substring(1, jsonData.Length - 1);
jsonData = jsonData.Substring(0, jsonData.Length - 1);
@@ -1398,6 +1402,8 @@
}
}
+ #region
+
/// <summary>
/// agv璋冨害浠诲姟涓嬪彂
/// </summary>
@@ -1462,7 +1468,10 @@
};
AgvSchedulingTask agvTask = new AgvSchedulingTask();
- agvTask.ReqCode = taskno; //agv璇锋眰缂栧彿锛岄渶瑕侀殢鏈虹敓鎴� 锛堟渶澶�32浣嶏級
+ Random r = new Random();
+ long ran = DateTime.Now.Ticks;
+ agvTask.ReqCode = ran.ToString();
+ //agvTask.ReqCode = taskno; //agv璇锋眰缂栧彿锛岄渶瑕侀殢鏈虹敓鎴� 锛堟渶澶�32浣嶏級
agvTask.TaskCode = taskno; //浠诲姟鍙�
agvTask.TaskTyp = tasktype; //鎼繍绫诲瀷
agvTask.PositionCodePath = position; //璧峰鍜岀洰鐨勪綅闆嗗悎
@@ -1475,14 +1484,38 @@
agvTaskList.Add(agvTask);
string str = "";
- var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
+ var list2 = agvTaskList.Select(m => m.TaskCode).ToList();
var jsonData = JsonConvert.SerializeObject(agvTaskList);
jsonData = jsonData.Substring(1, jsonData.Length-1);
jsonData = jsonData.Substring(0, jsonData.Length - 1);
- var response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV");
- var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
- return agvModel;
+ try
+ {
+ var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ var response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV");
+ //response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV");
+ var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+
+ //////瑙ｆ瀽杩斿洖鏁版嵁
+ var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
+ if (agvModel.Code == "0")
+ {
+ //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ new TaskServer().EditTaskIssueOk(list2, time1, time2);
+ str += "涓嬪彂鎴愬姛";
+ }
+ if (agvModel.Code == "1")
+ {
+ new TaskServer().EditTaskIssueNo(list2, time1, time2, agvModel.Message);
+ throw new Exception(agvModel.Message);
+ }
+ return agvModel;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+
}
/// <summary>
@@ -1494,8 +1527,11 @@
{
try
{
- AgvCancelTask agvTaskList = new AgvCancelTask();
- agvTaskList.ReqCode = "006"; //闅忔満鐢熸垚
+ AgvCancelTask agvTaskList = new AgvCancelTask();
+ Random r = new Random();
+ long ran = DateTime.Now.Ticks;
+ agvTaskList.ReqCode = ran.ToString();
+ //agvTaskList.ReqCode = "006"; //闅忔満鐢熸垚
agvTaskList.TaskCode = taskno.ToString();
//agvTaskList.ReqTime = DateTime.Now.ToString();
@@ -1517,6 +1553,8 @@
}
+ #endregion
+
/// <summary>
/// 鏍规嵁鍖哄煙鍒嗛厤鍌ㄤ綅
/// </summary>
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 01368fc..71613e4 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -2465,7 +2465,10 @@
};
AgvSchedulingTask agvTask = new AgvSchedulingTask();
- agvTask.ReqCode = TtaskNo; //agv璇锋眰缂栧彿锛岄渶瑕侀殢鏈虹敓鎴� 锛堟渶澶�32浣嶏級
+ Random r = new Random();
+ long ran = DateTime.Now.Ticks;
+ agvTask.ReqCode = ran.ToString();
+ //agvTask.ReqCode = TtaskNo; //agv璇锋眰缂栧彿锛岄渶瑕侀殢鏈虹敓鎴� 锛堟渶澶�32浣嶏級
agvTask.TaskCode = TtaskNo; //浠诲姟鍙�
agvTask.TaskTyp = type; //鎼繍绫诲瀷
agvTask.PositionCodePath = position; //璧峰鍜岀洰鐨勪綅闆嗗悎
@@ -2478,7 +2481,7 @@
agvTaskList.Add(agvTask);
string str = "";
- var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
+ var list2 = agvTaskList.Select(m => m.TaskCode).ToList();
var jsonData = JsonConvert.SerializeObject(agvTaskList);
jsonData = jsonData.Substring(1, jsonData.Length - 1);
jsonData = jsonData.Substring(0, jsonData.Length - 1);
--
Gitblit v1.8.0