From 1a2661354c80b098d81df3fe37e6b1d95aa0bac6 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期一, 14 七月 2025 10:37:48 +0800
Subject: [PATCH] 1

---
 2025年6月12日/AuxAllWCS/Scripts/Custom.json |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Scripts/Custom.json" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Scripts/Custom.json"
index 1837d54..798418f 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Scripts/Custom.json"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Scripts/Custom.json"
@@ -635,8 +635,8 @@
       "Type": "ClassCode",
       "Level": "Item",
       "Statement": "public class ToWMSMES",
-      "EditCode": "//2 wms  mes \r\n\r\n\r\n        public class CreateTask\r\n        {\r\n            public string taskType { get; set; }\r\n            public string startBit { get; set; }\r\n            public string endBit { get; set; }\r\n            public string reqCode { get; set; }\r\n            public string cntrCode { get; set; }\r\n\r\n            internal static ReturnMsg CreatemesTask(CreateTask model)\r\n            {\r\n                ITaskRepository taskservice = new TaskRepository();\r\n                var task = taskservice.FindEntity(x => x.S_TASK_NO == model.reqCode);\r\n                if (task == null)\r\n                {\r\n                    //var i = TaskProcess.CreateTask(\"\", model.startBit, model.endBit, string.IsNullOrEmpty(model.taskType) ? \"Mes涓嬪彂\" : model.taskType, 5, new List<string> { model.cntrCode });\r\n                    TaskEntity wmsTask = new TaskEntity()\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\r\n                        S_TASK_NO = model.reqCode,\r\n                        S_START_LAREA = \"\",\r\n                        S_END_LAREA = \"\",\r\n                        S_DEPART_NAME = \"\",\r\n                        S_START_LOC = model.startBit,\r\n                        S_END_LOC = model.endBit,\r\n                        S_TYPE = model.taskType,\r\n                        S_SRC_NO = \"\",//\r\n                        N_PRIORITY = -88,\r\n                        S_WORK_MODE = \"agv\",\r\n                        S_B_STATE = \"MES\",\r\n                        S_CNTRS = model.cntrCode,\r\n                        N_START_LAYER = 1,\r\n                        N_END_LAYER = 1,\r\n                        N_CNTR_COUNT = 1\r\n                    };\r\n                    ITaskRepository taskserice = new TaskRepository();\r\n                    var i = taskserice.Insert(wmsTask) > 0;\r\n                    return new ReturnMsg { resultCode = (i ? 0 : -1), resultMsg = i ? \"\" : \"浠诲姟鐢熸垚澶辫触銆俓" };\r\n                }\r\n                else\r\n                {\r\n                    return new ReturnMsg { resultCode = -1, resultMsg = \"浠诲姟閲嶅涓嬪彂銆俓" };\r\n                }\r\n            }\r\n        \r\n        public class ReturnMsg\r\n        {\r\n            public int resultCode { get; set; }\r\n            public string resultMsg { get; set; }\r\n        }\r\n        \r\n        \r\n            internal static ReturnMsg CreatePointTask(CreateTask model)\r\n            {\r\n                ITaskRepository taskservice = new TaskRepository();\r\n                var task = taskservice.FindEntity(x => x.S_TASK_NO == model.reqCode);\r\n                if (task == null)\r\n                {\r\n                    //var i = TaskProcess.CreateTask(\"\", model.startBit, model.endBit, string.IsNullOrEmpty(model.taskType) ? \"Mes涓嬪彂\" : model.taskType, 5, new List<string> { model.cntrCode });\r\n                    TaskEntity wmsTask = new TaskEntity()\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_TASK_NO = model.reqCode,\r\n                        S_START_LAREA = \"\",\r\n                        S_END_LAREA = \"\",\r\n                        S_DEPART_NAME = \"\",\r\n                        S_START_LOC = model.startBit,\r\n                        S_END_LOC = model.endBit,\r\n                        S_TYPE = model.reqCode,\r\n                        S_SRC_NO = \"\",//\r\n                        N_PRIORITY = -88,\r\n                        S_WORK_MODE = \"agv\",\r\n                        S_B_STATE = \"People\",\r\n                        S_CNTRS = model.cntrCode,\r\n                        N_START_LAYER = 1,\r\n                        N_END_LAYER = 1,\r\n                        N_CNTR_COUNT = 1\r\n                    };\r\n                    ITaskRepository taskserice = new TaskRepository();\r\n                    var i = taskserice.Insert(wmsTask) > 0;\r\n                    return new ReturnMsg { resultCode = (i ? 0 : -1), resultMsg = i ? \"\" : \"浠诲姟鐢熸垚澶辫触銆俓" };\r\n                }\r\n                else\r\n                {\r\n                    return new ReturnMsg { resultCode = -1, resultMsg = \"浠诲姟閲嶅涓嬪彂銆俓" };\r\n                }\r\n            }\r\n        }\r\n        public static void ResMesTask()\r\n        {\r\n            ///1.\r\n            \r\n            AutoThread.InvokeMethod(AutoThread.Instance, \"ResolveMesTask\");\r\n            //var VERX = Settings.deviceInfos?.FindAll(x => x.deviceName.Contains(\"鎹风灛鎶撹噦\"));\r\n            //if ()\r\n            ///2  鐪嬬紦瀛樺尯銆�娌℃弧鐨勩�\r\n\r\n\r\n        }\r\n        \r\n        ",
-      "Code": "public class ToWMSMES\r\n{//2 wms  mes \r\n\r\n\r\n        public class CreateTask\r\n        {\r\n            public string taskType { get; set; }\r\n            public string startBit { get; set; }\r\n            public string endBit { get; set; }\r\n            public string reqCode { get; set; }\r\n            public string cntrCode { get; set; }\r\n\r\n            internal static ReturnMsg CreatemesTask(CreateTask model)\r\n            {\r\n                ITaskRepository taskservice = new TaskRepository();\r\n                var task = taskservice.FindEntity(x => x.S_TASK_NO == model.reqCode);\r\n                if (task == null)\r\n                {\r\n                    //var i = TaskProcess.CreateTask(\"\", model.startBit, model.endBit, string.IsNullOrEmpty(model.taskType) ? \"Mes涓嬪彂\" : model.taskType, 5, new List<string> { model.cntrCode });\r\n                    TaskEntity wmsTask = new TaskEntity()\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\r\n                        S_TASK_NO = model.reqCode,\r\n                        S_START_LAREA = \"\",\r\n                        S_END_LAREA = \"\",\r\n                        S_DEPART_NAME = \"\",\r\n                        S_START_LOC = model.startBit,\r\n                        S_END_LOC = model.endBit,\r\n                        S_TYPE = model.taskType,\r\n                        S_SRC_NO = \"\",//\r\n                        N_PRIORITY = -88,\r\n                        S_WORK_MODE = \"agv\",\r\n                        S_B_STATE = \"MES\",\r\n                        S_CNTRS = model.cntrCode,\r\n                        N_START_LAYER = 1,\r\n                        N_END_LAYER = 1,\r\n                        N_CNTR_COUNT = 1\r\n                    };\r\n                    ITaskRepository taskserice = new TaskRepository();\r\n                    var i = taskserice.Insert(wmsTask) > 0;\r\n                    return new ReturnMsg { resultCode = (i ? 0 : -1), resultMsg = i ? \"\" : \"浠诲姟鐢熸垚澶辫触銆俓" };\r\n                }\r\n                else\r\n                {\r\n                    return new ReturnMsg { resultCode = -1, resultMsg = \"浠诲姟閲嶅涓嬪彂銆俓" };\r\n                }\r\n            }\r\n        \r\n        public class ReturnMsg\r\n        {\r\n            public int resultCode { get; set; }\r\n            public string resultMsg { get; set; }\r\n        }\r\n        \r\n        \r\n            internal static ReturnMsg CreatePointTask(CreateTask model)\r\n            {\r\n                ITaskRepository taskservice = new TaskRepository();\r\n                var task = taskservice.FindEntity(x => x.S_TASK_NO == model.reqCode);\r\n                if (task == null)\r\n                {\r\n                    //var i = TaskProcess.CreateTask(\"\", model.startBit, model.endBit, string.IsNullOrEmpty(model.taskType) ? \"Mes涓嬪彂\" : model.taskType, 5, new List<string> { model.cntrCode });\r\n                    TaskEntity wmsTask = new TaskEntity()\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_TASK_NO = model.reqCode,\r\n                        S_START_LAREA = \"\",\r\n                        S_END_LAREA = \"\",\r\n                        S_DEPART_NAME = \"\",\r\n                        S_START_LOC = model.startBit,\r\n                        S_END_LOC = model.endBit,\r\n                        S_TYPE = model.reqCode,\r\n                        S_SRC_NO = \"\",//\r\n                        N_PRIORITY = -88,\r\n                        S_WORK_MODE = \"agv\",\r\n                        S_B_STATE = \"People\",\r\n                        S_CNTRS = model.cntrCode,\r\n                        N_START_LAYER = 1,\r\n                        N_END_LAYER = 1,\r\n                        N_CNTR_COUNT = 1\r\n                    };\r\n                    ITaskRepository taskserice = new TaskRepository();\r\n                    var i = taskserice.Insert(wmsTask) > 0;\r\n                    return new ReturnMsg { resultCode = (i ? 0 : -1), resultMsg = i ? \"\" : \"浠诲姟鐢熸垚澶辫触銆俓" };\r\n                }\r\n                else\r\n                {\r\n                    return new ReturnMsg { resultCode = -1, resultMsg = \"浠诲姟閲嶅涓嬪彂銆俓" };\r\n                }\r\n            }\r\n        }\r\n        public static void ResMesTask()\r\n        {\r\n            ///1.\r\n            \r\n            AutoThread.InvokeMethod(AutoThread.Instance, \"ResolveMesTask\");\r\n            //var VERX = Settings.deviceInfos?.FindAll(x => x.deviceName.Contains(\"鎹风灛鎶撹噦\"));\r\n            //if ()\r\n            ///2  鐪嬬紦瀛樺尯銆�娌℃弧鐨勩�\r\n\r\n\r\n        }\r\n        \r\n        \r\n}",
+      "EditCode": "//2 wms  mes \r\n\r\n\r\n        public class CreateTask\r\n        {\r\n            public string taskType { get; set; }\r\n            public string startBit { get; set; }\r\n            public string endBit { get; set; }\r\n            public string reqCode { get; set; }\r\n            public string cntrCode { get; set; }\r\n\r\n            internal static ReturnMsg CreatemesTask(CreateTask model)\r\n            {\r\n                ITaskRepository taskservice = new TaskRepository();\r\n                var task = taskservice.FindEntity(x => x.S_TASK_NO == model.reqCode);\r\n                if (task == null)\r\n                {\r\n                    //var i = TaskProcess.CreateTask(\"\", model.startBit, model.endBit, string.IsNullOrEmpty(model.taskType) ? \"Mes涓嬪彂\" : model.taskType, 5, new List<string> { model.cntrCode });\r\n                    TaskEntity wmsTask = new TaskEntity()\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\r\n                        S_TASK_NO = model.reqCode,\r\n                        S_START_LAREA = \"\",\r\n                        S_END_LAREA = \"\",\r\n                        S_DEPART_NAME = \"\",\r\n                        S_START_LOC = model.startBit,\r\n                        S_END_LOC = model.endBit,\r\n                        S_TYPE = model.taskType,\r\n                        S_SRC_NO = \"\",//\r\n                        N_PRIORITY = -88,\r\n                        S_WORK_MODE = \"agv\",\r\n                        S_B_STATE = \"MES\",\r\n                        S_CNTRS = model.cntrCode,\r\n                        N_START_LAYER = 1,\r\n                        N_END_LAYER = 1,\r\n                        N_CNTR_COUNT = 1\r\n                    };\r\n                    ITaskRepository taskserice = new TaskRepository();\r\n                    var i = taskserice.Insert(wmsTask) > 0;\r\n                    return new ReturnMsg { resultCode = (i ? 0 : -1), resultMsg = i ? \"\" : \"浠诲姟鐢熸垚澶辫触銆俓" };\r\n                }\r\n                else\r\n                {\r\n                    return new ReturnMsg { resultCode = -1, resultMsg = \"浠诲姟閲嶅涓嬪彂銆俓" };\r\n                }\r\n            }\r\n        \r\n        public class ReturnMsg\r\n        {\r\n            public int resultCode { get; set; }\r\n            public string resultMsg { get; set; }\r\n        }\r\n        \r\n        \r\n            internal static ReturnMsg CreatePointTask(CreateTask model)\r\n            {\r\n                ITaskRepository taskservice = new TaskRepository();\r\n                var task = taskservice.FindEntity(x => x.S_TASK_NO == model.reqCode);\r\n                if (task == null)\r\n                {\r\n                    //var i = TaskProcess.CreateTask(\"\", model.startBit, model.endBit, string.IsNullOrEmpty(model.taskType) ? \"Mes涓嬪彂\" : model.taskType, 5, new List<string> { model.cntrCode });\r\n                    TaskEntity wmsTask = new TaskEntity()\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_TASK_NO = model.reqCode,\r\n                        S_START_LAREA = \"\",\r\n                        S_END_LAREA = \"\",\r\n                        S_DEPART_NAME = \"\",\r\n                        S_START_LOC = model.startBit,\r\n                        S_END_LOC = model.endBit,\r\n                        S_TYPE = model.reqCode,\r\n                        S_SRC_NO = \"\",//\r\n                        N_PRIORITY = -88,\r\n                        S_WORK_MODE = \"agv\",\r\n                        S_B_STATE = \"People\",\r\n                        S_CNTRS = model.cntrCode,\r\n                        N_START_LAYER = 1,\r\n                        N_END_LAYER = 1,\r\n                        N_CNTR_COUNT = 1\r\n                    };\r\n                    ITaskRepository taskserice = new TaskRepository();\r\n                    var i = taskserice.Insert(wmsTask) > 0;\r\n                    return new ReturnMsg { resultCode = (i ? 0 : -1), resultMsg = i ? \"\" : \"浠诲姟鐢熸垚澶辫触銆俓" };\r\n                }\r\n                else\r\n                {\r\n                    return new ReturnMsg { resultCode = -1, resultMsg = \"浠诲姟閲嶅涓嬪彂銆俓" };\r\n                }\r\n            }\r\n        }\r\n\t\tpublic static void ResMesTask(Tag tag)\r\n\t\t{\r\n\t\t    ///1.\r\n\t\t\r\n\t\t    AutoThread.InvokeMethod(AutoThread.Instance, \"ResolveMesTask\", new object[] { tag });\r\n\t\t    //var VERX = Settings.deviceInfos?.FindAll(x => x.deviceName.Contains(\"鎹风灛鎶撹噦\"));\r\n\t\t    //if ()\r\n\t\t    ///2  鐪嬬紦瀛樺尯銆�娌℃弧鐨勩�\r\n\t\t\r\n\t\t\r\n\t\t}\r\n        \r\n        ",
+      "Code": "public class ToWMSMES\r\n{//2 wms  mes \r\n\r\n\r\n        public class CreateTask\r\n        {\r\n            public string taskType { get; set; }\r\n            public string startBit { get; set; }\r\n            public string endBit { get; set; }\r\n            public string reqCode { get; set; }\r\n            public string cntrCode { get; set; }\r\n\r\n            internal static ReturnMsg CreatemesTask(CreateTask model)\r\n            {\r\n                ITaskRepository taskservice = new TaskRepository();\r\n                var task = taskservice.FindEntity(x => x.S_TASK_NO == model.reqCode);\r\n                if (task == null)\r\n                {\r\n                    //var i = TaskProcess.CreateTask(\"\", model.startBit, model.endBit, string.IsNullOrEmpty(model.taskType) ? \"Mes涓嬪彂\" : model.taskType, 5, new List<string> { model.cntrCode });\r\n                    TaskEntity wmsTask = new TaskEntity()\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\r\n                        S_TASK_NO = model.reqCode,\r\n                        S_START_LAREA = \"\",\r\n                        S_END_LAREA = \"\",\r\n                        S_DEPART_NAME = \"\",\r\n                        S_START_LOC = model.startBit,\r\n                        S_END_LOC = model.endBit,\r\n                        S_TYPE = model.taskType,\r\n                        S_SRC_NO = \"\",//\r\n                        N_PRIORITY = -88,\r\n                        S_WORK_MODE = \"agv\",\r\n                        S_B_STATE = \"MES\",\r\n                        S_CNTRS = model.cntrCode,\r\n                        N_START_LAYER = 1,\r\n                        N_END_LAYER = 1,\r\n                        N_CNTR_COUNT = 1\r\n                    };\r\n                    ITaskRepository taskserice = new TaskRepository();\r\n                    var i = taskserice.Insert(wmsTask) > 0;\r\n                    return new ReturnMsg { resultCode = (i ? 0 : -1), resultMsg = i ? \"\" : \"浠诲姟鐢熸垚澶辫触銆俓" };\r\n                }\r\n                else\r\n                {\r\n                    return new ReturnMsg { resultCode = -1, resultMsg = \"浠诲姟閲嶅涓嬪彂銆俓" };\r\n                }\r\n            }\r\n        \r\n        public class ReturnMsg\r\n        {\r\n            public int resultCode { get; set; }\r\n            public string resultMsg { get; set; }\r\n        }\r\n        \r\n        \r\n            internal static ReturnMsg CreatePointTask(CreateTask model)\r\n            {\r\n                ITaskRepository taskservice = new TaskRepository();\r\n                var task = taskservice.FindEntity(x => x.S_TASK_NO == model.reqCode);\r\n                if (task == null)\r\n                {\r\n                    //var i = TaskProcess.CreateTask(\"\", model.startBit, model.endBit, string.IsNullOrEmpty(model.taskType) ? \"Mes涓嬪彂\" : model.taskType, 5, new List<string> { model.cntrCode });\r\n                    TaskEntity wmsTask = new TaskEntity()\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_TASK_NO = model.reqCode,\r\n                        S_START_LAREA = \"\",\r\n                        S_END_LAREA = \"\",\r\n                        S_DEPART_NAME = \"\",\r\n                        S_START_LOC = model.startBit,\r\n                        S_END_LOC = model.endBit,\r\n                        S_TYPE = model.reqCode,\r\n                        S_SRC_NO = \"\",//\r\n                        N_PRIORITY = -88,\r\n                        S_WORK_MODE = \"agv\",\r\n                        S_B_STATE = \"People\",\r\n                        S_CNTRS = model.cntrCode,\r\n                        N_START_LAYER = 1,\r\n                        N_END_LAYER = 1,\r\n                        N_CNTR_COUNT = 1\r\n                    };\r\n                    ITaskRepository taskserice = new TaskRepository();\r\n                    var i = taskserice.Insert(wmsTask) > 0;\r\n                    return new ReturnMsg { resultCode = (i ? 0 : -1), resultMsg = i ? \"\" : \"浠诲姟鐢熸垚澶辫触銆俓" };\r\n                }\r\n                else\r\n                {\r\n                    return new ReturnMsg { resultCode = -1, resultMsg = \"浠诲姟閲嶅涓嬪彂銆俓" };\r\n                }\r\n            }\r\n        }\r\n\t\tpublic static void ResMesTask(Tag tag)\r\n\t\t{\r\n\t\t    ///1.\r\n\t\t\r\n\t\t    AutoThread.InvokeMethod(AutoThread.Instance, \"ResolveMesTask\", new object[] { tag });\r\n\t\t    //var VERX = Settings.deviceInfos?.FindAll(x => x.deviceName.Contains(\"鎹风灛鎶撹噦\"));\r\n\t\t    //if ()\r\n\t\t    ///2  鐪嬬紦瀛樺尯銆�娌℃弧鐨勩�\r\n\t\t\r\n\t\t\r\n\t\t}\r\n        \r\n        \r\n}",
       "CusMethod": {
         "Name": "",
         "Params": [],
@@ -689,9 +689,30 @@
         "InheritClass": "",
         "Inherits": []
       }
+    },
+    {
+      "ID": "20250702112833751",
+      "Name": "ConsoleInterceptor",
+      "Desc": "",
+      "ParentID": "",
+      "Type": "ClassCode",
+      "Level": "Item",
+      "Statement": "public class ConsoleInterceptor:TextWriter",
+      "EditCode": "private readonly TextWriter _originalOut;\r\n\r\npublic ConsoleInterceptor()\r\n{\r\n    _originalOut = Console.Out;\r\n}\r\n\r\npublic override Encoding Encoding => Encoding.UTF8;\r\n\r\npublic override void WriteLine(string value = \"\")\r\n{\r\n    string values = (string)AutoThread.InvokeMethod(AutoThread.Instance, \"WriteLine\", new object[] { value });\r\n    //// 鍙互閫夋嫨缁х画杈撳嚭鍒板師鎺у埗鍙癨r\n    if (!string.IsNullOrEmpty(values))\r\n        _originalOut.WriteLine(values);\r\n}",
+      "Code": "public class ConsoleInterceptor:TextWriter\r\n{private readonly TextWriter _originalOut;\r\n\r\npublic ConsoleInterceptor()\r\n{\r\n    _originalOut = Console.Out;\r\n}\r\n\r\npublic override Encoding Encoding => Encoding.UTF8;\r\n\r\npublic override void WriteLine(string value = \"\")\r\n{\r\n    string values = (string)AutoThread.InvokeMethod(AutoThread.Instance, \"WriteLine\", new object[] { value });\r\n    //// 鍙互閫夋嫨缁х画杈撳嚭鍒板師鎺у埗鍙癨r\n    if (!string.IsNullOrEmpty(values))\r\n        _originalOut.WriteLine(values);\r\n}\r\n}",
+      "CusMethod": {
+        "Name": "",
+        "Params": [],
+        "ReturnType": ""
+      },
+      "CusClass": {
+        "Name": "ConsoleInterceptor",
+        "InheritClass": "TextWriter",
+        "Inherits": []
+      }
     }
   ],
   "CreationTime": "2025-02-26 15:31:23",
-  "LastWriteTime": "2025-06-30 11:27:51",
+  "LastWriteTime": "2025-07-09 11:37:29",
   "HasSaved": true
 }
\ No newline at end of file

--
Gitblit v1.9.1