From 5cb28a17ca74fc0fbb07e25af0c3554951e4c2d9 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期三, 25 六月 2025 10:46:16 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/界面事件.cs | 136 +++++++++++++++++++++++----------------------
1 files changed, 69 insertions(+), 67 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 dcd8065..6b8853f 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,9 +28,6 @@
using GZ.DB.Repository.OIDATABASE;
using GZ.DB.IRepository.OIDATABASE;
using GZ.DB.Entity.OIDATABASE;
-using GZ.Modular.Redis;
-using System.Security.Cryptography;
-using System.Windows.Interop;
namespace GZ.Projects.AuxAllWCS
{
/// <summary>
@@ -55,7 +52,7 @@
{
HttpSvcHost = new System.Net.HttpListener();
HttpSvcHost.AuthenticationSchemes = System.Net.AuthenticationSchemes.Anonymous;
- HttpSvcHost.Prefixes.Add("http://10.221.55.116:8808/");
+ HttpSvcHost.Prefixes.Add("http://10.221.55.117:8808/");
HttpSvcHost.Start();
HttpSvcHost.BeginGetContext(HttpSvcListenerCallback, null);
}
@@ -80,29 +77,9 @@
try
{
#region [鑴氭湰][20250323111613779][涓氬姟閫昏緫.鍒濆鍖栭厤缃甝
- //LogHelper.Info("1111 +" + DateTime.Now);
- //((Type)typeof(Utils)).GetMethod("ThreadSettingInit").Invoke(new Utils(), null);
- //LogHelper.Info("2222 +" + DateTime.Now);
- //((Type)typeof(Utils)).GetMethod("ThreadSettingInit").Invoke(new Utils(), new object[] { });
- //LogHelper.Info("3333 +" + DateTime.Now);
+
Action myDelegate = () => SettingInit();
AutoThread.InvokeMethod(AutoThread.Instance, "ThreadSettingInit", new object[] { tag, myDelegate });
- //LogHelper.Info("4444 +" + DateTime.Now);
- //AutoThread.InvokeMethod(AutoThread.Instance, "ThreadSettingInit", null);
- //LogHelper.Info("4444 +" + DateTime.Now);
-
- //if (Tag.Global.SettingsOver == 0)
- //{
- // SettingInit();
- // Tag.Global.SettingsOver = 1;
- //}
- //else if (Settings.deviceInfos.Count == 0)
- //{
- // Tag.Global.SettingsOver = 0;
- //}
- //var _=tag.wxr1.R46_LAST;
- //RedisHelper.Add($"缁村笇灏旀姄鑷�.R46_LAST", "true", out string msg);
-
#endregion [鑴氭湰][20250323111613779][涓氬姟閫昏緫.鍒濆鍖栭厤缃甝
}
catch (Exception ex)
@@ -123,46 +100,45 @@
try
{
#region [鑴氭湰][20250323151832119][涓氬姟閫昏緫.Program4]
- //Conn.榛樿Redis.SetValue("瑗块棬瀛�.Param3","300","瑗块棬瀛�Queue");
- //return;
- if (false)
- {
- List<string> locs = new List<string>() { "vxr1l", "vx1r", "vxr1c1", "vxr1c2", "vxr2l", "vxr2r", "vxr2c1", "vxr2c2" };
- List<string> sites = new List<string>() { "196365BB283162", "193841BB283149", "198756BB287300", "198767BB286133", "206987BB282931", "204460BB282975", "209405BB287057", "209377BB285899" };
+ ////Conn.榛樿Redis.SetValue("瑗块棬瀛�.Param3","300","瑗块棬瀛�Queue");
+ ////return;
+ //if(false){
+ // List<string> locs = new List<string>() { "vxr1l", "vx1r", "vxr1c1", "vxr1c2", "vxr2l", "vxr2r", "vxr2c1", "vxr2c2" };
+ // List<string> sites = new List<string>() { "196365BB283162", "193841BB283149", "198756BB287300", "198767BB286133", "206987BB282931", "204460BB282975", "209405BB287057", "209377BB285899" };
- LocRepository locservice = new LocRepository();
- for (int i = 0; i < locs.Count; i++)
- {
- string loccode = locs[i];
- string sitesss = sites[i];
- var loc = locservice.FindEntity(x => x.S_LOC_CODE == loccode);
- if (loc == null)
- {
- locservice.Insert(new LocEntity
- {
- S_ID = Guid.NewGuid().ToString(),
- S_STATE = "缂栬緫",
- T_CREATE = DateTime.Now,
- T_MODIFY = DateTime.Now,
- S_DEEP = "vxr",
+ // LocRepository locservice = new LocRepository();
+ // for (int i = 0; i < locs.Count; i++)
+ // {
+ // string loccode = locs[i];
+ // string sitesss = sites[i];
+ // var loc = locservice.FindEntity(x => x.S_LOC_CODE == loccode);
+ // if (loc == null)
+ // {
+ // locservice.Insert(new LocEntity
+ // {
+ // S_ID = Guid.NewGuid().ToString(),
+ // S_STATE = "缂栬緫",
+ // T_CREATE = DateTime.Now,
+ // T_MODIFY = DateTime.Now,
+ // S_DEEP = "vxr",
- S_LOC_CODE = loccode,
- S_AGV_SITE = sitesss,
+ // S_LOC_CODE = loccode,
+ // S_AGV_SITE = sitesss,
- S_LOCK_STATE = "鏃�,
- N_ROW = 1,
- N_COL = 1,
- N_AGV_CODE = 0,
- N_AGV_SITE_LAYER = 0,
- N_CAPACITY = 1,
- N_CURRENT_NUM = 0,
- S_TYPE = "",
+ // S_LOCK_STATE = "鏃�,
+ // N_ROW = 1,
+ // N_COL = 1,
+ // N_AGV_CODE = 0,
+ // N_AGV_SITE_LAYER = 0,
+ // N_CAPACITY = 1,
+ // N_CURRENT_NUM = 0,
+ // S_TYPE = "",
- });
- }
- }
- // TaskProcess.CreateTask("", locs[6], locs[7], "test", 9, new List<string> { "test" }, 1, 1, 1);
- }
+ // });
+ // }
+ // }
+ // // TaskProcess.CreateTask("", locs[6], locs[7], "test", 9, new List<string> { "test" }, 1, 1, 1);
+ // }
#endregion [鑴氭湰][20250323151832119][涓氬姟閫昏緫.Program4]
}
@@ -220,10 +196,8 @@
try
{
#region [鑴氭湰][20250325083326611][涓氬姟閫昏緫.绗笁鏍囨.鎹风灛鎶撹噦2]
- //jsz2鎹风灛鎶撹噦2
AutoThread.InvokeMethod(AutoThread.Instance, "ThreadJS2", new object[] { tag });
-
#endregion [鑴氭湰][20250325083326611][涓氬姟閫昏緫.绗笁鏍囨.鎹风灛鎶撹噦2]
}
catch (Exception ex)
@@ -256,6 +230,24 @@
// if (di.deviceType == 2 || di.deviceType == 1)
// RunafterMac(di,true);
/// TODO mes 涓嬪彂銆� 鏀规垚鏈烘鑷傜洃鎺�- 鐩戞帶绌虹殑杩樻槸婊＄殑 - 鑱斿姩mes 浠诲姟銆�+
+ LogHelper.Info($"璁惧鐘舵�锛氱淮甯屽皵1锛氱淮甯屽皵鎶撹噦1.State:{Device.缁村笇灏旀姄鑷�.State} ");
+ Device.缁村笇灏旀姄鑷�.ReadPLC("缁村笇灏旀姄鑷�.R50", out object value);
+ LogHelper.Info($"璁惧鐘舵�锛氱淮甯屽皵1锛氱淮甯屽皵鎶撹噦1.R50:{value?.ToString()} ");
+
+ LogHelper.Info($"璁惧鐘舵�锛氱淮甯屽皵2锛氱淮甯屽皵鎶撹噦2.State:{Device.缁村笇灏旀姄鑷�.State} ");
+ Device.缁村笇灏旀姄鑷�.ReadPLC("缁村笇灏旀姄鑷�.R50", out value);
+ LogHelper.Info($"璁惧鐘舵�锛氱淮甯屽皵2锛氱淮甯屽皵鎶撹噦2.R50:{value?.ToString()} ");
+
+ LogHelper.Info($"璁惧鐘舵�锛氭嵎鐬�锛欽s鎹烽『1.State:{Device.Js鎹烽『1.State} ");
+ Device.Js鎹烽『1.ReadPLC("Js鎹烽『1.D1202", out value);
+ LogHelper.Info($"璁惧鐘舵�锛氭嵎鐬� Js鎹烽『1.D1202:{value?.ToString()} ");
+
+ LogHelper.Info($"璁惧鐘舵�锛氭嵎鐬�锛欽s鎹烽『2.State:{Device.Js鎹烽『2.State} ");
+ Device.Js鎹烽『2.ReadPLC("Js鎹烽『2.D1202", out value);
+ LogHelper.Info($"璁惧鐘舵�锛氭嵎鐬� Js鎹烽『2.D1202:{value?.ToString()} ");
+
+
#endregion [鑴氭湰][20250325085810885][涓氬姟閫昏緫.绗笁鏍囨.鑷祦杞祦绋媇
}
catch (Exception ex)
@@ -314,6 +306,7 @@
try
{
#region [鑴氭湰][20250610002047005][涓氬姟閫昏緫.绗笁鏍囨.缁寸郴灏�鍙�缁村笇灏旀姄鑷�R]
+
AutoThread.InvokeMethod(AutoThread.Instance, "Threadwxr1R", new object[] { tag });
#endregion [鑴氭湰][20250610002047005][涓氬姟閫昏緫.绗笁鏍囨.缁寸郴灏�鍙�缁村笇灏旀姄鑷�R]
}
@@ -343,6 +336,7 @@
try
{
#region [鑴氭湰][20250325083315503][涓氬姟閫昏緫.绗笁鏍囨.缁寸郴灏�鍙�缁村笇灏旀姄鑷�L]
+
AutoThread.InvokeMethod(AutoThread.Instance, "Threadwxr2L", new object[] { tag });
#endregion [鑴氭湰][20250325083315503][涓氬姟閫昏緫.绗笁鏍囨.缁寸郴灏�鍙�缁村笇灏旀姄鑷�L]
}
@@ -372,6 +366,7 @@
try
{
#region [鑴氭湰][20250610002647095][涓氬姟閫昏緫.绗笁鏍囨.缁寸郴灏�鍙�缁村笇灏旀姄鑷�R]
+
AutoThread.InvokeMethod(AutoThread.Instance, "Threadwxr2R", new object[] { tag });
#endregion [鑴氭湰][20250610002647095][涓氬姟閫昏緫.绗笁鏍囨.缁寸郴灏�鍙�缁村笇灏旀姄鑷�R]
}
@@ -386,7 +381,6 @@
}
ExitJudgeStack.TryPop(out int exitJudgeVal);
});
-
/// <summary>
/// 绋嬪簭鐗囨:浠诲姟涓嬪彂
/// 鎻忚堪:
@@ -487,6 +481,7 @@
// - 鍏夋爡浜や簰澶勭悊銆傘�
Action<HaiKangOrderInfo> myDelegate = (t) => continueTask(t);
AutoThread.InvokeMethod(AutoThread.Instance, "ThreadGrats", new object[] { tag, myDelegate });
+
// 鍙戦偅绉戜笅鏂欏厜鏍呫�
#endregion [鑴氭湰][20250611223832523][涓氬姟閫昏緫.鍏夋爡澶勭悊]
}
@@ -516,6 +511,7 @@
try
{
#region [鑴氭湰][20250616094224396][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.1020绌烘涓嬬嚎]
+
//1020 1023 绌烘涓嬬嚎
AutoThread.InvokeMethod(AutoThread.Instance, "ThreadEdown", new object[] { tag });
#endregion [鑴氭湰][20250616094224396][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.1020绌烘涓嬬嚎]
@@ -575,6 +571,7 @@
try
{
#region [鑴氭湰][20250616094632985][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.瀹氬瓙婊′笅绾縘
+
//瀹氬瓙婊′笅绾� 1008 1016 -> 1026
AutoThread.InvokeMethod(AutoThread.Instance, "ThreadDdown", new object[] { tag });
#endregion [鑴氭湰][20250616094632985][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.瀹氬瓙婊′笅绾縘
@@ -605,6 +602,7 @@
try
{
#region [鑴氭湰][20250616094511322][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.杞瓙婊′笅绾縘
+
//杞瓙婊′笅绾� 1002 1010 - RGV2宸ヤ綅涓嶅彲鍒�1017 涓嶅彲涓嬪彂2宸ヤ綅浠诲姟銆� AutoThread.InvokeMethod(AutoThread.Instance, "Thread0210Down", new object[] { tag });
#endregion [鑴氭湰][20250616094511322][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.杞瓙婊′笅绾縘
@@ -635,6 +633,7 @@
try
{
#region [鑴氭湰][20250616095605911][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.涓嬫枡浣嶆娴媇
+
//涓嬫枡浣嶆娴嬨� 1003 鍒颁綅鏃�鍐�鏍囪瘑淇″彿 骞�缁欐満姊版墜淇″彿銆�
AutoThread.InvokeMethod(AutoThread.Instance, "Thread涓嬫枡浣嶆娴�, new object[] { tag });
#endregion [鑴氭湰][20250616095605911][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.涓嬫枡浣嶆娴媇
@@ -664,9 +663,8 @@
if (IsExitApp) { break; }
try
{
-
- ////2217 - 1003
#region [鑴氭湰][20250616095709155][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.1鍙稦NK鏈烘鎵嬪畬鎴怾
+
AutoThread.InvokeMethod(AutoThread.Instance, "ThreadFNK1Over", new object[] { tag });
#endregion [鑴氭湰][20250616095709155][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.1鍙稦NK鏈烘鎵嬪畬鎴怾
}
@@ -696,6 +694,7 @@
try
{
#region [鑴氭湰][20250616095733680][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.2鍙稦NK鏈烘鎵嬪畬鎴怾
+
AutoThread.InvokeMethod(AutoThread.Instance, "ThreadFNK2Over", new object[] { tag });
#endregion [鑴氭湰][20250616095733680][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.2鍙稦NK鏈烘鎵嬪畬鎴怾
}
@@ -785,6 +784,7 @@
try
{
#region [鑴氭湰][20250617085750712][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.1022agv涓婄┖.Program1]
+
AutoThread.InvokeMethod(AutoThread.Instance, "Thread1022Up", new object[] { tag });
#endregion [鑴氭湰][20250617085750712][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.1022agv涓婄┖.Program1]
}
@@ -814,6 +814,7 @@
try
{
#region [鑴氭湰][20250617085800942][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.1030涓嬫瘝鎵�Program1]
+
AutoThread.InvokeMethod(AutoThread.Instance, "Thread1030Down", new object[] { tag });
#endregion [鑴氭湰][20250617085800942][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.1030涓嬫瘝鎵�Program1]
}
@@ -843,6 +844,7 @@
try
{
#region [鑴氭湰][20250617085809982][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.2030杈撻�绾夸笅瀹氬瓙.Program1]
+
AutoThread.InvokeMethod(AutoThread.Instance, "Thread2030Down", new object[] { tag });
#endregion [鑴氭湰][20250617085809982][涓氬姟閫昏緫.娴佺▼2鐑鐞嗙倝杩涘嚭.2030杈撻�绾夸笅瀹氬瓙.Program1]
}
@@ -1066,7 +1068,7 @@
System.Net.HttpListenerResponse response = context.Response;
switch (request.LocalEndPoint.ToString())
{
- case "10.221.55.116:8808":
+ case "10.221.55.117:8808":
{
using (var reader = new System.IO.StreamReader(request.InputStream, System.Text.Encoding.UTF8))
{
--
Gitblit v1.9.1