From a47e45d04ca5beadcf815d852cae52ef56f669e5 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期三, 23 七月 2025 16:39:33 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/界面事件.cs | 192 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 146 insertions(+), 46 deletions(-)
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\347\225\214\351\235\242\344\272\213\344\273\266.cs" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\347\225\214\351\235\242\344\272\213\344\273\266.cs"
index b0ec9b5..b14d39f 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\347\225\214\351\235\242\344\272\213\344\273\266.cs"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\347\225\214\351\235\242\344\272\213\344\273\266.cs"
@@ -28,6 +28,8 @@
using GZ.DB.Repository.OIDATABASE;
using GZ.DB.IRepository.OIDATABASE;
using GZ.DB.Entity.OIDATABASE;
+using static GZ.Projects.AuxAllWCS.ToWMSMES.CreateTask;
+using GZ.Device.PLC;
namespace GZ.Projects.AuxAllWCS
{
/// <summary>
@@ -55,6 +57,7 @@
//HttpSvcHost.Prefixes.Add("http://10.221.55.117:8808/");
//HttpSvcHost.Start();
//HttpSvcHost.BeginGetContext(HttpSvcListenerCallback, null);
+ LogHelper.Info("<<<<<<<<<<<Runnnnnnnnnnnnninggggg>>>>>>>>>>");
}
catch (Exception ex)
{
@@ -62,6 +65,14 @@
}
View1_Init(sender, e);
+ var path = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configs");
+ string text = File.ReadAllText(configPath);
+ PlcConfig plcConfig = JsonConvert.DeserializeObject<PlcConfig>(text);
+ if (plcConfig != null && FactoryMap.ContainsKey((int)plcConfig.Brand) && FactoryMap[(int)plcConfig.Brand].Contains((int)plcConfig.Comm))
+ {
+
+ }
+ Console.Write(path);
/// <summary>
/// 绋嬪簭鐗囨:鍒濆鍖栭厤缃� /// 鎻忚堪:
@@ -763,7 +774,6 @@
}
ExitJudgeStack.TryPop(out int exitJudgeVal);
});
-
/// <summary>
/// 绋嬪簭鐗囨:Program1
/// 鎻忚堪:
@@ -794,35 +804,66 @@
}
ExitJudgeStack.TryPop(out int exitJudgeVal);
});
- //鎵ц澶氭
- for (int iii = 0; iii < 1; iii++)
+ /// <summary>
+ /// 绋嬪簭鐗囨:Ipping
+ /// 鎻忚堪:妫�祴IP鍦板潃閫氭柇
+ /// </summary>
+ System.Threading.Tasks.Task.Factory.StartNew(() =>
{
- if (IsExitApp) { break; }
- try
+ System.Threading.Thread.CurrentThread.IsBackground = true;
+ ExitJudgeStack.Push(0);
+ //涓�洿鎵ц锛岀洿鍒版弧瓒崇粨鏉熸潯浠�+ while (true)
{
- #region [鑴氭湰][20250323151832119][涓氬姟閫昏緫.Program4]
+ if (IsExitApp) { break; }
+ try
+ {
+ #region [鑴氭湰][20250323151832119][涓氬姟閫昏緫.Ipping]
- //LogHelper.Info($"<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>");
- //LogHelper.Info($"<<<<<<<<<<<<<<<<<绋嬪簭路鍚姩>>>>>>>>>>>>>>");
-
- //// 浣跨敤鎷︽埅鍣�- //var interceptor = new ConsoleInterceptor();
- //Console.SetOut(interceptor);
-
- //LogHelper.Info($"<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>");
- //AnsiConsole.Markup("[underline red]Hello[/] World!");
- // AnsiConsole.Markup("[underline red]Hello[/] World!");
- #endregion [鑴氭湰][20250323151832119][涓氬姟閫昏緫.Program4]
+ //var hkr = AutoThread.InvokeMethod(AutoThread.Instance, "IsMachineOnline", new object[] { "192.168.1.103", 1000 });
+ //Console.WriteLine("192.168.1.103 > " + hkr.ToString());
+ #endregion [鑴氭湰][20250323151832119][涓氬姟閫昏緫.Ipping]
+ }
+ catch (Exception ex)
+ {
+ Conn.榛樿鏃ュ織.Error(ex.ToString());
+ }
+ finally
+ {
+ System.Threading.Thread.Sleep(3000);
+ }
}
- catch (Exception ex)
+ ExitJudgeStack.TryPop(out int exitJudgeVal);
+ });
+ /// <summary>
+ /// 绋嬪簭鐗囨:鏂扮嚎绋嬫�绾�+ /// 鎻忚堪:1
+ /// </summary>
+ System.Threading.Tasks.Task.Factory.StartNew(() =>
+ {
+ System.Threading.Thread.CurrentThread.IsBackground = true;
+ ExitJudgeStack.Push(0);
+ //涓�洿鎵ц锛岀洿鍒版弧瓒崇粨鏉熸潯浠�+ while (true)
{
- Conn.榛樿鏃ュ織.Error(ex.ToString());
+ if (IsExitApp) { break; }
+ try
+ {
+ #region [鑴氭湰][20250708095248653][涓氬姟閫昏緫.鏂扮嚎绋嬫�绾縘
+ AutoThread.InvokeMethod(AutoThread.Instance, "ThreaTotal", new object[] { tag, Device });
+ #endregion [鑴氭湰][20250708095248653][涓氬姟閫昏緫.鏂扮嚎绋嬫�绾縘
+ }
+ catch (Exception ex)
+ {
+ Conn.榛樿鏃ュ織.Error(ex.ToString());
+ }
+ finally
+ {
+ System.Threading.Thread.Sleep(3000);
+ }
}
- finally
- {
- System.Threading.Thread.Sleep(3000);
- }
- }
+ ExitJudgeStack.TryPop(out int exitJudgeVal);
+ });
}
/// <summary>
@@ -926,7 +967,24 @@
Device.A2030鍙栬揣浜や簰?.Stop();
Device.RGV?.Stop();
Device.p鍙戦偅绉�涓嬬嚎?.Stop();
- Device.p鍙戦偅绉�涓婄嚎?.Stop();
+ Device.D瀹氬瓙1鍙锋満姊版墜?.Stop();
+ Device.D瀹氬瓙2鍙锋満姊版墜?.Stop();
+ Device.S2027Read?.Stop();
+ Device.S2020Read?.Stop();
+ Device.S2013Read?.Stop();
+ Device.S2027Write?.Stop();
+ Device.S2020Write?.Stop();
+ Device.S2013Write?.Stop();
+ Device.S2001Write?.Stop();
+ Device.S2008Write?.Stop();
+ Device.S3001Read?.Stop();
+ Device.S3006Read?.Stop();
+ Device.S3005Read?.Stop();
+ Device.S3010Read?.Stop();
+ Device.A3001鏀捐揣浜や簰?.Stop();
+ Device.A3005鍙栬揣浜や簰?.Stop();
+ Device.A3006鏀捐揣浜や簰?.Stop();
+ Device.A3010鍙栬揣浜や簰?.Stop();
}
catch (Exception ex)
{
@@ -978,7 +1036,24 @@
|| (Device.A2030鍙栬揣浜や簰 == null ? false : Device.A2030鍙栬揣浜や簰.State != GZ.Device.PLC.PlcRunState.Stoped)
|| (Device.RGV == null ? false : Device.RGV.State != GZ.Device.PLC.PlcRunState.Stoped)
|| (Device.p鍙戦偅绉�涓嬬嚎 == null ? false : Device.p鍙戦偅绉�涓嬬嚎.State != GZ.Device.PLC.PlcRunState.Stoped)
- || (Device.p鍙戦偅绉�涓婄嚎 == null ? false : Device.p鍙戦偅绉�涓婄嚎.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.D瀹氬瓙1鍙锋満姊版墜 == null ? false : Device.D瀹氬瓙1鍙锋満姊版墜.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.D瀹氬瓙2鍙锋満姊版墜 == null ? false : Device.D瀹氬瓙2鍙锋満姊版墜.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.S2027Read == null ? false : Device.S2027Read.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.S2020Read == null ? false : Device.S2020Read.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.S2013Read == null ? false : Device.S2013Read.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.S2027Write == null ? false : Device.S2027Write.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.S2020Write == null ? false : Device.S2020Write.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.S2013Write == null ? false : Device.S2013Write.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.S2001Write == null ? false : Device.S2001Write.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.S2008Write == null ? false : Device.S2008Write.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.S3001Read == null ? false : Device.S3001Read.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.S3006Read == null ? false : Device.S3006Read.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.S3005Read == null ? false : Device.S3005Read.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.S3010Read == null ? false : Device.S3010Read.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.A3001鏀捐揣浜や簰 == null ? false : Device.A3001鏀捐揣浜や簰.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.A3005鍙栬揣浜や簰 == null ? false : Device.A3005鍙栬揣浜や簰.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.A3006鏀捐揣浜や簰 == null ? false : Device.A3006鏀捐揣浜や簰.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.A3010鍙栬揣浜や簰 == null ? false : Device.A3010鍙栬揣浜や簰.State != GZ.Device.PLC.PlcRunState.Stoped)
)
{
System.Threading.Thread.Sleep(1000);
@@ -1054,13 +1129,12 @@
#endregion
#region Http鏈嶅姟鐩戝惉
- private async void HttpSvcListenerCallback(IAsyncResult ar)
+ private void HttpSvcListenerCallback(IAsyncResult ar)
{
- System.Net.HttpListenerContext context = null;
try
{
HttpSvcHost.BeginGetContext(HttpSvcListenerCallback, null);
- context = HttpSvcHost.EndGetContext(ar);
+ System.Net.HttpListenerContext context = HttpSvcHost.EndGetContext(ar);
System.Net.HttpListenerRequest request = context.Request;
System.Net.HttpListenerResponse response = context.Response;
switch (request.LocalEndPoint.ToString())
@@ -1070,28 +1144,21 @@
using (var reader = new System.IO.StreamReader(request.InputStream, System.Text.Encoding.UTF8))
{
string requestJson = reader.ReadToEnd();
- System.Net.HttpStatusCode statusCode = 0;
- string respstr = await Task.Run(() =>
- {
- return HttpSvcListenerCallback_he(request.HttpMethod, request.Url.AbsolutePath, requestJson, out statusCode);
- });
+
+ string respstr = HttpSvcListenerCallback_he(request.HttpMethod, request.Url.AbsolutePath, requestJson, out System.Net.HttpStatusCode 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);
- });
+ 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);
- // 寮傛鍐欏叆鍝嶅簲
- await response.OutputStream.WriteAsync(bytstr, 0, bytstr.Length);
-
+ response.Close();
}
break;
}
@@ -1100,10 +1167,6 @@
catch (Exception ex)
{
Conn.榛樿鏃ュ織.Error(ex.ToString());
- }
- finally
- {
- context?.Response.Close();
}
}
private System.String HttpSvcListenerCallback_he(System.String method, System.String path, System.String requestJson, out System.Net.HttpStatusCode statusCode)
@@ -1165,6 +1228,43 @@
var res = ToWMSMES.CreateTask.CreatePointTask(model);
return JsonConvert.SerializeObject(res);
}
+ case "/api/Wcs/initZZCache":
+ {
+ statusCode = System.Net.HttpStatusCode.OK;
+
+ var rturn = new ReturnMsg
+ {
+ resultCode = 0,
+ resultMsg = ""
+ };
+ try
+ {
+ LocRepository locRepository = new LocRepository();
+ foreach (var item in Settings.deviceInfos.FindAll(x => x.deviceType == 2))
+ {
+ foreach (var ssloc in item.deviceNo)
+ {
+ var ssl = locRepository.FindEntity(x => x.S_LOC_CODE == ssloc);
+ if (ssl != null && (ssl.N_CURRENT_NUM > 0 || ssl.S_LOCK_STATE != "鏃�))
+ {
+ ssl.N_CURRENT_NUM = 0;
+ ssl.S_LOCK_STATE = "鏃�;
+ locRepository.Update(ssl);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error("/api/Wcs/initZZCache" + requestJson + ex.Message, ex);
+ return JsonConvert.SerializeObject(new ReturnMsg
+ {
+ resultCode = -1,
+ resultMsg = ex.Message
+ });
+ }
+ return JsonConvert.SerializeObject(rturn);
+ }
}
break;
}
@@ -1172,7 +1272,7 @@
{
switch (path)
{
- case var _ when System.Text.RegularExpressions.Regex.IsMatch(path, @"\.(html|ico|js|css)(\?.*)?$", System.Text.RegularExpressions.RegexOptions.IgnoreCase):
+ case "/inddddddddddddddddd":
{
statusCode = System.Net.HttpStatusCode.OK;
// 澶嶅埗鍒癱ase 涓�
--
Gitblit v1.9.1