From 9f18954857e9c4c691fc2c8e83d7728abdc18f74 Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期二, 08 七月 2025 17:54:22 +0800 Subject: [PATCH] 添加后台图片前台调用的图床接口备用,修复测试出现的问题 --- dispatch/GZRobot.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 45 insertions(+), 11 deletions(-) diff --git a/dispatch/GZRobot.cs b/dispatch/GZRobot.cs index 213e3d5..f4a519f 100644 --- a/dispatch/GZRobot.cs +++ b/dispatch/GZRobot.cs @@ -1,11 +1,16 @@ 锘縰sing System; using System.Collections.Generic; using System.IdentityModel.Protocols.WSTrust; +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 System.Net.WebRequestMethods; using static HH.WCS.Mobox3.AnGang.api.ApiModel; namespace HH.WCS.Mobox3.AnGang.dispatch { @@ -26,7 +31,8 @@ var result = apiHelper.Post(baseUrl + "api/engine/tasks/iostates/", JsonConvert.SerializeObject(data)); var dataResult = JsonConvert.DeserializeObject<gzResult<IOStatesInfoResult>>(result); } - + + // DOC 1. 鍒涘缓璁㈠崟 WMS->RCS public static int CreateOrder(string taskNo, int priority, string param, string ts = "churuku", string created_user = "hanhe") { LogHelper.Info($"CreateOrder鍙傛暟淇℃伅:taskNo:{taskNo},priority:{priority},param:{param},ts:{ts}锛宑reated_user锛歿created_user}", "API"); var msg = ""; @@ -40,7 +46,14 @@ if (response != "") { try { var dataResult = JsonConvert.DeserializeObject<gzResult<OrderInfoResult>>(response); - if (dataResult.code == 0) { + // 鍘熶唬鐮侀儴鍒�+ //if (dataResult.code == 0) { + // orderId = dataResult.data[0].in_order_id; + //} + // 灏婇噸鏂囨。鐨勭増鏈�+ // 杩斿洖鍙傛暟涓紝code鐩墠涓嶅啀浣跨敤锛屽彲閫氳繃msg瀛楁鍒ゆ柇鏄惁鎴愬姛锛屽鏋渕sg涓衡�success鈥濆垯琛ㄧず鎴愬姛锛屽惁鍒欎负鎶ラ敊淇℃伅鎴栦笉瀛樺湪銆俬ttp code涓�22鏃跺�鐨勬姤閿欎负绯荤粺鎶ラ敊锛屽叾涓殑msg鏃犳硶鍏ㄩ儴鑾峰彇銆�+ // SELFNOTE: 鐩存帴璋冪敤HttpHelper.Post鏂规硶锛屾棤娉曡幏鍙杊eader锛屾殏鏃朵笉鑰冭檻 + if (dataResult.msg == "success") { orderId = dataResult.data[0].in_order_id; } } @@ -76,6 +89,7 @@ return result; } + // DOC 2. 鍙栨秷璁㈠崟 WMS->RCS public static bool CancelGZOrder(int orderId) { bool result = false; string msg = ""; @@ -86,12 +100,21 @@ msg = $"[guozi-CancelOrder] request={requests};response={response}"; if (response != "") { var dataResult = JsonConvert.DeserializeObject<CancelGZOrderResult>(response); - if (dataResult.code == 0) { - msg = "[guozi-CancelOrder]鍙栨秷璁㈠崟鎴愬姛"; - Console.WriteLine(msg); + // 鍘熶唬鐮佺増鏈�+ //if (dataResult.code == 0) { + // msg = "[guozi-CancelOrder]鍙栨秷璁㈠崟鎴愬姛"; + // Console.WriteLine(msg); + // result = true; + // return result; + //} + + // 灏婇噸鏂囨。鐨勭増鏈�+ if (dataResult.msg == "success") { // 鐩墠鍙彇娑堜竴涓换鍔★紝鎴愬姛鏃犻渶鍐嶆鏌uccess_list鍜宔rror_list + Console.WriteLine("[guozi-CancelOrder]鍙栨秷璁㈠崟鎴愬姛"); result = true; return result; } + } else { msg = "[guozi-CancelOrder]鍙栨秷璁㈠崟澶辫触"; @@ -100,13 +123,13 @@ return result; } - + // DOC 3. 璁㈠崟鐘舵�鎺ㄩ� RCS->WMS /// <summary> /// 璁㈠崟鐘舵�鍙嶉 /// </summary> /// <returns></returns> public static GzResult orderStatusReport(orderStatusReportParme model) { - LogHelper.Info("RCS鍥借嚜AGV浠诲姟鐘舵�鍥炴姤锛� + JsonConvert.SerializeObject(model), "HosttoagvTask"); + LogHelper.Info("orderStatusReport锛歊CS鍥借嚜AGV浠诲姟鐘舵�鍥炴姤锛� + JsonConvert.SerializeObject(model), "HosttoagvTask"); GzResult result = new GzResult(); AgvTaskState agv = new AgvTaskState(); @@ -193,6 +216,7 @@ return result; } + // DOC 6. 浜や簰琛ㄦ煡璇� /// <summary> /// 鑾峰彇浜や簰淇℃伅 /// </summary> @@ -228,6 +252,7 @@ return list; } + // DOC 6. 浜や簰琛ㄦ煡璇紙鏇存柊缁堢偣璐т綅锛� public static bool UpdateInteractInfo(UpdateInteractInfo interactInfo) { string msg = ""; var result = false; @@ -240,20 +265,28 @@ } else { msg = "[guozi-UpdateInteractInfo]鏇存柊浜や簰淇℃伅澶辫触"; - Console.WriteLine(msg); + //Console.WriteLine(msg); + LogHelper.Info(msg); } return result; } + + // 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($"姝e湪璇锋眰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; } @@ -406,8 +439,9 @@ public class UpdateInteractInfo { public int interaction_info_id { get; set; } + public string type_name { get; set; } = "GET_DST"; public string info_status { get; set; } - public string return_value { get; set; } + public string return_value { get; set; } = ""; } public class interaction_state { -- Gitblit v1.9.1