From 7267e82ccfbea0fa03e8bc809a2d5ac6f7da84ac Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 20 六月 2025 15:33:36 +0800
Subject: [PATCH] 优化国自AGV和ERP下发的报文处理逻辑
---
api/ApiHelper.cs | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index a5e3514..7f71918 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -147,6 +147,17 @@
var endLoc = new TN_Location();
if (cgDetail.F_QTY > 2000) {
// 閲嶉噺瓒呰繃2t锛屾姤閿�+ if (GZRobot.UpdateInteractInfo(new UpdateInteractInfo {
+ type_name = "GET_DST",
+ interaction_info_id = int.Parse(task.S_EQ_TASK_CODE),
+ info_status = "error",
+ })) {
+ LogHelper.Info($"鍥借嚜AGV鎺ュ彈瓒呴噸鍙栨秷淇℃伅鎴愬姛", "API");
+ }
+ else {
+ LogHelper.Info($"鍥借嚜AGV鎺ュ彈瓒呴噸鍙栨秷淇℃伅澶辫触", "API");
+ }
+
return BuildSimpleResult(8, $"鐗╂枡閲嶉噺{cgDetail.F_QTY}瓒呰繃2t");
}
else if (cgDetail.F_QTY > 1500) {
@@ -181,6 +192,19 @@
// 淇敼浠诲姟缁堢偣涓篜DA鎸囧畾缁堢偣
task.S_END_LOC = endLoc.S_CODE;
LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+
+ if (GZRobot.UpdateInteractInfo(new UpdateInteractInfo {
+ type_name = "GET_DST",
+ interaction_info_id = int.Parse(task.S_EQ_TASK_CODE),
+ info_status = "invalid",
+ return_value = LocationHelper.GetAgvSite(task.S_END_LOC), // 鐩墠浣跨敤agvsite
+ })) {
+ LogHelper.Info($"鍥借嚜AGV鎺ュ彈缁堢偣淇℃伅鎴愬姛", "API");
+ }
+ else {
+ LogHelper.Info($"鍥借嚜AGV鎺ュ彈缁堢偣淇℃伅澶辫触", "API");
+ }
+
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Task>(task).UpdateColumns(a => a.S_END_LOC).ExecuteCommand() <= 0) {
@@ -241,8 +265,6 @@
LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿� LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�-
- var res = GZRobot.QueryInteractInfo(3);
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -381,7 +403,10 @@
}
var res = GZRobot.CancelGZOrder(code);
if (!res) {
- return BuildSimpleResult(2, $"鍥借嚜AGV鍙栨秷浠诲姟澶辫触锛�);
+ LogHelper.Info($"鍥借嚜AGV鍙栨秷浠诲姟澶辫触锛�, "API");
+ }
+ else {
+ LogHelper.Info($"鍥借嚜AGV鍙栨秷浠诲姟鎴愬姛锛�, "API");
}
using (var tran = db.Ado.UseTran()) {
--
Gitblit v1.9.1