From 31beeb3d23e658e5aa2bbb9f251b006095eef15a Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期一, 07 七月 2025 11:05:04 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 312 insertions(+), 30 deletions(-)
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
index 4abdad7..7f33c68 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/VS\350\207\252\345\256\232\344\271\211\347\261\273/AutoThread.cs"
@@ -25,6 +25,7 @@
using System.Net.WebSockets;
using System.Net;
using System.Threading;
+using System.IO;
namespace GZ.Projects.AuxAllWCS
{
@@ -76,8 +77,8 @@
}
// 鎵ц濮旀墭
- if (methodName != "TaskEverythingRun")
- return null;
+ //if (methodName != "TaskEverythingRun")
+ // return null;
return methodDelegate.DynamicInvoke(args);
}
@@ -254,6 +255,8 @@
if (VERX != null)
{
+ if (tag.wxr1.R44)
+ LogHelper.Info($"{VERX.deviceName} R44>{tag.wxr1.R44} R44LAST>{tag.wxr1.R44_LAST} R10>{tag.wxr1.R10}");
if (tag.wxr1.R44 && !tag.wxr1.R44_LAST && tag.wxr1.R10)
{
if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
@@ -292,16 +295,21 @@
if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
{
//涓婃姤鏍￠獙銆�+ LogHelper.Info($"{VERX.deviceNo[0]} 涓婃姤鏍￠獙>{traycode}");
+
///var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/202", requestJson);
var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
{
sceneType = 1,
cntrCode = traycode,
}));
- if (str.Contains("true"))
+ var strr = JsonConvert.DeserializeObject<Mesrespone>(str);
+ if (strr != null && strr.success)
+ //if (str.Contains("true"))
{
//Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R10", "true", "缁村笇灏旀姄鑷�Queue");
- tag.wxr1.R10 = true;
+ //tag.wxr1.R10 = true;
+ Conn.榛樿Redis.SetValue(VERX.deviceName + ".R10", "true", VERX.deviceName + "Queue");
//tag.wxr1.R44_LAST = false;
RedisHelper.Add($"缁村笇灏旀姄鑷�.R44_LAST", "false", out string msg);
}
@@ -311,6 +319,10 @@
}
}
else { TcpServer.TcpServerSend(VERX.deviceNo[0], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E")); }
+ }
+ else if (!tag.wxr1.R10)
+ {
+ TcpServer.TrayIps.Remove(VERX.deviceNo[0]);
}
}
}
@@ -327,6 +339,8 @@
if (VERX != null)
{
+ if (tag.wxr1.R46)
+ LogHelper.Info($"{VERX.deviceName} R44>{tag.wxr1.R46} R44LAST>{tag.wxr1.R46_LAST} R10>{tag.wxr1.R11}");
if (tag.wxr1.R46 && !tag.wxr1.R46_LAST && tag.wxr1.R11)
{
if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
@@ -364,16 +378,20 @@
if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
{
//涓婃姤鏍￠獙銆�+ LogHelper.Info($"{VERX.deviceNo[1]} 涓婃姤鏍￠獙>{traycode}");
///var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/202", requestJson);
var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
{
sceneType = 1,
cntrCode = traycode,
}));
- if (str.Contains("true"))
+ var strr = JsonConvert.DeserializeObject<Mesrespone>(str);
+ if (strr != null && strr.success)
+ //if (str.Contains("true"))
{
//Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R10", "true", "缁村笇灏旀姄鑷�Queue");
- tag.wxr1.R11 = true;
+ //tag.wxr1.R11 = true;
+ Conn.榛樿Redis.SetValue(VERX.deviceName + ".R11", "true", VERX.deviceName + "Queue");
//tag.wxr1.R46_LAST = false;
RedisHelper.Add($"缁村笇灏旀姄鑷�.R46_LAST", "false", out string msg);
}
@@ -383,6 +401,10 @@
}
}
else { TcpServer.TcpServerSend(VERX.deviceNo[1], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E")); }
+ }
+ else if (!tag.wxr1.R11)
+ {
+ TcpServer.TrayIps.Remove(VERX.deviceNo[1]);
}
}
}
@@ -399,6 +421,8 @@
if (VERX != null)
{
+ if (tag.wxr2.R44)
+ LogHelper.Info($"{VERX.deviceName} R44>{tag.wxr2.R44} R44LAST>{tag.wxr2.R44_LAST} R10>{tag.wxr2.R10}");
if (tag.wxr2.R44 && !tag.wxr2.R44_LAST && tag.wxr2.R10)
{
if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
@@ -436,16 +460,20 @@
if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
{
//涓婃姤鏍￠獙銆�+ LogHelper.Info($"{VERX.deviceNo[0]} 涓婃姤鏍￠獙>{traycode}");
///var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/202", requestJson);
var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
{
sceneType = 1,
cntrCode = traycode,
}));
- if (str.Contains("true"))
+ var strr = JsonConvert.DeserializeObject<Mesrespone>(str);
+ if (strr != null && strr.success)
+ //if (str.Contains("true"))
{
//Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R10", "true", "缁村笇灏旀姄鑷�Queue");
- tag.wxr2.R10 = true;
+ //tag.wxr2.R10 = true;
+ Conn.榛樿Redis.SetValue(VERX.deviceName + ".R10", "true", VERX.deviceName + "Queue");
//tag.wxr2.R44_LAST = false;
RedisHelper.Add($"缁村笇灏旀姄鑷�.R44_LAST", "false", out string msg);
}
@@ -455,6 +483,10 @@
}
}
else { TcpServer.TcpServerSend(VERX.deviceNo[0], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E")); }
+ }
+ else if (!tag.wxr2.R10)
+ {
+ TcpServer.TrayIps.Remove(VERX.deviceNo[0]);
}
}
}
@@ -472,6 +504,8 @@
if (VERX != null)
{
+ if (tag.wxr2.R46)
+ LogHelper.Info($"{VERX.deviceName} R44>{tag.wxr2.R46} R44LAST>{tag.wxr2.R46_LAST} R10>{tag.wxr2.R11}");
if (tag.wxr2.R46 && !tag.wxr2.R46_LAST && tag.wxr2.R11)
{
if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
@@ -510,7 +544,7 @@
else
if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
{
- LogHelper.Info($"Threadwxr2R 涓婃姤鏍￠獙>{traycode}");
+ LogHelper.Info($"{VERX.deviceNo[1]} 涓婃姤鏍￠獙>{traycode}");
//涓婃姤鏍￠獙銆� ///var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/202", requestJson);
var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
@@ -518,12 +552,17 @@
sceneType = 1,
cntrCode = traycode,
}));
- if (str.Contains("true"))
+ var strr = JsonConvert.DeserializeObject<Mesrespone>(str);
+ if (strr != null && strr.success)
{
- //Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R10", "true", "缁村笇灏旀姄鑷�Queue");
- tag.wxr2.R11 = true;
+ //Conn.榛樿Redis.SetValue("缁村笇灏旀姄鑷�.R11", "true", "缁村笇灏旀姄鑷�Queue");
+ //tag.wxr2.R11 = true;
+
+ LogHelper.Info($"Threadwxr2R銆傘� -鍐橰11 true");
+ Conn.榛樿Redis.SetValue(VERX.deviceName + ".R11", "true", VERX.deviceName + "Queue");
//tag.wxr2.R46_LAST = false;
RedisHelper.Add($"缁村笇灏旀姄鑷�.R46_LAST", "false", out string msg);
+ LogHelper.Info($"Threadwxr2R銆傘� 鏍￠獙涓嬫枡瀹屾垚銆�);
}
else
{
@@ -535,6 +574,10 @@
LogHelper.Info($"Threadwxr2R銆傘� -鍙戦�鎵爜");
TcpServer.TcpServerSend(VERX.deviceNo[1], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E"));
}
+ }
+ else if (!tag.wxr2.R11)
+ {
+ TcpServer.TrayIps.Remove(VERX.deviceNo[1]);
}
}
}
@@ -850,7 +893,7 @@
if (tag.RGV.bit1taskOver == 1)
tag.RGV.bit1taskOver = 0;
- LogHelper.Info($"{task1.S_TASK_NO}> taskend 鍐�0");
+ LogHelper.Info($"{task1.S_TASK_NO}> taskend 鍐�125");
Conn.榛樿Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
LogHelper.Info($"{task1.S_TASK_NO}> bit1taskOver_LAST 鍐�0");
RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
@@ -953,7 +996,7 @@
var taskCOdes = new List<string> { "Sarrive", "Srelease", "Earrive", "Erelease" };
TaskActRepository taskActRepository = new TaskActRepository();
TaskRepository taskRepository = new TaskRepository();
- var requires = taskActRepository.FindList(x => taskCOdes.Contains(x.S_ACTION_CODE) && x.N_CREATEMETHOD == 0).OrderBy(x => x.T_CREATE);
+ var requires = taskActRepository.FindList(x => DateTime.Now.Subtract(x.T_CREATE).TotalHours < 1 && taskCOdes.Contains(x.S_ACTION_CODE) && x.N_CREATEMETHOD == 0).OrderBy(x => x.T_CREATE);
foreach (var item in requires)
{
LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE}鍏夋爡澶勭悊 =================> ");
@@ -1575,7 +1618,7 @@
}
- public void ResolveMesTask()
+ public void ResolveMesTask(Tag tag)
{
TaskRepository taskservice = new TaskRepository();
var tasks = taskservice.FindList(x => (x.S_B_STATE == "MES" || x.S_B_STATE == "People") && x.N_PRIORITY == -88);
@@ -1584,23 +1627,90 @@
foreach (var task in tasks)
{
LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} ");
+ if (task.S_TYPE?.Trim() == "100")
+ {
+ LogHelper.Info($"MES浠诲姟 S_TYPE 100->{task.S_TYPE} ");
+ }
var sx = VERXs?.Find(x => x.location.Contains(task.S_END_LOC));
LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} {(sx == null ? "闈� : "鏄�)}鎬昏鏈哄櫒浜轰换鍔�);
if (sx == null)
{
- LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 鐩存帴鐢熸垚瀵瑰簲浠诲姟");
- //鐩存帴鐢熸垚瀵瑰簲浠诲姟銆�- var res = TaskProcess.CreateTask(task.S_TASK_NO, task.S_START_LOC, task.S_END_LOC, task.S_TYPE, 6, task.S_CNTRS?.Split(',').ToList() ?? new List<string>());
-
- LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 鐩存帴鐢熸垚瀵瑰簲浠诲姟 缁撴灉锛歿res}");
- if (res)
+ if (string.IsNullOrEmpty(task.S_CNTRS) && !string.IsNullOrEmpty(task.S_INDEX))
{
- LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 淇敼鏍囪瘑");
- //task.N_PRIORITY = 0;
- taskservice.dbcontext.Set<TaskEntity>().Attach(task);
- taskservice.dbcontext.Entry(task).Property(x => x.N_PRIORITY).CurrentValue = 0;
- taskservice.dbcontext.Entry(task).Property(x => x.N_PRIORITY).IsModified = true;
- taskservice.dbcontext.SaveChanges();
+ // 鍙枡浠诲姟銆�鎸囧畾鐗╂枡涓嶆寚瀹氭墭鐩橈紝闇�鍑哄簱
+ switch (task.S_START_LOC)
+ {
+ case "2030":
+ if (!string.IsNullOrEmpty(tag.SA2030.R鎵樼洏鐮�)
+ {
+ var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
+ {
+ cntrCode = tag.SA2030.R鎵樼洏鐮�
+ type = 1
+ }));
+ var strr = JsonConvert.DeserializeObject<MES2234>(str);
+ if (strr.success && strr.data.materialCode == task.S_INDEX)
+ {
+ task.S_CNTRS = tag.SA2030.R鎵樼洏鐮�
+ taskservice.Update(task);
+ }
+ else
+ {
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 2030 鍑哄彛鐨勬墭鐩樼墿鏂欎笉绗﹀悎");
+ }
+ }
+ else
+ {
+ //TODO------------------2027 2220 2013.. 璇嗗埆涓�笅锛屽紑濮嬪簱
+ }
+ break;
+ case "1019":
+ if (!string.IsNullOrEmpty(tag.SA1019.R鎵樼洏鐮�)
+ {
+ var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
+ {
+ cntrCode = tag.SA1019.R鎵樼洏鐮�
+ type = 2
+ }));
+ var strr = JsonConvert.DeserializeObject<MES2234>(str);
+ if (strr.success && strr.data.materialCode == task.S_INDEX)
+ {
+ task.S_CNTRS = tag.SA2030.R鎵樼洏鐮�
+ taskservice.Update(task);
+ }
+ else
+ {
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 1019 鍑哄彛鐨勬墭鐩樼墿鏂欎笉绗﹀悎");
+ }
+ }
+ break;
+ }
+ }
+ else
+ {
+ if (new List<string> { "2001", "1022", "1025", "3001", "3006" }.Contains(task.S_END_LOC))
+ {
+ //------------------
+ }
+ else if (new List<string> { "1019"/*, "1030"*/, "2030", "3005", "3010" }.Contains(task.S_START_LOC)) //1030 鏄富鍔ㄧ敵璇凤紝 涓嶇敤鍒ゆ柇銆�+ {
+
+ }
+
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 鐩存帴鐢熸垚瀵瑰簲浠诲姟");
+ //鐩存帴鐢熸垚瀵瑰簲浠诲姟銆�+ var res = TaskProcess.CreateTask(task.S_TASK_NO, task.S_START_LOC, task.S_END_LOC, task.S_TYPE, 6, task.S_CNTRS?.Split(',').ToList() ?? new List<string>());
+
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 鐩存帴鐢熸垚瀵瑰簲浠诲姟 缁撴灉锛歿res}");
+ if (res)
+ {
+ LogHelper.Info($"瑙ｉ噴MES浠诲姟 ->{task.S_TASK_NO} 淇敼鏍囪瘑");
+ //task.N_PRIORITY = 0;
+ taskservice.dbcontext.Set<TaskEntity>().Attach(task);
+ taskservice.dbcontext.Entry(task).Property(x => x.N_PRIORITY).CurrentValue = 0;
+ taskservice.dbcontext.Entry(task).Property(x => x.N_PRIORITY).IsModified = true;
+ taskservice.dbcontext.SaveChanges();
+ }
}
}
else
@@ -2008,7 +2118,7 @@
if (ip.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
{
Console.WriteLine($"ip= {ip.ToString()}");
-
+ new HttpServer(ip.ToString()).HttpServerRun();
new TcpServer(ip.ToString());
var server = new EnhancedWebSocketServer($"http://{ip.ToString()}:8809/").StartAsync();
//var client = new WebSocketClient($"http://{ip.ToString()}:8809/").ConnectAsync();
@@ -2026,12 +2136,168 @@
+ }
+ public class HttpServer
+ {
+ System.Net.HttpListener HttpSvcHost = null;
+
+ public static string _listenerPrefix = "";
+ public HttpServer(string ip)
+ {
+ _listenerPrefix = $"http://{ip}:8808/";
+ }
+ public void HttpServerRun()
+ {
+ HttpSvcHost = new System.Net.HttpListener();
+ HttpSvcHost.AuthenticationSchemes = System.Net.AuthenticationSchemes.Anonymous;
+ HttpSvcHost.Prefixes.Add(_listenerPrefix);
+ HttpSvcHost.Start();
+ HttpSvcHost.BeginGetContext(HttpSvcListenerCallback, null);
+ }
+ private async void HttpSvcListenerCallback(IAsyncResult ar)
+ {
+ System.Net.HttpListenerContext context = null;
+ var data = DateTime.Now;
+ string apth = "";
+ try
+ {
+ HttpSvcHost.BeginGetContext(HttpSvcListenerCallback, null);
+ context = HttpSvcHost.EndGetContext(ar);
+ System.Net.HttpListenerRequest request = context.Request;
+ System.Net.HttpListenerResponse response = context.Response;
+ using (var reader = new System.IO.StreamReader(request.InputStream, System.Text.Encoding.UTF8))
+ {
+ string requestJson = reader.ReadToEnd();
+ System.Net.HttpStatusCode statusCode = 0;
+ apth = request.Url.AbsolutePath;
+ string respstr = HttpSvcListenerCallback_he(request.HttpMethod, request.Url.AbsolutePath, requestJson, out statusCode);
+ string logContent = "";
+ logContent += $"\r\n[{request.HttpMethod}]{request.Url.AbsolutePath}";
+ logContent += $"\r\n[request]{requestJson}";
+ logContent += $"\r\n[response]{respstr}";
+ _ = Task.Run(() =>
+ {
+ Conn.榛樿鏃ュ織?.Info(logContent);
+ });
+ byte[] bytstr = Encoding.UTF8.GetBytes(respstr);
+ response.StatusCode = (int)statusCode;
+ response.SendChunked = false;
+ response.ContentLength64 = bytstr.Length;
+ //response.OutputStream.Write(bytstr, 0, bytstr.Length);
+ if (request.Url.AbsolutePath.ToLower().Contains(".js"))
+ response.ContentType = "application/javascript";
+ else if (request.Url.AbsolutePath.ToLower().Contains(".svg"))
+ response.ContentType = "image/svg+xml";
+ // 寮傛鍐欏叆鍝嶅簲
+ await response.OutputStream.WriteAsync(bytstr, 0, bytstr.Length);
+ }
+ }
+ catch (Exception ex)
+ {
+ _ = Task.Run(() =>
+ {
+ Conn.榛樿鏃ュ織.Error(ex.ToString());
+ });
+ }
+ finally
+ {
+ context?.Response.Close();
+ Console.WriteLine(apth + "<<>>" + DateTime.Now.Subtract(data).TotalMilliseconds);
+ }
+ }
+ private System.String HttpSvcListenerCallback_he(System.String method, System.String path, System.String requestJson, out System.Net.HttpStatusCode statusCode)
+ {
+ try
+ {
+ switch (method)
+ {
+ case "POST":
+ {
+ switch (path)
+ {
+ case "/agv/agvCallbackService/agvCallback":
+ {
+ statusCode = System.Net.HttpStatusCode.OK;
+ LogHelper.Info("ExecuteState Request-haikang锛� + requestJson);
+ var model = JsonConvert.DeserializeObject<HaiKangOrderInfo>(requestJson);
+ AutoThread.Instance.OperateHKTaskStatus(model);
+ return JsonConvert.SerializeObject(new HkReturnResult { reqCode = model.reqCode });
+ }
+ case "/api/Wcs/CreateTask":
+ {
+ statusCode = System.Net.HttpStatusCode.OK;
+
+ LogHelper.Info("/api/Wcs/CreateTask锛� + requestJson);
+ var model = JsonConvert.DeserializeObject<ToWMSMES.CreateTask>(requestJson);
+ var res = ToWMSMES.CreateTask.CreatemesTask(model);
+ return JsonConvert.SerializeObject(res);
+ }
+ case "/api/Wcs/TestRequestTask":
+ {
+ statusCode = System.Net.HttpStatusCode.OK;
+ LogHelper.Info("/api/Wcs/TestRequestTask锛� + requestJson);
+ var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", requestJson);
+ return str;
+ }
+ case "/api/Wcs/updateStatus":
+ {
+ statusCode = System.Net.HttpStatusCode.OK;
+ LogHelper.Info("/api/Wcs/updateStatus锛� + requestJson);
+ var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/201", requestJson);
+ return str;
+ }
+ case "/api/Wcs/toMes":
+ {
+ statusCode = System.Net.HttpStatusCode.OK;
+
+ LogHelper.Info("/api/Wcs/toMes锛� + requestJson);
+ var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/202", requestJson);
+ return str;
+ }
+ case "/api/Wcs/CreatePointTask":
+ {
+ statusCode = System.Net.HttpStatusCode.OK;
+
+ LogHelper.Info("/api/Wcs/CreatepointTask锛� + requestJson);
+ var model = JsonConvert.DeserializeObject<ToWMSMES.CreateTask>(requestJson);
+ var res = ToWMSMES.CreateTask.CreatePointTask(model);
+ return JsonConvert.SerializeObject(res);
+ }
+ }
+ break;
+ }
+ case "GET":
+ {
+ switch (path)
+ {
+ case var _ when System.Text.RegularExpressions.Regex.IsMatch(path, @"\.(html|ico|js|css)(\?.*)?$", System.Text.RegularExpressions.RegexOptions.IgnoreCase):
+ {
+ statusCode = System.Net.HttpStatusCode.OK;
+ // 澶嶅埗鍒癱ase 涓�+ //var _ when System.Text.RegularExpressions.Regex.IsMatch(path, @"\.(html|ico|js|css)(\?.*)?$", System.Text.RegularExpressions.RegexOptions.IgnoreCase)
+ var filePath = /*Directory.GetCurrentDirectory() + "\\Static" + "\\" + path.Substring(1);*/System.IO.Path.Combine(Directory.GetCurrentDirectory() + "\\Static", path.Substring(1));
+ return File.ReadAllText(filePath);
+ }
+ }
+ break;
+ }
+ }
+ statusCode = System.Net.HttpStatusCode.NotFound;
+ return "";
+ }
+ catch (Exception ex)
+ {
+ Conn.榛樿鏃ュ織.Error(ex.ToString());
+ statusCode = System.Net.HttpStatusCode.InternalServerError;
+ return "";
+ }
+ }
}
class EnhancedWebSocketServer
@@ -2170,8 +2436,6 @@
}
-
-
internal class WebSocketClient
{
private ClientWebSocket _webSocket = new ClientWebSocket();
@@ -2256,6 +2520,24 @@
public Ddata data { get; set; }
public object extra { get; set; }
}
+ class Mesrespone
+ {
+ public bool success { get; set; }
+ public string msg { get; set; }
+ public object extra { get; set; }
+ }
+
+ class MES2234
+ {
+ public bool success { get; set; }
+ public ML data { get; set; }
+ }
+
+ public class ML
+ {
+ public string materialCode { get; set; }
+ public int lineNum { get; set; }
+ }
public class Ddata
{
--
Gitblit v1.9.1