From 3512011e94f013955b7b1e2de8558b8861db86b7 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 30 六月 2025 16:38:05 +0800
Subject: [PATCH] 优化配置文件读取和AGV调度细节
---
core/WCSCore.cs | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index ca22441..8cebf87 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -126,13 +126,13 @@
return;
}
- if (db.Updateable<TN_Loc_Container>()
- .SetColumns(d => d.S_IMG_URL == filepath)
- .Where(d => d.S_CNTR_CODE == model.S_CNTR_CODE).ExecuteCommand() <= 0) {
+ //if (db.Updateable<TN_Loc_Container>()
+ // .SetColumns(d => d.S_IMG_URL == filepath)
+ // .Where(d => d.S_CNTR_CODE == model.S_CNTR_CODE).ExecuteCommand() <= 0) {
- LogHelper.Info($"鍥剧墖URL '{filepath}' 鍐欏叆鏁版嵁搴撳け璐�);
- return;
- }
+ // LogHelper.Info($"鍥剧墖URL '{filepath}' 鍐欏叆鏁版嵁搴撳け璐�);
+ // return;
+ //}
}
catch (Exception ex) {
LogHelper.Info($"鍙戠敓浜嗛敊璇細{ex.Message}");
@@ -164,7 +164,7 @@
if (data.Count == 0) {
LogHelper.Info("璁剧疆缁堢偣璐т綅澶辫触锛氭病鏈夋帴鍙楀埌鏉ヨ嚜鍥借嚜AGV鐨勯噸閲忎俊鎭�);
- //return; // TODO 姝ｅ紡杩愯鏈夊浗鑷狝GV鐨勬椂鍊欐仮澶�+ //cgDetail.F_QTY = 0; // 涓嶈缃负绌猴紝渚夸簬娴嬭瘯鏃堕鍏堣缃竴涓甯稿�
}
else {
var weight = float.Parse(data[0].parameter_varchar200_up);
@@ -209,6 +209,19 @@
// 閲嶉噺瓒呰繃 2t
endLoc = null;
LogHelper.Info("閲嶉噺瓒呰繃2t锛屼笉鍏佽鍏ュ簱");
+
+ // 浼犻�缁欏浗鑷狝GV
+ if (GZRobot.UpdateInteractInfo(new UpdateInteractInfo {
+ type_name = "GET_DST",
+ interaction_info_id = int.Parse(tn_task.S_EQ_TASK_CODE),
+ info_status = "error",
+ })) {
+ LogHelper.Info($"鍥借嚜AGV鎺ュ彈瓒呴噸鍙栨秷淇℃伅鎴愬姛", "HosttoagvTask");
+ }
+ else {
+ LogHelper.Info($"鍥借嚜AGV鎺ュ彈瓒呴噸鍙栨秷淇℃伅澶辫触", "HosttoagvTask");
+ }
+
return;
}
else if (cgDetail.F_QTY > 1500) {
@@ -232,18 +245,17 @@
// 濡傛灉娌℃湁绗﹀悎鏉′欢鐨勮揣浣嶏紝缃┖锛岀瓑寰匬DA閲嶆柊纭畾
if (endLoc == null) {
- tn_task.S_END_AREA = Settings.Areas[1][0]; // HJQ
+ tn_task.S_END_AREA = Settings.Areas[AreaIndex.H璐ф灦鍖篯[0]; // HJQ
tn_task.S_END_LOC = "0";
// 涓嶉渶瑕佸啀缁橤Z AGV浼犵┖鍊硷紝涓�紑濮嬪氨娌＄粰鍏蜂綋璐т綅锛屽彧缁欎簡Area
-
//var request = new UpdateInteractInfo {
// interaction_info_id = 3, // 鏇存敼缁堢偣淇℃伅
// info_status = "active",
// return_value = "",
//};
-
//GZRobot.UpdateInteractInfo(request);
+
if (db.Updateable<TN_Task>(tn_task).UpdateColumns(it => new { it.S_END_LOC })
.ExecuteCommand() > 0) {
//LocationHelper.LockLoc(endLoc.S_CODE, 1);//缁堢偣鍏ュ簱閿�@@ -258,6 +270,19 @@
tn_task.S_END_LOC = endLoc.S_CODE;
LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+
+ // 浼犻�缁欏浗鑷狝GV
+ if (GZRobot.UpdateInteractInfo(new UpdateInteractInfo {
+ type_name = "GET_DST",
+ interaction_info_id = int.Parse(tn_task.S_EQ_TASK_CODE),
+ info_status = "invalid",
+ return_value = LocationHelper.GetAgvSite(tn_task.S_END_LOC), // 鐩墠浣跨敤agvsite
+ })) {
+ LogHelper.Info($"鍥借嚜AGV鎺ュ彈缁堢偣淇℃伅鎴愬姛", "HosttoagvTask");
+ }
+ else {
+ LogHelper.Info($"鍥借嚜AGV鎺ュ彈缁堢偣淇℃伅澶辫触", "HosttoagvTask");
+ }
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Task>(tn_task).UpdateColumns(it => new { it.S_END_LOC })
@@ -337,8 +362,6 @@
{
//浣跨敤鑷畾涔変换鍔℃帹閫� TaskProcess.SendTask(task);//璋冨害NDC鎴栨澀濂ユ垨鍥借嚜璁惧
- //TaskProcess.SendGZTask(task);///璋冨害鍥借嚜璁惧
-
});
}
else
--
Gitblit v1.9.1