From 3113cd6842c8b68c11edbdc5b485d273c30cb7df Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期三, 02 七月 2025 13:22:40 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/界面事件.cs | 149 ++++++++++++++++++++++++-------------------------
1 files changed, 73 insertions(+), 76 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 a128334..023f0d4 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"
@@ -78,14 +78,8 @@
{
#region [鑴氭湰][20250323111613779][涓氬姟閫昏緫.鍒濆鍖栭厤缃甝
- //string a = "{\"success\":true,\"data\":{\"reqCode\":\"008fa3146caa446aa772e160bb3867b6\",\"state\":\"1\",\"error\":\"娌℃湁鍙互浣跨敤鐨勭紦瀛樼偣浣峔"},\"extra\":{}}";
-
- //var tsret = JsonConvert.DeserializeObject<Messss>(a);
Action myDelegate = () => SettingInit();
- /*var ts = */
AutoThread.InvokeMethod(AutoThread.Instance, "ThreadSettingInit", new object[] { tag, myDelegate });
- //if (ts.GetType() == typeof(HkReturnResult))
- // Console.WriteLine(ts);
#endregion [鑴氭湰][20250323111613779][涓氬姟閫昏緫.鍒濆鍖栭厤缃甝
}
catch (Exception ex)
@@ -99,64 +93,6 @@
}
ExitJudgeStack.TryPop(out int exitJudgeVal);
});
- //鎵ц澶氭
- for (int iii = 0; iii < 1; iii++)
- {
- if (IsExitApp) { break; }
- 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" };
-
- // 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_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);
- // }
-
- #endregion [鑴氭湰][20250323151832119][涓氬姟閫昏緫.Program4]
- }
- catch (Exception ex)
- {
- Conn.榛樿鏃ュ織.Error(ex.ToString());
- }
- finally
- {
- System.Threading.Thread.Sleep(3000);
- }
- }
/// <summary>
/// 绋嬪簭鐗囨:鎹风灛鎶撹噦1
/// 鎻忚堪:
@@ -237,21 +173,21 @@
// 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($"璁惧鐘舵�锛氱淮甯屽皵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($"璁惧鐘舵�锛氱淮甯屽皵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鎹烽『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()} ");
+ 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][涓氬姟閫昏緫.绗笁鏍囨.鑷祦杞祦绋媇
@@ -865,6 +801,35 @@
}
ExitJudgeStack.TryPop(out int exitJudgeVal);
});
+ //鎵ц澶氭
+ for (int iii = 0; iii < 1; iii++)
+ {
+ if (IsExitApp) { break; }
+ try
+ {
+ #region [鑴氭湰][20250323151832119][涓氬姟閫昏緫.Program4]
+
+ //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]
+ }
+ catch (Exception ex)
+ {
+ Conn.榛樿鏃ュ織.Error(ex.ToString());
+ }
+ finally
+ {
+ System.Threading.Thread.Sleep(3000);
+ }
+ }
}
/// <summary>
@@ -1055,6 +1020,38 @@
}
#endregion
+ #region View2浜嬩欢
+ /// <summary>
+ /// View2鎵撳紑浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ public void View2_LoadEvent(object sender, RoutedEventArgs e)
+ {
+
+
+
+ }
+ /// <summary>
+ /// View2鍏抽棴浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ public void View2_CloseEvent(object sender, System.ComponentModel.CancelEventArgs e)
+ {
+
+
+ }
+ /// <summary>
+ /// View2鍒濆鍖�+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ public void View2_Init(object sender, RoutedEventArgs e)
+ {
+ }
+ #endregion
+
#region 鍒囨崲tab椤� public void tab_SelectionChanged(object sender, EventArgs e)
{
--
Gitblit v1.9.1