From e97a0f31c187e25d9b2480b6e144648239dae80d Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期一, 28 七月 2025 09:00:06 +0800
Subject: [PATCH] 1
---
HnSx/Build/Project/代码/VS自定义类/AutoThread.cs | 169 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 138 insertions(+), 31 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..a4f6721 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"
@@ -120,6 +120,58 @@
/// <param name="action"></param>
public void ThreadSettingInit(Tag tag)
{
+ List<Task> tasks = new List<Task>();
+ tasks.Add(GetTask(wmsPrint, tag, 3000));
+
+
+ //GZ.Modular.Redis.WriteGroupEntity group = new GZ.Modular.Redis.WriteGroupEntity();
+ //group.groupName = "PLC1.ssx2Xplc";
+ //group.queueStatus = 1;
+ //group.queueTime = DateTime.Now;
+
+ //group.writeList = new List<GZ.Modular.Redis.ParamData>();
+ //GZ.Modular.Redis.ParamData barcodeData = new GZ.Modular.Redis.ParamData();
+ //barcodeData.paramName = "PLC1.Param4";
+ //barcodeData.paramValue = Tag.PLC1.Param4 + 1 + "";
+
+ //GZ.Modular.Redis.ParamData sendData = new GZ.Modular.Redis.ParamData();
+ //sendData.paramName = "PLC1.Param5";
+ //sendData.paramValue = Tag.PLC1.Param5 + 2 + "";
+
+ //group.writeList.Add(barcodeData);
+ //group.writeList.Add(sendData);
+ //Conn.榛樿Redis.SetQueue(group, "PLC1Queue", "PLC1.Param1_LAST", "1") ? "--鎴愬姛" : "--澶辫触";
+
+
+
+
+
+ Task.WaitAll(tasks.ToArray());
+ }
+
+ private void wmsPrint(Tag tag)
+ {
+ HttpServer.apiHelper.WebGet($"http://{"test1.wmsdev.net:18980"}/expcenter/WebSocketPrintAction?sysType=OT01&QS01=YANGYZ&QS02={"鏃堕棿鎴�}&QS04=P4EL67LRIWWDCMP7C&clsid=export_header&method=printByWebSocket&origin=http%3A%2F%2Ftest1.wmsdev.net%3A18980&organizationId=FLUX&warehouseId=FLUXWH01&printServer=YYZ&printerName=LocalPrinter&copies=1&functionId=A2002&tableId=BAS_LOCATION&exportCode=YYZ_CN&itemObj=%0A%7B%0A++++%22bizOrgId%22%3A+%22FLUX%22%2C%0A++++%22CHECK.locationId%22%3A+%22001-001-01-01%22%2C%0A++++%22bizWarehouseId%22%3A+%22FLUXWH01%22%0A%7D%0A%0A");
+ }
+
+ private Task GetTask(Action<Tag> action, Tag tag, int i = 2500)
+ {
+ var task = Task.Run(() =>
+ {
+ while (true)
+ {
+ try
+ {
+ action(tag);
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error(ex.Message, ex);
+ }
+ Thread.Sleep(i);
+ }
+ });
+ return task;
}
public async void ThreadwebSoc()
@@ -128,6 +180,7 @@
//灏嗘暟鎹紦瀛樺埌鍐呭瓨銆� try
{
+ return;
Thread.Sleep(1000);
while (true)
{
@@ -184,22 +237,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;
}
@@ -212,7 +266,7 @@
public class HttpServer
{
public static readonly HttpHelper apiHelper = new HttpHelper();
- System.Net.HttpListener HttpSvcHost = null;
+ public static System.Net.HttpListener HttpSvcHost = null;
public static string _listenerPrefix = "";
public HttpServer(string ip)
@@ -547,7 +601,7 @@
Return = new ReturnInfo
{
returnCode = "0000",
- returnDesc = "",
+ returnDesc = "ok",
returnFlag = "1"
}
}
@@ -558,7 +612,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 +682,8 @@
Return = new ModifyTaskPriorityReturnInfo
{
returnCode = "0000",
- returnFlag = "1"
+ returnFlag = "1",
+ returnDesc = "ok"
}
}
});
@@ -677,7 +732,6 @@
});
}
}
-
}
if (req == null || req.data.header.Count == taskErrorInfos.Count)
@@ -703,6 +757,7 @@
Return = new PutConveyorTaskReturnInfo
{
returnCode = "0000",
+ returnDesc = "ok",
returnFlag = "1"
}
}
@@ -748,9 +803,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)
{
@@ -764,6 +820,10 @@
}
else return "鍙戦�澶辫触銆�;
}
+ //else
+ //{
+ // return "鏈繛鎺ャ�";
+ //}
}
break;
}
@@ -1049,13 +1109,21 @@
public async Task<bool> SendAsync(string message)
{
- if (_webSocket?.State != WebSocketState.Open)
+ try
{
- throw new InvalidOperationException("WebSocket is not connected");
- }
+ if (_webSocket?.State != WebSocketState.Open)
+ {
+ throw new InvalidOperationException("WebSocket is not connected");
+ }
- var bytes = System.Text.Encoding.UTF8.GetBytes(message);
- await _webSocket.SendAsync(new ArraySegment<byte>(bytes), WebSocketMessageType.Text, true, _cts.Token);
+ var bytes = System.Text.Encoding.UTF8.GetBytes(message);
+ await _webSocket.SendAsync(new ArraySegment<byte>(bytes), WebSocketMessageType.Text, true, _cts.Token);
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error(ex.Message, ex);
+ return false;
+ }
return true;
}
}
@@ -1484,8 +1552,42 @@
if (stream != null) stream.Close();
if (rsp != null) rsp.Close();
}
-
}
+ public string WebGet(string url)
+ {
+ //using (var client = new HttpClient()) {
+ // //璇锋眰缁撴灉
+ // string result = client.GetAsync(url).Result.Content.ReadAsStringAsync().Result;
+
+ // Console.WriteLine(result);
+ // return result;
+
+ //}
+ //Console.WriteLine(url);
+ WebRequest request = WebRequest.Create(url);
+ request.Timeout = 6000;
+ request.Method = "GET";
+
+ try
+ {
+ WebResponse response = request.GetResponse();
+ Stream dataStream = response.GetResponseStream();
+ StreamReader reader = new StreamReader(dataStream);
+ string responseFromServer = reader.ReadToEnd();
+
+ reader.Close();
+ dataStream.Close();
+ response.Close();
+ Console.WriteLine(responseFromServer);
+ return responseFromServer;
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error($"WebGet Error:{ex.Message}", ex);
+ return "";
+ }
+ }
+
#endregion [鑷畾涔夌被][20250325095622918][HttpHelper]
}
public class Clloc
@@ -1595,6 +1697,7 @@
public class ResponseData
{
+ [JsonProperty("return")]
public ReturnInfo Return { get; set; }
}
@@ -1608,7 +1711,7 @@
/// <summary>
/// 杩斿洖鎻忚堪
/// </summary>
- public string returnDesc { get; set; }
+ public string returnDesc { get; set; } = "ok";
/// <summary>
/// 杩斿洖鏍囪 - 1:鎴愬姛, 0:澶辫触
@@ -1692,6 +1795,7 @@
public class StockInExceptionResponseData
{
+ [JsonProperty("return")]
public StockInExceptionReturnInfo Return { get; set; }
}
@@ -1869,6 +1973,7 @@
public class StockInInteractionResponseData
{
+ [JsonProperty("return")]
public StockInInteractionReturnInfo Return { get; set; }
}
@@ -2188,6 +2293,7 @@
public class PutConveyorTaskResponseData
{
+ [JsonProperty("return")]
public PutConveyorTaskReturnInfo Return { get; set; }
}
@@ -2201,9 +2307,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 +2319,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 +2388,7 @@
public class ReportWeightInfoResponseData
{
+ [JsonProperty("return")]
public ReportWeightInfoReturnInfo Return { get; set; }
}
--
Gitblit v1.9.1