From b928a2f0011fc867d7d219cfff4b764250f5b778 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 09 七月 2025 17:03:08 +0800
Subject: [PATCH] 修复查交互表更新终点的流程，添加绑定货位写入物料明细表
---
dispatch/GZRobot.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/dispatch/GZRobot.cs b/dispatch/GZRobot.cs
index 11692a7..4fffff2 100644
--- a/dispatch/GZRobot.cs
+++ b/dispatch/GZRobot.cs
@@ -1,13 +1,18 @@
锘縰sing System;
using System.Collections.Generic;
using System.IdentityModel.Protocols.WSTrust;
+using System.Linq;
+using System.Security.Policy;
using System.Threading.Tasks;
-using HH.WCS.Mobox3.AnGang.util;
+
using HH.WCS.Mobox3.AnGang.core;
using HH.WCS.Mobox3.AnGang.models;
+using HH.WCS.Mobox3.AnGang.util;
+
using Newtonsoft.Json;
-using static HH.WCS.Mobox3.AnGang.api.ApiModel;
+
using static System.Net.WebRequestMethods;
+using static HH.WCS.Mobox3.AnGang.api.ApiModel;
namespace HH.WCS.Mobox3.AnGang.dispatch {
/// <summary>
@@ -142,6 +147,10 @@
case "waiting":
agv.state = 1;
break;
+ case "dispatched":
+ //璋冨害娲捐溅锛堝紑濮嬪彇璐э級NEW ADDED
+ agv.state = 3;
+ break;
case "source_finish":
//鍙栬揣瀹屾垚
agv.state = 4;
@@ -248,6 +257,31 @@
return list;
}
+ /// <summary>
+ /// 鏍规嵁娌℃湁interaction_info_name锛坱ask.S_CODE锛夎幏鍙杋nteraction_info_id
+ /// </summary>
+ /// <param name="taskCode"></param>
+ /// <param name="infoId"></param>
+ /// <returns></returns>
+ public static bool TryGetInteractionInfoId(string taskCode, out int infoId) {
+ var list = QueryInteractInfo(3);
+ if (list.Count == 0) {
+ LogHelper.Info($"鏌ヤ氦浜掕〃澶辫触锛佹病鏈夎鍙栧埌浜や簰琛紒");
+ infoId = 0;
+ return false;
+ }
+
+ var data = list.Where(i => i.interaction_info_name == taskCode).FirstOrDefault();
+ if (data == null) {
+ LogHelper.Info($"鏌ヤ氦浜掕〃澶辫触锛佹病鏈塱nteraction_info_name='{taskCode}'鐨勫�锛� + JsonConvert.SerializeObject(list));
+ infoId = 0;
+ return false;
+ }
+
+ infoId = data.interaction_info_id;
+ return true;
+ }
+
// DOC 6. 浜や簰琛ㄦ煡璇紙鏇存柊缁堢偣璐т綅锛� public static bool UpdateInteractInfo(UpdateInteractInfo interactInfo) {
string msg = "";
@@ -261,7 +295,8 @@
}
else {
msg = "[guozi-UpdateInteractInfo]鏇存柊浜や簰淇℃伅澶辫触";
- Console.WriteLine(msg);
+ //Console.WriteLine(msg);
+ LogHelper.Info(msg);
}
return result;
}
@@ -270,13 +305,18 @@
// DOC 5. 绉伴噸淇℃伅鏌ヨ
public static List<CustomData> CustomBuf() {
var res = new List<CustomData>();
+
string msg = "";
- var result = apiHelper.Get(baseUrl + $"/api/engine/agvs/custom-buf/");
+ //var result = apiHelper.Get(baseUrl + $"/api/engine/agvs/custom-buf/", "application/json");
+ LogHelper.Info($"姝ｅ湪璇锋眰GET: \"/api/engine/agvs/custom-buf/\"", "API");
+ var result = apiHelper.GetNew(baseUrl + $"api/engine/agvs/custom-buf/");
if (!string.IsNullOrEmpty(result)) {
Console.WriteLine(result);
try {
+ LogHelper.Info($"绉伴噸淇℃伅锛� + result);
var data = JsonConvert.DeserializeObject<gzResult<CustomData>>(result);
+
if (data.data != null) {
res = data.data;
}
--
Gitblit v1.9.1