1
czw
2025-07-02 f156f02ad009105233eadfedb28938747c60cdc9
1
5个文件已修改
39 ■■■■■ 已修改文件
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/ConsoleInterceptor.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025年6月12日/AuxAllWCS/Build/Project/代码/界面事件.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025年6月12日/AuxAllWCS/RunTime/Code/自定义类.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025年6月12日/AuxAllWCS/Scripts/Script.json 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Build/Project/´úÂë/VS×Ô¶¨ÒåÀà/AutoThread.cs
@@ -118,6 +118,17 @@
            }
        }
        public string WriteLine(string value = "")
        {
            // åœ¨è¿™é‡Œæ‹¦æˆªå¤„理输出
            string intercepted = $"[拦截到的输出] {value}";
            return intercepted;
        }
        /// <summary>
        /// æ·é¡º1 ä¿¡å·å¤„理
        /// </summary>
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Build/Project/´úÂë/VS×Ô¶¨ÒåÀà/ConsoleInterceptor.cs
@@ -4,6 +4,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
namespace GZ.Projects.AuxAllWCS
{
@@ -21,11 +22,10 @@
        public override void WriteLine(string value = "")
        {
            // åœ¨è¿™é‡Œæ‹¦æˆªå¤„理输出
            //string intercepted = $"[拦截到的输出] {value}";
            string values = (string)AutoThread.InvokeMethod(AutoThread.Instance, "WriteLine", new object[] { value });
            //// å¯ä»¥é€‰æ‹©ç»§ç»­è¾“出到原控制台
            //_originalOut.WriteLine(intercepted);
            if (!string.IsNullOrEmpty(values))
                _originalOut.WriteLine(values);
        }
    }
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Build/Project/´úÂë/½çÃæÊ¼þ.cs
@@ -1052,14 +1052,6 @@
        /// <param name="e"></param>
        public void View1_Init(object sender, RoutedEventArgs e)
        {
            LogHelper.Info($"<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>");
            LogHelper.Info($"<<<<<<<<<<<<<<<<<程序·启动>>>>>>>>>>>>>>");
            // ä½¿ç”¨æ‹¦æˆªå™¨
            var interceptor = new ConsoleInterceptor();
            Console.SetOut(interceptor);
            LogHelper.Info($"<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>");
        }
        #endregion
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/RunTime/Code/×Ô¶¨ÒåÀà.cs
@@ -751,4 +751,10 @@
        
