From 28accb402ff845f554493c0e0d6a3e5234d00628 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期五, 11 七月 2025 15:09:57 +0800
Subject: [PATCH] 1
---
HnSx/Build/Project/代码/VS自定义类/AutoThread.cs | 57 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 33 insertions(+), 24 deletions(-)
diff --git "a/HnSx/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs" "b/HnSx/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
index 658096f..525142b 100644
--- "a/HnSx/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
+++ "b/HnSx/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
@@ -128,6 +128,7 @@
//灏嗘暟鎹紦瀛樺埌鍐呭瓨銆� try
{
+ return;
Thread.Sleep(1000);
while (true)
{
@@ -184,22 +185,23 @@
new HttpServer(ip.ToString()).HttpServerRun();
//new TcpServer(ip.ToString());
//var server = new EnhancedWebSocketServer($"http://{ip.ToString()}:8809/").StartAsync(); http://10.20.66.121:18080
- new WebSocketClientWithReconnect($"ws://10.20.66.121:20001/socket").StartAsync();
+ //new WebSocketClientWithReconnect($"ws://10.20.66.121:20001/socket").StartAsync();
+ new WebSocketClientWithReconnect($"ws://10.20.66.121:20001/datahubjson/websocket/").StartAsync();
//new WebSocketClientWithReconnect($"ws://{ip.ToString()}:8809/socket").StartAsync();
WebSocketClientWithReconnect.Instance.OnMessageReceived += (msg) =>
{
- //reportWeightinfo.channel.Writer.TryWrite(JsonConvert.DeserializeObject<ReportWeightInfoResponse>(msg));
- reportWeightinfo.channel.Writer.TryWrite(new ReportWeightInfoResponse
- {
- Response = new ReportWeightInfoResponseData
- {
- Return = new ReportWeightInfoReturnInfo
- {
- returnCode = "0000",
- sortingChute = msg
- }
- }
- });
+ reportWeightinfo.channel.Writer.TryWrite(msg);
+ //reportWeightinfo.channel.Writer.TryWrite(new ReportWeightInfoResponse
+ //{
+ // Response = new ReportWeightInfoResponseData
+ // {
+ // Return = new ReportWeightInfoReturnInfo
+ // {
+ // returnCode = "0000",
+ // sortingChute = msg
+ // }
+ // }
+ //});
};
break;
}
@@ -547,7 +549,7 @@
Return = new ReturnInfo
{
returnCode = "0000",
- returnDesc = "",
+ returnDesc = "ok",
returnFlag = "1"
}
}
@@ -558,7 +560,7 @@
{
statusCode = System.Net.HttpStatusCode.OK;
- var str = apiHelper.Post("http://10.20.66.121:18080/datahubjson/wcs/?method=PALLETSTACKERINTERACTION", !string.IsNullOrEmpty(requestJson) ? requestJson : JsonConvert.SerializeObject(new PalletStackerInteractionRequest
+ var str = apiHelper.Post("http://10.20.66.121:18080/datahubjson/wcs/?method=PALLETSTACKER", !string.IsNullOrEmpty(requestJson) ? requestJson : JsonConvert.SerializeObject(new PalletStackerInteractionRequest
{
data = new PalletStackerInteractionData
{
@@ -628,7 +630,8 @@
Return = new ModifyTaskPriorityReturnInfo
{
returnCode = "0000",
- returnFlag = "1"
+ returnFlag = "1",
+ returnDesc = "ok"
}
}
});
@@ -677,7 +680,6 @@
});
}
}
-
}
if (req == null || req.data.header.Count == taskErrorInfos.Count)
@@ -703,6 +705,7 @@
Return = new PutConveyorTaskReturnInfo
{
returnCode = "0000",
+ returnDesc = "ok",
returnFlag = "1"
}
}
@@ -748,9 +751,10 @@
}
}
};
+ string requeeee = string.IsNullOrEmpty(requestJson) ? JsonConvert.SerializeObject(req) : requestJson;
//Console.WriteLine($"{DateTime.Now.ToString("HH:mm:ss.fff")}>>>GGG{i}");
- LogHelper.Info(JsonConvert.SerializeObject(req));
- var b = WebSocketClientWithReconnect.Instance?.SendAsync(JsonConvert.SerializeObject(req)).Result;
+ LogHelper.Info(requeeee);
+ var b = WebSocketClientWithReconnect.Instance?.SendAsync(requeeee).Result;
Console.WriteLine(req.data.header.deliveryNo + "鍙戦�瀹屾垚锛侊紒" + b);
if (b == true)
{
@@ -1595,6 +1599,7 @@
public class ResponseData
{
+ [JsonProperty("return")]
public ReturnInfo Return { get; set; }
}
@@ -1608,7 +1613,7 @@
/// <summary>
/// 杩斿洖鎻忚堪
/// </summary>
- public string returnDesc { get; set; }
+ public string returnDesc { get; set; } = "ok";
/// <summary>
/// 杩斿洖鏍囪 - 1:鎴愬姛, 0:澶辫触
@@ -1692,6 +1697,7 @@
public class StockInExceptionResponseData
{
+ [JsonProperty("return")]
public StockInExceptionReturnInfo Return { get; set; }
}
@@ -1869,6 +1875,7 @@
public class StockInInteractionResponseData
{
+ [JsonProperty("return")]
public StockInInteractionReturnInfo Return { get; set; }
}
@@ -2188,6 +2195,7 @@
public class PutConveyorTaskResponseData
{
+ [JsonProperty("return")]
public PutConveyorTaskReturnInfo Return { get; set; }
}
@@ -2201,9 +2209,9 @@
}
public class reportWeightinfo
{
- public static Channel<ReportWeightInfoResponse> channel = Channel.CreateUnbounded<ReportWeightInfoResponse>();
+ public static Channel<string> channel = Channel.CreateUnbounded<string>();
- internal static async Task<ReportWeightInfoReturnInfo> GetChinnnl()
+ internal static async Task<string> GetChinnnl()
{
//var response = await reportWeightinfo.channel.Reader.ReadAllAsync();// foreach (var response in reportWeightinfo.channel.Reader.ReadAllAsync())
//{
@@ -2213,10 +2221,10 @@
{
while (reportWeightinfo.channel.Reader.TryRead(out var response))
{
- return response?.Response?.Return ?? new ReportWeightInfoReturnInfo { returnCode = "0001", sortingChute = "0", returnDesc = "杩斿洖涓虹┖銆� };
+ return response;/// response?.Response?.Return ?? new ReportWeightInfoReturnInfo { returnCode = "0001", sortingChute = "0", returnDesc = "杩斿洖涓虹┖銆� };
}
}
- return new ReportWeightInfoReturnInfo { returnCode = "0001", sortingChute = "0", returnDesc = "杩斿洖涓虹┖銆� };
+ return "杩斿洖涓虹┖"; new ReportWeightInfoReturnInfo { returnCode = "0001", sortingChute = "0", returnDesc = "杩斿洖涓虹┖銆� };
}
/// <summary>
@@ -2282,6 +2290,7 @@
public class ReportWeightInfoResponseData
{
+ [JsonProperty("return")]
public ReportWeightInfoReturnInfo Return { get; set; }
}
--
Gitblit v1.9.1