#endregion [自定义类][20250531152402452][ToWMSMES]
}
public class ConsoleInterceptor:TextWriter
{
#region    [自定义类][20250702112833751][ConsoleInterceptor]
#endregion [自定义类][20250702112833751][ConsoleInterceptor]
}
}
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Scripts/Script.json
@@ -53,8 +53,8 @@
          "ID": "20250323151832119",
          "Name": "Program4",
          "Desc": "",
          "Content": "////Conn.默认Redis.SetValue(\"西门子2.Param3\",\"300\",\"西门子2Queue\");\r\n////return;\r\n//if(false){\r\n//                    List<string> locs = new List<string>() { \"vxr1l\", \"vx1r\", \"vxr1c1\", \"vxr1c2\", \"vxr2l\", \"vxr2r\", \"vxr2c1\", \"vxr2c2\" };\r\n//                    List<string> sites = new List<string>() { \"196365BB283162\", \"193841BB283149\", \"198756BB287300\", \"198767BB286133\", \"206987BB282931\", \"204460BB282975\", \"209405BB287057\", \"209377BB285899\" };\r\n\r\n//                    LocRepository locservice = new LocRepository();\r\n//                    for (int i = 0; i < locs.Count; i++)\r\n//                    {\r\n//                        string loccode = locs[i];\r\n//                        string sitesss = sites[i];\r\n//                        var loc = locservice.FindEntity(x => x.S_LOC_CODE == loccode);\r\n//                        if (loc == null)\r\n//                        {\r\n//                            locservice.Insert(new LocEntity\r\n//                            {\r\n//                                S_ID = Guid.NewGuid().ToString(),\r\n//                                S_STATE = \"编辑\",\r\n//                                T_CREATE = DateTime.Now,\r\n//                                T_MODIFY = DateTime.Now,\r\n//                                S_DEEP = \"vxr\",\r\n\r\n//                                S_LOC_CODE = loccode,\r\n//                                S_AGV_SITE = sitesss,\r\n\r\n//                                S_LOCK_STATE = \"无\",\r\n//                                N_ROW = 1,\r\n//                                N_COL = 1,\r\n//                                N_AGV_CODE = 0,\r\n//                                N_AGV_SITE_LAYER = 0,\r\n//                                N_CAPACITY = 1,\r\n//                                N_CURRENT_NUM = 0,\r\n//                                S_TYPE = \"\",\r\n\r\n//                            });\r\n//                        }\r\n//                    }\r\n//                   // TaskProcess.CreateTask(\"\", locs[6], locs[7], \"test\", 9, new List<string> { \"test\" }, 1, 1, 1);\r\n//                   }\r\n",
          "ContentCopy": "////Conn.默认Redis.SetValue(\"西门子2.Param3\",\"300\",\"西门子2Queue\");\r\n////return;\r\n//if(false){\r\n//                    List<string> locs = new List<string>() { \"vxr1l\", \"vx1r\", \"vxr1c1\", \"vxr1c2\", \"vxr2l\", \"vxr2r\", \"vxr2c1\", \"vxr2c2\" };\r\n//                    List<string> sites = new List<string>() { \"196365BB283162\", \"193841BB283149\", \"198756BB287300\", \"198767BB286133\", \"206987BB282931\", \"204460BB282975\", \"209405BB287057\", \"209377BB285899\" };\r\n\r\n//                    LocRepository locservice = new LocRepository();\r\n//                    for (int i = 0; i < locs.Count; i++)\r\n//                    {\r\n//                        string loccode = locs[i];\r\n//                        string sitesss = sites[i];\r\n//                        var loc = locservice.FindEntity(x => x.S_LOC_CODE == loccode);\r\n//                        if (loc == null)\r\n//                        {\r\n//                            locservice.Insert(new LocEntity\r\n//                            {\r\n//                                S_ID = Guid.NewGuid().ToString(),\r\n//                                S_STATE = \"编辑\",\r\n//                                T_CREATE = DateTime.Now,\r\n//                                T_MODIFY = DateTime.Now,\r\n//                                S_DEEP = \"vxr\",\r\n\r\n//                                S_LOC_CODE = loccode,\r\n//                                S_AGV_SITE = sitesss,\r\n\r\n//                                S_LOCK_STATE = \"无\",\r\n//                                N_ROW = 1,\r\n//                                N_COL = 1,\r\n//                                N_AGV_CODE = 0,\r\n//                                N_AGV_SITE_LAYER = 0,\r\n//                                N_CAPACITY = 1,\r\n//                                N_CURRENT_NUM = 0,\r\n//                                S_TYPE = \"\",\r\n\r\n//                            });\r\n//                        }\r\n//                    }\r\n//                   // TaskProcess.CreateTask(\"\", locs[6], locs[7], \"test\", 9, new List<string> { \"test\" }, 1, 1, 1);\r\n//                   }\r\n",
          "Content": "\r\n            LogHelper.Info($\"<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>\");\r\n            LogHelper.Info($\"<<<<<<<<<<<<<<<<<程序·启动>>>>>>>>>>>>>>\");\r\n\r\n            // ä½¿ç”¨æ‹¦æˆªå™¨\r\n            var interceptor = new ConsoleInterceptor();\r\n            Console.SetOut(interceptor);\r\n\r\n            LogHelper.Info($\"<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>\");",
          "ContentCopy": "\r\n            LogHelper.Info($\"<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>\");\r\n            LogHelper.Info($\"<<<<<<<<<<<<<<<<<程序·启动>>>>>>>>>>>>>>\");\r\n\r\n            // ä½¿ç”¨æ‹¦æˆªå™¨\r\n            var interceptor = new ConsoleInterceptor();\r\n            Console.SetOut(interceptor);\r\n\r\n            LogHelper.Info($\"<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>\");",
          "ParentID": "20250226153120175",
          "Children": [],
          "Type": "Program",
@@ -1410,6 +1410,6 @@
    }
  ],
  "CreationTime": "2025-02-26 15:31:20",
  "LastWriteTime": "2025-06-25 10:42:44",
  "LastWriteTime": "2025-07-02 11:29:46",
  "HasSaved": true
}