diff --git a/.vs/LL28在线/FileContentIndex/266153e8-9e8c-4bab-9d2d-637dedf36b09.vsidx b/.vs/LL28在线/FileContentIndex/266153e8-9e8c-4bab-9d2d-637dedf36b09.vsidx deleted file mode 100644 index 71d68ad..0000000 Binary files a/.vs/LL28在线/FileContentIndex/266153e8-9e8c-4bab-9d2d-637dedf36b09.vsidx and /dev/null differ diff --git a/.vs/LL28在线/FileContentIndex/7f81282c-7f67-47c8-b52b-9e1c22f56b39.vsidx b/.vs/LL28在线/FileContentIndex/7f81282c-7f67-47c8-b52b-9e1c22f56b39.vsidx new file mode 100644 index 0000000..08c4cdd Binary files /dev/null and b/.vs/LL28在线/FileContentIndex/7f81282c-7f67-47c8-b52b-9e1c22f56b39.vsidx differ diff --git a/.vs/LL28在线/FileContentIndex/865efa19-78a4-48e8-8e99-86015e59b575.vsidx b/.vs/LL28在线/FileContentIndex/865efa19-78a4-48e8-8e99-86015e59b575.vsidx deleted file mode 100644 index 70aef67..0000000 Binary files a/.vs/LL28在线/FileContentIndex/865efa19-78a4-48e8-8e99-86015e59b575.vsidx and /dev/null differ diff --git a/.vs/LL28在线/FileContentIndex/9f928cd9-8433-41aa-895f-2f6e3aaccbbd.vsidx b/.vs/LL28在线/FileContentIndex/9f928cd9-8433-41aa-895f-2f6e3aaccbbd.vsidx new file mode 100644 index 0000000..ee62e39 Binary files /dev/null and b/.vs/LL28在线/FileContentIndex/9f928cd9-8433-41aa-895f-2f6e3aaccbbd.vsidx differ diff --git a/.vs/LL28在线/v17/.suo b/.vs/LL28在线/v17/.suo index a985a35..d2ae548 100644 Binary files a/.vs/LL28在线/v17/.suo and b/.vs/LL28在线/v17/.suo differ diff --git a/.vs/LL28在线/v17/DocumentLayout.json b/.vs/LL28在线/v17/DocumentLayout.json index 487595f..2d230b8 100644 --- a/.vs/LL28在线/v17/DocumentLayout.json +++ b/.vs/LL28在线/v17/DocumentLayout.json @@ -3,20 +3,15 @@ "WorkspaceRootPath": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", - "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" - }, - { - "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|d:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1Dll-28\\\u5DEE\u538B\\usb\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\electricity.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\electricity.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|d:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1Dll-28\\\u5DEE\u538B\\usb\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", + "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" }, { - "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\electricity.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", - "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\electricity.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" + "AbsoluteMoniker": "D:0:0:{00000000-0000-0000-0000-000000000000}|\u003CSolution\u003E|SLC1-N||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|" }, { "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\form_saomaset.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -27,11 +22,28 @@ "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form_saomaset.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" }, { - "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\activationmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\activationmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\form_hqmesconfig.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", + "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form_hqmesconfig.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" }, { - "AbsoluteMoniker": "D:0:0:{00000000-0000-0000-0000-000000000000}|\u003CSolution\u003E|SLC1-N||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|" + "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\form_hqmesconfig.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form_hqmesconfig.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\electricity.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", + "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\electricity.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" + }, + { + "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\electricity.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\electricity.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\form_hbmesset.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form_hbmesset.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\activationmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\activationmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\form_hbmesset.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", @@ -49,14 +61,6 @@ "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\form_plcconnect.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form_plcconnect.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" }, - { - "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\form_activate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form_activate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\form_activate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", - "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form_activate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" - }, { "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\productiondata.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\productiondata.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -73,10 +77,6 @@ "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\gdmes.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\gdmes.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\form_hbmesset.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form_hbmesset.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\form1.resx||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\form1.resx||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" @@ -168,6 +168,9 @@ { "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\configini.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|solutionrelative:slc1-n\\configini.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{F7F71589-095A-45C2-975C-739BE2D1CE15}|SLC1-N\\SLC1-N.csproj|d:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1Dll-28\\\u5DEE\u538B\\usb\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\slc1-n\\||{B270807C-D8C6-49EB-8EBE-8E8D566637A1}|5e9a8ac2-4f34-4521-858f-4c248ba31532" } ], "DocumentGroupContainers": [ @@ -176,18 +179,18 @@ "VerticalTabListWidth": 256, "DocumentGroups": [ { - "DockedWidth": 152, - "SelectedChildIndex": 13, + "DockedWidth": 164, + "SelectedChildIndex": 0, "Children": [ { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 0, "Title": "Form1.cs", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form1.cs", "RelativeDocumentMoniker": "SLC1-N\\Form1.cs", "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form1.cs", "RelativeToolTip": "SLC1-N\\Form1.cs", - "ViewState": "AQIAAGsUAAAAAAAAAAAywHQUAAAnAAAA", + "ViewState": "AQIAAIYTAAAAAAAAAAAuwJQTAAAJAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-10-18T01:41:29.412Z", "IsPinned": true, @@ -227,52 +230,19 @@ }, { "$type": "Document", - "DocumentIndex": 10, - "Title": "Form_PLCconnect.cs", - "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_PLCconnect.cs", - "RelativeDocumentMoniker": "SLC1-N\\Form_PLCconnect.cs", - "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_PLCconnect.cs", - "RelativeToolTip": "SLC1-N\\Form_PLCconnect.cs", - "ViewState": "AQIAADAAAAAAAAAAAAAUwDUAAAAAAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-10-17T10:29:03.885Z" - }, - { - "$type": "Document", - "DocumentIndex": 11, - "Title": "Form_PLCconnect.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_PLCconnect.cs", - "RelativeDocumentMoniker": "SLC1-N\\Form_PLCconnect.cs", - "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u8015\u5FB7\\LL-28_sitongdao\\SLC1-N\\Form_PLCconnect.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "..\\..\\..\\..\\..\\\u8015\u5FB7\\LL-28_sitongdao\\SLC1-N\\Form_PLCconnect.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-10-17T10:27:27.028Z" - }, - { - "$type": "Document", - "DocumentIndex": 5, - "Title": "Form_SaomaSet.cs [\u8BBE\u8BA1]", + "DocumentIndex": 3, + "Title": "Form_SaomaSet.cs", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_SaomaSet.cs", "RelativeDocumentMoniker": "SLC1-N\\Form_SaomaSet.cs", - "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\huabei4tongdao\\SLC1-N\\Form_SaomaSet.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "..\\..\\..\\huabei4tongdao\\SLC1-N\\Form_SaomaSet.cs [\u8BBE\u8BA1]", + "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_SaomaSet.cs", + "RelativeToolTip": "SLC1-N\\Form_SaomaSet.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAABMAAAAMAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-08-19T07:59:43.205Z" + "WhenOpened": "2025-08-19T07:59:44.649Z" }, { "$type": "Document", - "DocumentIndex": 3, - "Title": "Electricity.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Electricity.cs", - "RelativeDocumentMoniker": "SLC1-N\\Electricity.cs", - "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\huabei4tongdao\\SLC1-N\\Electricity.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "..\\..\\..\\huabei4tongdao\\SLC1-N\\Electricity.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-08-18T01:03:21.678Z" - }, - { - "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 1, "Title": "Form1.cs [\u8BBE\u8BA1]", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form1.cs", "RelativeDocumentMoniker": "SLC1-N\\Form1.cs", @@ -282,44 +252,113 @@ "WhenOpened": "2025-08-18T02:52:28.347Z", "EditorCaption": " [\u8BBE\u8BA1]" }, - { - "$type": "Document", - "DocumentIndex": 4, - "Title": "Form_SaomaSet.cs", - "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_SaomaSet.cs", - "RelativeDocumentMoniker": "SLC1-N\\Form_SaomaSet.cs", - "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_SaomaSet.cs", - "RelativeToolTip": "SLC1-N\\Form_SaomaSet.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAH0BAAAsAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-08-19T07:59:44.649Z" - }, { "$type": "Document", "DocumentIndex": 2, - "Title": "Electricity.cs", - "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Electricity.cs", - "RelativeDocumentMoniker": "SLC1-N\\Electricity.cs", - "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Electricity.cs", - "RelativeToolTip": "SLC1-N\\Electricity.cs", - "ViewState": "AQIAAEYCAAAAAAAAAAAAAFkCAAAJAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-08-18T01:07:56.418Z" - }, - { - "$type": "Document", - "DocumentIndex": 7, "Title": "SLC1-N", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\SLC1-N.csproj", "RelativeDocumentMoniker": "SLC1-N\\SLC1-N.csproj", "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\SLC1-N.csproj", "RelativeToolTip": "SLC1-N\\SLC1-N.csproj", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|", - "WhenOpened": "2025-10-14T09:54:46.939Z" + "WhenOpened": "2025-10-14T09:54:46.939Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "Form_SaomaSet.cs [\u8BBE\u8BA1]", + "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_SaomaSet.cs", + "RelativeDocumentMoniker": "SLC1-N\\Form_SaomaSet.cs", + "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_SaomaSet.cs [\u8BBE\u8BA1]", + "RelativeToolTip": "SLC1-N\\Form_SaomaSet.cs [\u8BBE\u8BA1]", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-08-19T07:59:43.205Z" + }, + { + "$type": "Document", + "DocumentIndex": 13, + "Title": "Form_PLCconnect.cs", + "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_PLCconnect.cs", + "RelativeDocumentMoniker": "SLC1-N\\Form_PLCconnect.cs", + "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_PLCconnect.cs", + "RelativeToolTip": "SLC1-N\\Form_PLCconnect.cs", + "ViewState": "AQIAADAAAAAAAAAAAAAUwDUAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-10-17T10:29:03.885Z" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "Form_HQMESconfig.cs [\u8BBE\u8BA1]", + "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_HQMESconfig.cs", + "RelativeDocumentMoniker": "SLC1-N\\Form_HQMESconfig.cs", + "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_HQMESconfig.cs [\u8BBE\u8BA1]", + "RelativeToolTip": "SLC1-N\\Form_HQMESconfig.cs [\u8BBE\u8BA1]", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-11-06T05:49:24.691Z" }, { "$type": "Document", "DocumentIndex": 6, + "Title": "Form_HQMESconfig.cs", + "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_HQMESconfig.cs", + "RelativeDocumentMoniker": "SLC1-N\\Form_HQMESconfig.cs", + "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_HQMESconfig.cs", + "RelativeToolTip": "SLC1-N\\Form_HQMESconfig.cs", + "ViewState": "AQIAAAMAAAAAAAAAAADgvxQAAAA0AAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-11-06T05:49:41.37Z" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "Title": "Electricity.cs", + "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Electricity.cs", + "RelativeDocumentMoniker": "SLC1-N\\Electricity.cs", + "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Electricity.cs", + "RelativeToolTip": "SLC1-N\\Electricity.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAwAAAAiAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-08-18T01:07:56.418Z" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "Electricity.cs [\u8BBE\u8BA1]", + "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Electricity.cs", + "RelativeDocumentMoniker": "SLC1-N\\Electricity.cs", + "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Electricity.cs [\u8BBE\u8BA1]", + "RelativeToolTip": "SLC1-N\\Electricity.cs [\u8BBE\u8BA1]", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-08-18T01:03:21.678Z" + }, + { + "$type": "Document", + "DocumentIndex": 14, + "Title": "Form_PLCconnect.cs [\u8BBE\u8BA1]", + "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_PLCconnect.cs", + "RelativeDocumentMoniker": "SLC1-N\\Form_PLCconnect.cs", + "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u8015\u5FB7\\LL-28_sitongdao\\SLC1-N\\Form_PLCconnect.cs [\u8BBE\u8BA1]", + "RelativeToolTip": "..\\..\\..\\..\\..\\\u8015\u5FB7\\LL-28_sitongdao\\SLC1-N\\Form_PLCconnect.cs [\u8BBE\u8BA1]", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-10-17T10:27:27.028Z" + }, + { + "$type": "Document", + "DocumentIndex": 9, + "Title": "Form_hbMESset.cs", + "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_hbMESset.cs", + "RelativeDocumentMoniker": "SLC1-N\\Form_hbMESset.cs", + "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_hbMESset.cs", + "RelativeToolTip": "SLC1-N\\Form_hbMESset.cs", + "ViewState": "AQIAABMAAAAAAAAAAAAwwCkAAABBAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-08-28T01:55:33.542Z" + }, + { + "$type": "Document", + "DocumentIndex": 10, "Title": "ActivationManager.cs", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\ActivationManager.cs", "RelativeDocumentMoniker": "SLC1-N\\ActivationManager.cs", @@ -331,18 +370,18 @@ }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 11, "Title": "Form_hbMESset.cs [\u8BBE\u8BA1]", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_hbMESset.cs", "RelativeDocumentMoniker": "SLC1-N\\Form_hbMESset.cs", - "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\LL-28_sitongdao\\SLC1-N\\Form_hbMESset.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "..\\..\\..\\LL-28_sitongdao\\SLC1-N\\Form_hbMESset.cs [\u8BBE\u8BA1]", + "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_hbMESset.cs [\u8BBE\u8BA1]", + "RelativeToolTip": "SLC1-N\\Form_hbMESset.cs [\u8BBE\u8BA1]", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-08-28T00:46:32.087Z" }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 12, "Title": "mxlLog.cs", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\mxlLog.cs", "RelativeDocumentMoniker": "SLC1-N\\mxlLog.cs", @@ -354,7 +393,7 @@ }, { "$type": "Document", - "DocumentIndex": 17, + "DocumentIndex": 18, "Title": "gdMES.cs", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\gdMES.cs", "RelativeDocumentMoniker": "SLC1-N\\gdMES.cs", @@ -366,7 +405,7 @@ }, { "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 16, "Title": "ModbusTCP_28.cs", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\ModbusTCP_28.cs", "RelativeDocumentMoniker": "SLC1-N\\ModbusTCP_28.cs", @@ -378,7 +417,7 @@ }, { "$type": "Document", - "DocumentIndex": 14, + "DocumentIndex": 15, "Title": "ProductionData.cs", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\ProductionData.cs", "RelativeDocumentMoniker": "SLC1-N\\ProductionData.cs", @@ -390,30 +429,7 @@ }, { "$type": "Document", - "DocumentIndex": 12, - "Title": "Form_Activate.cs", - "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_Activate.cs", - "RelativeDocumentMoniker": "SLC1-N\\Form_Activate.cs", - "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_Activate.cs", - "RelativeToolTip": "SLC1-N\\Form_Activate.cs", - "ViewState": "AQIAAAsAAAAAAAAAAAAjwDYAAAANAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-10-16T09:09:46.829Z" - }, - { - "$type": "Document", - "DocumentIndex": 13, - "Title": "Form_Activate.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_Activate.cs", - "RelativeDocumentMoniker": "SLC1-N\\Form_Activate.cs", - "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u8015\u5FB7\\LL-28_sitongdao\\SLC1-N\\Form_Activate.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "..\\..\\..\\..\\..\\\u8015\u5FB7\\LL-28_sitongdao\\SLC1-N\\Form_Activate.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-09-06T05:45:34.323Z" - }, - { - "$type": "Document", - "DocumentIndex": 16, + "DocumentIndex": 17, "Title": "JsonConfig.cs", "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\JsonConfig.cs", "RelativeDocumentMoniker": "SLC1-N\\JsonConfig.cs", @@ -423,18 +439,6 @@ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-08-19T01:04:17.355Z" }, - { - "$type": "Document", - "DocumentIndex": 18, - "Title": "Form_hbMESset.cs", - "DocumentMoniker": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_hbMESset.cs", - "RelativeDocumentMoniker": "SLC1-N\\Form_hbMESset.cs", - "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form_hbMESset.cs", - "RelativeToolTip": "SLC1-N\\Form_hbMESset.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAA4AAAAFAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-08-28T01:55:33.542Z" - }, { "$type": "Document", "DocumentIndex": 20, @@ -456,8 +460,7 @@ "RelativeToolTip": "SLC1-N\\Form1.resx", "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001005|", - "WhenOpened": "2025-12-06T07:26:27.479Z", - "EditorCaption": "" + "WhenOpened": "2025-12-06T07:26:27.479Z" }, { "$type": "Document", @@ -481,8 +484,7 @@ "RelativeToolTip": "SLC1-N\\Form1.Designer.cs", "ViewState": "AQIAAOcJAAAAAAAAAAAnwPUJAAAzAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-08-19T01:41:25.114Z", - "EditorCaption": "" + "WhenOpened": "2025-08-19T01:41:25.114Z" }, { "$type": "Document", @@ -689,8 +691,7 @@ "ToolTip": "D:\\\u684C\u9762\\\u83AB\u79A7\u4EAE\\\u534E\u52E4\\\u534E\u8D1DLL-28\\\u5DEE\u538B\\USB\u626B\u7801\u67AA\u7248\u672C\\huabei4tongdao\\SLC1-N\\Form1.resx", "RelativeToolTip": "SLC1-N\\Form1.resx", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001005|", - "WhenOpened": "2025-08-20T01:30:09.83Z", - "EditorCaption": "" + "WhenOpened": "2025-08-20T01:30:09.83Z" }, { "$type": "Document", @@ -707,7 +708,7 @@ ] }, { - "DockedWidth": 153, + "DockedWidth": 195, "SelectedChildIndex": -1, "Children": [ { diff --git a/SLC1-N/Electricity.Designer.cs b/SLC1-N/Electricity.Designer.cs index 692501b..79e105b 100644 --- a/SLC1-N/Electricity.Designer.cs +++ b/SLC1-N/Electricity.Designer.cs @@ -30,7 +30,10 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Electricity)); this.tabPage3 = new System.Windows.Forms.TabPage(); + this.label17 = new System.Windows.Forms.Label(); this.chk_ch4saoma = new System.Windows.Forms.CheckBox(); + this.tb_ContinueTestCount = new Sunny.UI.UITextBox(); + this.chk_ContinueTest = new System.Windows.Forms.CheckBox(); this.chk_ch3saoma = new System.Windows.Forms.CheckBox(); this.chk_ch2saoma = new System.Windows.Forms.CheckBox(); this.chk_ch1saoma = new System.Windows.Forms.CheckBox(); @@ -125,9 +128,6 @@ this.label89 = new System.Windows.Forms.Label(); this.SendText = new System.Windows.Forms.TextBox(); this.uiTabControlMenu1 = new Sunny.UI.UITabControlMenu(); - this.label17 = new System.Windows.Forms.Label(); - this.tb_ContinueTestCount = new Sunny.UI.UITextBox(); - this.chk_ContinueTest = new System.Windows.Forms.CheckBox(); this.tabPage3.SuspendLayout(); this.uiGroupBox2.SuspendLayout(); this.uiGroupBox1.SuspendLayout(); @@ -159,6 +159,16 @@ this.tabPage3.TabIndex = 2; this.tabPage3.Text = "仪器参数设置"; // + // label17 + // + this.label17.AutoSize = true; + this.label17.Font = new System.Drawing.Font("宋体", 15F); + this.label17.Location = new System.Drawing.Point(584, 569); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(59, 20); + this.label17.TabIndex = 485; + this.label17.Text = "次数:"; + // // chk_ch4saoma // this.chk_ch4saoma.AutoSize = true; @@ -170,8 +180,40 @@ this.chk_ch4saoma.TabIndex = 480; this.chk_ch4saoma.Text = "通道4扫码"; this.chk_ch4saoma.UseVisualStyleBackColor = false; + this.chk_ch4saoma.Visible = false; this.chk_ch4saoma.CheckedChanged += new System.EventHandler(this.chk_ch4saoma_CheckedChanged); // + // tb_ContinueTestCount + // + this.tb_ContinueTestCount.ButtonSymbol = 61761; + this.tb_ContinueTestCount.Cursor = System.Windows.Forms.Cursors.IBeam; + this.tb_ContinueTestCount.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.tb_ContinueTestCount.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.tb_ContinueTestCount.Location = new System.Drawing.Point(646, 565); + this.tb_ContinueTestCount.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tb_ContinueTestCount.Maximum = 2147483647D; + this.tb_ContinueTestCount.Minimum = -2147483648D; + this.tb_ContinueTestCount.MinimumSize = new System.Drawing.Size(1, 16); + this.tb_ContinueTestCount.Name = "tb_ContinueTestCount"; + this.tb_ContinueTestCount.Size = new System.Drawing.Size(80, 29); + this.tb_ContinueTestCount.Style = Sunny.UI.UIStyle.Custom; + this.tb_ContinueTestCount.TabIndex = 483; + this.tb_ContinueTestCount.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + this.tb_ContinueTestCount.TextChanged += new System.EventHandler(this.tb_ContinueTestCount_TextChanged); + // + // chk_ContinueTest + // + this.chk_ContinueTest.AutoSize = true; + this.chk_ContinueTest.BackColor = System.Drawing.Color.LightBlue; + this.chk_ContinueTest.Font = new System.Drawing.Font("宋体", 15F); + this.chk_ContinueTest.Location = new System.Drawing.Point(586, 533); + this.chk_ContinueTest.Name = "chk_ContinueTest"; + this.chk_ContinueTest.Size = new System.Drawing.Size(108, 24); + this.chk_ContinueTest.TabIndex = 484; + this.chk_ContinueTest.Text = "连续测试"; + this.chk_ContinueTest.UseVisualStyleBackColor = false; + this.chk_ContinueTest.CheckedChanged += new System.EventHandler(this.chk_ContinueTest_CheckedChanged); + // // chk_ch3saoma // this.chk_ch3saoma.AutoSize = true; @@ -183,6 +225,7 @@ this.chk_ch3saoma.TabIndex = 479; this.chk_ch3saoma.Text = "通道3扫码"; this.chk_ch3saoma.UseVisualStyleBackColor = false; + this.chk_ch3saoma.Visible = false; this.chk_ch3saoma.CheckedChanged += new System.EventHandler(this.chk_ch3saoma_CheckedChanged); // // chk_ch2saoma @@ -196,6 +239,7 @@ this.chk_ch2saoma.TabIndex = 478; this.chk_ch2saoma.Text = "通道2扫码"; this.chk_ch2saoma.UseVisualStyleBackColor = false; + this.chk_ch2saoma.Visible = false; this.chk_ch2saoma.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged); // // chk_ch1saoma @@ -209,6 +253,7 @@ this.chk_ch1saoma.TabIndex = 477; this.chk_ch1saoma.Text = "通道1扫码"; this.chk_ch1saoma.UseVisualStyleBackColor = false; + this.chk_ch1saoma.Visible = false; this.chk_ch1saoma.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); // // radioButton2 @@ -1531,47 +1576,6 @@ this.uiTabControlMenu1.TabSelectedForeColor = System.Drawing.Color.Black; this.uiTabControlMenu1.TabUnSelectedForeColor = System.Drawing.Color.Black; // - // label17 - // - this.label17.AutoSize = true; - this.label17.Font = new System.Drawing.Font("宋体", 15F); - this.label17.Location = new System.Drawing.Point(584, 569); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(59, 20); - this.label17.TabIndex = 485; - this.label17.Text = "次数:"; - // - // tb_ContinueTestCount - // - this.tb_ContinueTestCount.ButtonSymbol = 61761; - this.tb_ContinueTestCount.Cursor = System.Windows.Forms.Cursors.IBeam; - this.tb_ContinueTestCount.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.tb_ContinueTestCount.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.tb_ContinueTestCount.Location = new System.Drawing.Point(646, 565); - this.tb_ContinueTestCount.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tb_ContinueTestCount.Maximum = 2147483647D; - this.tb_ContinueTestCount.Minimum = -2147483648D; - this.tb_ContinueTestCount.MinimumSize = new System.Drawing.Size(1, 16); - this.tb_ContinueTestCount.Name = "tb_ContinueTestCount"; - this.tb_ContinueTestCount.Size = new System.Drawing.Size(80, 29); - this.tb_ContinueTestCount.Style = Sunny.UI.UIStyle.Custom; - this.tb_ContinueTestCount.TabIndex = 483; - this.tb_ContinueTestCount.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - this.tb_ContinueTestCount.TextChanged += new System.EventHandler(this.tb_ContinueTestCount_TextChanged); - // - // chk_ContinueTest - // - this.chk_ContinueTest.AutoSize = true; - this.chk_ContinueTest.BackColor = System.Drawing.Color.LightBlue; - this.chk_ContinueTest.Font = new System.Drawing.Font("宋体", 15F); - this.chk_ContinueTest.Location = new System.Drawing.Point(586, 533); - this.chk_ContinueTest.Name = "chk_ContinueTest"; - this.chk_ContinueTest.Size = new System.Drawing.Size(108, 24); - this.chk_ContinueTest.TabIndex = 484; - this.chk_ContinueTest.Text = "连续测试"; - this.chk_ContinueTest.UseVisualStyleBackColor = false; - this.chk_ContinueTest.CheckedChanged += new System.EventHandler(this.chk_ContinueTest_CheckedChanged); - // // Electricity // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/SLC1-N/Form1.Designer.cs b/SLC1-N/Form1.Designer.cs index a4665c5..7c1b6c5 100644 --- a/SLC1-N/Form1.Designer.cs +++ b/SLC1-N/Form1.Designer.cs @@ -29,66 +29,66 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("MES日志"); - System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("MES设置"); - System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("MES在线/离线"); - System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("MES选项", new System.Windows.Forms.TreeNode[] { - treeNode1, - treeNode2, - treeNode3}); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("测试参数"); - System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("存储设置"); - System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("产能清零"); - System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("CH1仪器启动"); - System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("CH2仪器启动"); - System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("CH3仪器启动"); - System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("CH4仪器启动"); - System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("CH1仪器复位"); - System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("CH2仪器复位"); - System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("CH3仪器复位"); - System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("CH4仪器复位"); - System.Windows.Forms.TreeNode treeNode16 = new System.Windows.Forms.TreeNode("厂商配置"); - System.Windows.Forms.TreeNode treeNode17 = new System.Windows.Forms.TreeNode("参数设置", new System.Windows.Forms.TreeNode[] { - treeNode5, - treeNode6, - treeNode7, - treeNode8, - treeNode9, - treeNode10, - treeNode11, - treeNode12, - treeNode13, - treeNode14, - treeNode15, - treeNode16}); - System.Windows.Forms.TreeNode treeNode18 = new System.Windows.Forms.TreeNode("仪器网络设置"); - System.Windows.Forms.TreeNode treeNode19 = new System.Windows.Forms.TreeNode("扫码器设置"); - System.Windows.Forms.TreeNode treeNode20 = new System.Windows.Forms.TreeNode("PLC通讯配置"); - System.Windows.Forms.TreeNode treeNode21 = new System.Windows.Forms.TreeNode("通讯设置", new System.Windows.Forms.TreeNode[] { - treeNode18, - treeNode19, - treeNode20}); - System.Windows.Forms.TreeNode treeNode22 = new System.Windows.Forms.TreeNode("登录"); - System.Windows.Forms.TreeNode treeNode23 = new System.Windows.Forms.TreeNode("注销"); - System.Windows.Forms.TreeNode treeNode24 = new System.Windows.Forms.TreeNode("权限设置"); - System.Windows.Forms.TreeNode treeNode25 = new System.Windows.Forms.TreeNode("用户操作", new System.Windows.Forms.TreeNode[] { - treeNode22, - treeNode23, - treeNode24}); - System.Windows.Forms.TreeNode treeNode26 = new System.Windows.Forms.TreeNode("报警记录"); - System.Windows.Forms.TreeNode treeNode27 = new System.Windows.Forms.TreeNode("清理日志"); - System.Windows.Forms.TreeNode treeNode28 = new System.Windows.Forms.TreeNode("文件管理", new System.Windows.Forms.TreeNode[] { - treeNode26, - treeNode27}); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.TreeNode treeNode29 = new System.Windows.Forms.TreeNode("MES日志"); + System.Windows.Forms.TreeNode treeNode30 = new System.Windows.Forms.TreeNode("MES设置"); + System.Windows.Forms.TreeNode treeNode31 = new System.Windows.Forms.TreeNode("MES在线/离线"); + System.Windows.Forms.TreeNode treeNode32 = new System.Windows.Forms.TreeNode("MES选项", new System.Windows.Forms.TreeNode[] { + treeNode29, + treeNode30, + treeNode31}); + System.Windows.Forms.TreeNode treeNode33 = new System.Windows.Forms.TreeNode("测试参数"); + System.Windows.Forms.TreeNode treeNode34 = new System.Windows.Forms.TreeNode("存储设置"); + System.Windows.Forms.TreeNode treeNode35 = new System.Windows.Forms.TreeNode("产能清零"); + System.Windows.Forms.TreeNode treeNode36 = new System.Windows.Forms.TreeNode("CH1仪器启动"); + System.Windows.Forms.TreeNode treeNode37 = new System.Windows.Forms.TreeNode("CH2仪器启动"); + System.Windows.Forms.TreeNode treeNode38 = new System.Windows.Forms.TreeNode("CH3仪器启动"); + System.Windows.Forms.TreeNode treeNode39 = new System.Windows.Forms.TreeNode("CH4仪器启动"); + System.Windows.Forms.TreeNode treeNode40 = new System.Windows.Forms.TreeNode("CH1仪器复位"); + System.Windows.Forms.TreeNode treeNode41 = new System.Windows.Forms.TreeNode("CH2仪器复位"); + System.Windows.Forms.TreeNode treeNode42 = new System.Windows.Forms.TreeNode("CH3仪器复位"); + System.Windows.Forms.TreeNode treeNode43 = new System.Windows.Forms.TreeNode("CH4仪器复位"); + System.Windows.Forms.TreeNode treeNode44 = new System.Windows.Forms.TreeNode("厂商配置"); + System.Windows.Forms.TreeNode treeNode45 = new System.Windows.Forms.TreeNode("参数设置", new System.Windows.Forms.TreeNode[] { + treeNode33, + treeNode34, + treeNode35, + treeNode36, + treeNode37, + treeNode38, + treeNode39, + treeNode40, + treeNode41, + treeNode42, + treeNode43, + treeNode44}); + System.Windows.Forms.TreeNode treeNode46 = new System.Windows.Forms.TreeNode("仪器网络设置"); + System.Windows.Forms.TreeNode treeNode47 = new System.Windows.Forms.TreeNode("扫码器设置"); + System.Windows.Forms.TreeNode treeNode48 = new System.Windows.Forms.TreeNode("PLC通讯配置"); + System.Windows.Forms.TreeNode treeNode49 = new System.Windows.Forms.TreeNode("通讯设置", new System.Windows.Forms.TreeNode[] { + treeNode46, + treeNode47, + treeNode48}); + System.Windows.Forms.TreeNode treeNode50 = new System.Windows.Forms.TreeNode("登录"); + System.Windows.Forms.TreeNode treeNode51 = new System.Windows.Forms.TreeNode("注销"); + System.Windows.Forms.TreeNode treeNode52 = new System.Windows.Forms.TreeNode("权限设置"); + System.Windows.Forms.TreeNode treeNode53 = new System.Windows.Forms.TreeNode("用户操作", new System.Windows.Forms.TreeNode[] { + treeNode50, + treeNode51, + treeNode52}); + System.Windows.Forms.TreeNode treeNode54 = new System.Windows.Forms.TreeNode("报警记录"); + System.Windows.Forms.TreeNode treeNode55 = new System.Windows.Forms.TreeNode("清理日志"); + System.Windows.Forms.TreeNode treeNode56 = new System.Windows.Forms.TreeNode("文件管理", new System.Windows.Forms.TreeNode[] { + treeNode54, + treeNode55}); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); this.SerialPort_CH1Saoma = new System.IO.Ports.SerialPort(this.components); this.lb_CH2_SmallLeakUnit = new System.Windows.Forms.Label(); @@ -253,7 +253,6 @@ this.lb_CH4_SmallLeak = new System.Windows.Forms.Label(); this.lb_CH4BigLeak = new System.Windows.Forms.Label(); this.lb_CH4_TestPressure = new System.Windows.Forms.Label(); - this.timer_Activate = new System.Windows.Forms.Timer(this.components); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); this.uiGroupBox4 = new Sunny.UI.UIGroupBox(); this.lb_OKRate = new System.Windows.Forms.Label(); @@ -881,68 +880,68 @@ this.nb_MainMenu.MenuStyle = Sunny.UI.UIMenuStyle.Custom; this.nb_MainMenu.Name = "nb_MainMenu"; this.nb_MainMenu.NodeInterval = 0; - treeNode1.Name = "节点1"; - treeNode1.Text = "MES日志"; - treeNode2.Name = "节点0"; - treeNode2.Text = "MES设置"; - treeNode3.Name = "节点0"; - treeNode3.Text = "MES在线/离线"; - treeNode4.Name = "节点0"; - treeNode4.Text = "MES选项"; - treeNode5.Name = "节点0"; - treeNode5.Text = "测试参数"; - treeNode6.Name = "节点3"; - treeNode6.Text = "存储设置"; - treeNode7.Name = "节点0"; - treeNode7.Text = "产能清零"; - treeNode8.Name = "节点0"; - treeNode8.Text = "CH1仪器启动"; - treeNode9.Name = "节点0"; - treeNode9.Text = "CH2仪器启动"; - treeNode10.Name = "节点0"; - treeNode10.Text = "CH3仪器启动"; - treeNode11.Name = "节点1"; - treeNode11.Text = "CH4仪器启动"; - treeNode12.Name = "节点0"; - treeNode12.Text = "CH1仪器复位"; - treeNode13.Name = "节点1"; - treeNode13.Text = "CH2仪器复位"; - treeNode14.Name = "节点2"; - treeNode14.Text = "CH3仪器复位"; - treeNode15.Name = "节点3"; - treeNode15.Text = "CH4仪器复位"; - treeNode16.Name = "节点0"; - treeNode16.Text = "厂商配置"; - treeNode17.Name = "节点0"; - treeNode17.Text = "参数设置"; - treeNode18.Name = "节点1"; - treeNode18.Text = "仪器网络设置"; - treeNode19.Name = "节点3"; - treeNode19.Text = "扫码器设置"; - treeNode20.Name = "节点0"; - treeNode20.Text = "PLC通讯配置"; - treeNode21.Name = "节点2"; - treeNode21.Text = "通讯设置"; - treeNode22.Name = "节点5"; - treeNode22.Text = "登录"; - treeNode23.Name = "节点6"; - treeNode23.Text = "注销"; - treeNode24.Name = "节点5"; - treeNode24.Text = "权限设置"; - treeNode25.Name = "节点4"; - treeNode25.Text = "用户操作"; - treeNode26.Name = "节点9"; - treeNode26.Text = "报警记录"; - treeNode27.Name = "节点0"; - treeNode27.Text = "清理日志"; - treeNode28.Name = "节点6"; - treeNode28.Text = "文件管理"; + treeNode29.Name = "节点1"; + treeNode29.Text = "MES日志"; + treeNode30.Name = "节点0"; + treeNode30.Text = "MES设置"; + treeNode31.Name = "节点0"; + treeNode31.Text = "MES在线/离线"; + treeNode32.Name = "节点0"; + treeNode32.Text = "MES选项"; + treeNode33.Name = "节点0"; + treeNode33.Text = "测试参数"; + treeNode34.Name = "节点3"; + treeNode34.Text = "存储设置"; + treeNode35.Name = "节点0"; + treeNode35.Text = "产能清零"; + treeNode36.Name = "节点0"; + treeNode36.Text = "CH1仪器启动"; + treeNode37.Name = "节点0"; + treeNode37.Text = "CH2仪器启动"; + treeNode38.Name = "节点0"; + treeNode38.Text = "CH3仪器启动"; + treeNode39.Name = "节点1"; + treeNode39.Text = "CH4仪器启动"; + treeNode40.Name = "节点0"; + treeNode40.Text = "CH1仪器复位"; + treeNode41.Name = "节点1"; + treeNode41.Text = "CH2仪器复位"; + treeNode42.Name = "节点2"; + treeNode42.Text = "CH3仪器复位"; + treeNode43.Name = "节点3"; + treeNode43.Text = "CH4仪器复位"; + treeNode44.Name = "节点0"; + treeNode44.Text = "厂商配置"; + treeNode45.Name = "节点0"; + treeNode45.Text = "参数设置"; + treeNode46.Name = "节点1"; + treeNode46.Text = "仪器网络设置"; + treeNode47.Name = "节点3"; + treeNode47.Text = "扫码器设置"; + treeNode48.Name = "节点0"; + treeNode48.Text = "PLC通讯配置"; + treeNode49.Name = "节点2"; + treeNode49.Text = "通讯设置"; + treeNode50.Name = "节点5"; + treeNode50.Text = "登录"; + treeNode51.Name = "节点6"; + treeNode51.Text = "注销"; + treeNode52.Name = "节点5"; + treeNode52.Text = "权限设置"; + treeNode53.Name = "节点4"; + treeNode53.Text = "用户操作"; + treeNode54.Name = "节点9"; + treeNode54.Text = "报警记录"; + treeNode55.Name = "节点0"; + treeNode55.Text = "清理日志"; + treeNode56.Name = "节点6"; + treeNode56.Text = "文件管理"; this.nb_MainMenu.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode4, - treeNode17, - treeNode21, - treeNode25, - treeNode28}); + treeNode32, + treeNode45, + treeNode49, + treeNode53, + treeNode56}); this.nb_MainMenu.SelectedForeColor = System.Drawing.Color.Black; this.nb_MainMenu.SelectedHighColor = System.Drawing.Color.FromArgb(((int)(((byte)(142)))), ((int)(((byte)(164)))), ((int)(((byte)(144))))); this.nb_MainMenu.Size = new System.Drawing.Size(1397, 50); @@ -1318,20 +1317,20 @@ // // DataGridView1 // - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.DataGridView1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.DataGridView1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; this.DataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.DataGridView1.BackgroundColor = System.Drawing.Color.White; this.DataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.DataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle11.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.DataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; this.DataGridView1.ColumnHeadersHeight = 30; this.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.DataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -1346,18 +1345,18 @@ this.DataGridView1.Location = new System.Drawing.Point(0, 700); this.DataGridView1.Name = "DataGridView1"; this.DataGridView1.ReadOnly = true; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.DataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.DataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.DataGridView1.RowHeadersWidth = 45; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.DataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle13.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.DataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle13; this.DataGridView1.RowTemplate.Height = 23; this.DataGridView1.SelectedIndex = -1; this.DataGridView1.ShowGridLine = true; @@ -1408,19 +1407,19 @@ // // DataGridView2 // - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - this.DataGridView2.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.DataGridView2.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14; this.DataGridView2.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.DataGridView2.BackgroundColor = System.Drawing.Color.White; this.DataGridView2.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.DataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle15.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.DataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15; this.DataGridView2.ColumnHeadersHeight = 28; this.DataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.DataGridView2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -1429,32 +1428,32 @@ this.Column10, this.Column13, this.dataGridViewTextBoxColumn7}); - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.DataGridView2.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle16.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); + dataGridViewCellStyle16.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.DataGridView2.DefaultCellStyle = dataGridViewCellStyle16; this.DataGridView2.EnableHeadersVisualStyles = false; this.DataGridView2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.DataGridView2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.DataGridView2.Location = new System.Drawing.Point(691, 701); this.DataGridView2.Name = "DataGridView2"; this.DataGridView2.ReadOnly = true; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); - dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.DataGridView2.RowHeadersDefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + dataGridViewCellStyle17.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle17.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + dataGridViewCellStyle17.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); + dataGridViewCellStyle17.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.DataGridView2.RowHeadersDefaultCellStyle = dataGridViewCellStyle17; this.DataGridView2.RowHeadersWidth = 51; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.DataGridView2.RowsDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle18.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle18.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.DataGridView2.RowsDefaultCellStyle = dataGridViewCellStyle18; this.DataGridView2.RowTemplate.Height = 23; this.DataGridView2.SelectedIndex = -1; this.DataGridView2.ShowGridLine = true; @@ -2404,11 +2403,6 @@ this.lb_CH4_TestPressure.TabIndex = 28; this.lb_CH4_TestPressure.Text = "##"; // - // timer_Activate - // - this.timer_Activate.Interval = 60000; - this.timer_Activate.Tick += new System.EventHandler(this.timer_Activate_Tick); - // // uiGroupBox4 // this.uiGroupBox4.Controls.Add(this.lb_OKRate); @@ -2637,7 +2631,7 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; this.Name = "Form1"; - this.Text = " LL28-C_V25110601(USB)"; + this.Text = " LL28-C_V25111102(USB)"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing); this.Load += new System.EventHandler(this.Form1_Load); this.uiGroupBox5.ResumeLayout(false); @@ -2832,7 +2826,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column10; private System.Windows.Forms.DataGridViewTextBoxColumn Column13; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; - public System.Windows.Forms.Timer timer_Activate; private System.ComponentModel.BackgroundWorker backgroundWorker1; private Sunny.UI.UIGroupBox uiGroupBox4; public System.Windows.Forms.Label label17; diff --git a/SLC1-N/Form1.cs b/SLC1-N/Form1.cs index 29a6893..199ce00 100644 --- a/SLC1-N/Form1.cs +++ b/SLC1-N/Form1.cs @@ -1,4 +1,8 @@ -using HslCommunication.Profinet.Melsec; + +//#define SAOMA_PLAN_1 // 一个串口扫码枪 +#define SAOMA_PLAN_4 // 四个串口扫码枪 + +using HslCommunication.Profinet.Melsec; using Newtonsoft.Json; using System; using System.Collections.Generic; @@ -32,6 +36,7 @@ using System.Reflection.Emit; using static SLC1_N.DataUp; using static System.Windows.Forms.VisualStyles.VisualStyleElement.Header; using DocumentFormat.OpenXml.Office2016.Excel; +using Microsoft.VisualBasic.Logging; namespace SLC1_N @@ -190,9 +195,6 @@ namespace SLC1_N User = "厂商"; } - // 激活码 - //timer_Activate.Interval = 10000; - //timer_Activate.Start(); } private async void InitializeAfterLoadAsync() @@ -204,14 +206,7 @@ namespace SLC1_N private void InitializeAfterLoad() { - // 激活校验 - if (true) - { - this.Hide(); - Form_Activate elec = new Form_Activate(); - elec.Signal_LoginResult += Slot_MainShow; - OpenForm(elec, true); - } + } // 显示槽 @@ -243,16 +238,24 @@ namespace SLC1_N private void MES_Init() { var jsconfig = new JsonConfig("config.json"); - mes_urlip = jsconfig.GetValue("mes_urlip", "localhost"); - mes_urlport = jsconfig.GetValue("mes_urlport", "43120"); - // MES数据 - mes_partno = jsconfig.GetValue("mes_partno", "1"); // 料号 - mes_station = jsconfig.GetValue("mes_station", "1"); // 工站名称 - mes_workorder = jsconfig.GetValue("mes_workorder", "1"); // 工单 - mes_equipmentno = jsconfig.GetValue("mes_equipmentno", "1"); // 设备编号 - mes_fixturecode = jsconfig.GetValue("mes_fixturecode", "1"); // 夹具编号 - mes_plan = jsconfig.GetValue("mes_plan", "1"); // 工厂 + m_LINE = jsconfig.GetValue("LINE", "1"); + m_ActionName = jsconfig.GetValue("ActionName", " "); + m_Tools = jsconfig.GetValue("Tools", " "); + + // MES开关 + MESswitch = jsconfig.GetValue("MESswitch", false); + if (MESswitch && HQMES_Init()) + { + lb_MESswitch.Text = "MES在线"; + pb_MESswitch.BackColor = Color.Green; + } + else + { + MESswitch = false; + lb_MESswitch.Text = "MES离线"; + pb_MESswitch.BackColor = Color.Red; + } } // 标志位初始化 @@ -278,19 +281,6 @@ namespace SLC1_N m_ContinueTest = jsconfig.GetValue("chk_ContinueTest", true); m_ContinueTestCount = jsconfig.GetValue("tb_ContinueTestCount", 1); - // MES开关 - MESswitch = jsconfig.GetValue("MESswitch", false); - if (MESswitch) - { - lb_MESswitch.Text = "MES在线"; - pb_MESswitch.BackColor = Color.Green; - } - else - { - lb_MESswitch.Text = "MES离线"; - pb_MESswitch.BackColor = Color.Red; - } - // 仪器ip if (string.IsNullOrEmpty(ch1ipaddress)) { @@ -722,7 +712,7 @@ namespace SLC1_N { SetLabelText(lb_CH1MES_OUTstatus, ""); - RtValue rdata = ruzhan(1, CODE); + var rdata = ruzhan(CODE, m_ActionName, m_Tools); if (rdata.result) { SetLabelText(lb_CH1MES_INstatus, "PASS", Color.Green); @@ -730,7 +720,7 @@ namespace SLC1_N else { SetLabelText(lb_CH1MES_INstatus, "NG", Color.Red); - SetUITextBox(tb_CH1MainMessage, $"CH1 入站NG:{rdata.data}"); + SetUITextBox(tb_CH1MainMessage, $"CH1 入站NG:{rdata.msg}"); } SetLabelText(lb_CH1MES_OUTstatus, ""); } @@ -760,7 +750,7 @@ namespace SLC1_N { SetLabelText(lb_CH2MES_OUTstatus, ""); - RtValue rdata = ruzhan(2, CODE); + var rdata = ruzhan(CODE, m_ActionName, m_Tools); if (rdata.result) { SetLabelText(lb_CH2MES_INstatus, "PASS", Color.Green); @@ -768,7 +758,7 @@ namespace SLC1_N else { SetLabelText(lb_CH2MES_INstatus, "NG", Color.Red); - SetUITextBox(tb_CH2MainMessage, $"CH2 入站NG:{rdata.data}"); + SetUITextBox(tb_CH2MainMessage, $"CH2 入站NG:{rdata.msg}"); } SetLabelText(lb_CH2MES_OUTstatus, ""); } @@ -1183,7 +1173,10 @@ namespace SLC1_N TestTime CH1TestTime = new TestTime(); TestTime CH2TestTime = new TestTime(); TestTime CH3TestTime = new TestTime(); - TestTime CH4TestTime = new TestTime(); + TestTime CH4TestTime = new TestTime(); + + private Dictionary prepareOutTime_Dictionary = new Dictionary(); + // 通道1状态机 public void CH1machine() @@ -1210,6 +1203,18 @@ namespace SLC1_N case (int)yiqi.prepare://读取检测时间，充气，平衡检测 { + // 准备超时处理 + if (!prepareOutTime_Dictionary.ContainsKey(1)) + { + prepareOutTime_Dictionary[1] = DateTime.Now.AddSeconds(5); // 5s后还在准备就去启动 + } + else if (DateTime.Now > prepareOutTime_Dictionary[1]) + { + prepareOutTime_Dictionary.Remove(1); // 清除超时记录 + ch1workstation = (int)yiqi.start; + break; + } + CH1TestTime.startTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); SetLabelText(lb_CH1_Result, ""); SetLabelText(lb_CH1_Status, "准备"); @@ -1227,6 +1232,7 @@ namespace SLC1_N //Console.WriteLine($"prepare-设备运行状态: {LL28CH1client.ArrCoil[2]}"); if (LL28CH1client.ArrCoil[2]) { + prepareOutTime_Dictionary.Remove(1); ch1workstation = (int)yiqi.test; } } @@ -1439,7 +1445,7 @@ namespace SLC1_N // MES if (MESswitch) { - RtValue rdata = chuzhan(1, tb_CH1Code.Text, result); + var rdata = chuzhan(1, tb_CH1Code.Text, m_ActionName, m_Tools, G_CHECKFLOWID, result); if (rdata.result) { SetLabelText(lb_CH1MES_OUTstatus, "PASS", Color.Green); @@ -1447,7 +1453,7 @@ namespace SLC1_N else { SetLabelText(lb_CH1MES_OUTstatus, "NG", Color.Red); - SetUITextBox(tb_CH1MainMessage, $"CH1 出站NG:{rdata.data}"); + SetUITextBox(tb_CH1MainMessage, $"CH1 出站NG:{rdata.msg}"); } } @@ -1508,6 +1514,18 @@ namespace SLC1_N case (int)yiqi.prepare://读取检测时间，充气，平衡检测 { + // 准备超时处理 + if (!prepareOutTime_Dictionary.ContainsKey(2)) + { + prepareOutTime_Dictionary[2] = DateTime.Now.AddSeconds(5); // 5s后还在准备就去启动 + } + else if (DateTime.Now > prepareOutTime_Dictionary[2]) + { + prepareOutTime_Dictionary.Remove(2); // 清除超时记录 + ch2workstation = (int)yiqi.start; + break; + } + CH2TestTime.startTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); SetLabelText(lb_CH2_Result, ""); SetLabelText(lb_CH2_Status, "准备"); @@ -1525,6 +1543,7 @@ namespace SLC1_N //Console.WriteLine($"prepare-设备运行状态: {LL28CH2client.ArrCoil[2]}"); if (LL28CH2client.ArrCoil[2]) { + prepareOutTime_Dictionary.Remove(2); ch2workstation = (int)yiqi.test; } } @@ -1739,7 +1758,7 @@ namespace SLC1_N // MES if (MESswitch) { - RtValue rdata = chuzhan(2, tb_CH2Code.Text, result); + var rdata = chuzhan(2, tb_CH2Code.Text, m_ActionName, m_Tools, G_CHECKFLOWID, result); if (rdata.result) { SetLabelText(lb_CH2MES_OUTstatus, "PASS", Color.Green); @@ -1747,7 +1766,7 @@ namespace SLC1_N else { SetLabelText(lb_CH2MES_OUTstatus, "NG", Color.Red); - SetUITextBox(tb_CH2MainMessage, $"CH2 出站NG:{rdata.data}"); + SetUITextBox(tb_CH2MainMessage, $"CH2 出站NG:{rdata.msg}"); } } @@ -1808,6 +1827,18 @@ namespace SLC1_N case (int)yiqi.prepare://读取检测时间，充气，平衡检测 { + // 准备超时处理 + if (!prepareOutTime_Dictionary.ContainsKey(3)) + { + prepareOutTime_Dictionary[3] = DateTime.Now.AddSeconds(5); // 5s后还在准备就去启动 + } + else if (DateTime.Now > prepareOutTime_Dictionary[3]) + { + prepareOutTime_Dictionary.Remove(3); // 清除超时记录 + ch3workstation = (int)yiqi.start; + break; + } + CH3TestTime.startTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); SetLabelText(lb_CH3_Result, ""); SetLabelText(lb_CH3_Status, "准备"); @@ -1825,6 +1856,7 @@ namespace SLC1_N //Console.WriteLine($"prepare-设备运行状态: {LL28CH3client.ArrCoil[2]}"); if (LL28CH3client.ArrCoil[2]) { + prepareOutTime_Dictionary.Remove(3); ch3workstation = (int)yiqi.test; } } @@ -2038,7 +2070,7 @@ namespace SLC1_N // MES if (MESswitch) { - RtValue rdata = chuzhan(3, tb_CH3Code.Text, result); + var rdata = chuzhan(3, tb_CH3Code.Text, m_ActionName, m_Tools, G_CHECKFLOWID, result); if (rdata.result) { SetLabelText(lb_CH3MES_OUTstatus, "PASS", Color.Green); @@ -2046,7 +2078,7 @@ namespace SLC1_N else { SetLabelText(lb_CH3MES_OUTstatus, "NG", Color.Red); - SetUITextBox(tb_CH1MainMessage, $"CH3 出站NG:{rdata.data}"); + SetUITextBox(tb_CH1MainMessage, $"CH3 出站NG:{rdata.msg}"); } } @@ -2107,6 +2139,18 @@ namespace SLC1_N case (int)yiqi.prepare://读取检测时间，充气，平衡检测 { + // 准备超时处理 + if (!prepareOutTime_Dictionary.ContainsKey(4)) + { + prepareOutTime_Dictionary[4] = DateTime.Now.AddSeconds(5); // 5s后还在准备就去启动 + } + else if (DateTime.Now > prepareOutTime_Dictionary[4]) + { + prepareOutTime_Dictionary.Remove(4); // 清除超时记录 + ch4workstation = (int)yiqi.start; + break; + } + CH4TestTime.startTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); SetLabelText(lb_CH4_Result, ""); SetLabelText(lb_CH4_Status, "准备"); @@ -2124,12 +2168,13 @@ namespace SLC1_N //Console.WriteLine($"prepare-设备运行状态: {LL28CH4client.ArrCoil[2]}"); if (LL28CH4client.ArrCoil[2]) { + prepareOutTime_Dictionary.Remove(4); ch4workstation = (int)yiqi.test; } } break; - case (int)yiqi.standby://读取仪器是否启动 + case (int)yiqi.standby: // 读取仪器是否启动 { SetLabelText(lb_CH4_Status, "待机"); @@ -2339,7 +2384,7 @@ namespace SLC1_N // MES if (MESswitch) { - RtValue rdata = chuzhan(4, tb_CH4Code.Text, result); + var rdata = chuzhan(4, tb_CH4Code.Text, m_ActionName, m_Tools, G_CHECKFLOWID, result); if (rdata.result) { SetLabelText(lb_CH4MES_OUTstatus, "PASS", Color.Green); @@ -2347,7 +2392,7 @@ namespace SLC1_N else { SetLabelText(lb_CH4MES_OUTstatus, "NG", Color.Red); - SetUITextBox(tb_CH2MainMessage, $"CH4 出站NG:{rdata.data}"); + SetUITextBox(tb_CH2MainMessage, $"CH4 出站NG:{rdata.msg}"); } } @@ -3661,7 +3706,7 @@ namespace SLC1_N } if (itemText == "MES设置") { - Form_hbMESset mes = new Form_hbMESset(); + Form_HQMESconfig mes = new Form_HQMESconfig(); OpenForm(mes); //GhMes mes = new GhMes(); //OpenForm(mes); @@ -3794,10 +3839,21 @@ namespace SLC1_N } else { - MESswitch = true; - lb_MESswitch.Text = "MES在线"; - pb_MESswitch.BackColor = Color.Green; - jsconfig.SetValue("MESswitch", true); + // mes初始化 + if (HQMES_Init()) + { + MESswitch = true; + lb_MESswitch.Text = "MES在线"; + pb_MESswitch.BackColor = Color.Green; + jsconfig.SetValue("MESswitch", true); + } + else + { + MESswitch = false; + lb_MESswitch.Text = "MES离线"; + pb_MESswitch.BackColor = Color.Red; + jsconfig.SetValue("MESswitch", false); + } } } @@ -4187,6 +4243,7 @@ namespace SLC1_N } } + string lastCode = ""; // 保存上一次条码 int lastUseCodebox = 0; // 保存上一次填充的条码框 @@ -4195,65 +4252,115 @@ namespace SLC1_N { try { - System.Threading.Thread.Sleep(50); - int len = SerialPort_CH1Saoma.BytesToRead; // 获取可以读取的字节数 - if (len > 1) + #if SAOMA_PLAN_1 { - byte[] buff = new byte[len]; // 创建缓存数据数组 - SerialPort_CH1Saoma.Read(buff, 0, len); // 把数据读取到buff数组 - Invoke((new System.Action(() => + System.Threading.Thread.Sleep(50); + int len = SerialPort_CH1Saoma.BytesToRead; // 获取可以读取的字节数 + if (len > 1) { - string time = DateTime.Now.ToString(); - string code = Encoding.Default.GetString(buff).Replace(" ", "").Replace("\r", "").Replace("\n", ""); - string codelen = code.Length.ToString(); - - Console.WriteLine("扫码枪1串口收到:" + code); - //code = code.Split(';')[0]; - //Console.WriteLine("扫码枪1串口去掉分隔符:" + code); - - if (code == lastCode) // || code.Length > Convert.ToInt32(tb_CH1codeLeng.Text) - return; - lastCode = code; // 保存 - - if (tb_CH1Code.Text == code || tb_CH2Code.Text == code || tb_CH3Code.Text == code || tb_CH4Code.Text == code) + byte[] buff = new byte[len]; // 创建缓存数据数组 + SerialPort_CH1Saoma.Read(buff, 0, len); // 把数据读取到buff数组 + Invoke((new System.Action(() => { - //MessageBox.Show($"条码 {CODE} 已存在", "重复提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); - return; - } + string time = DateTime.Now.ToString(); + string code = Encoding.Default.GetString(buff).Replace(" ", "").Replace("\r", "").Replace("\n", ""); + string codelen = code.Length.ToString(); - // 更新条码框 - UpdateCodeBox(code); + Console.WriteLine("扫码枪1串口收到:" + code); - /* - if (codelen == tb_CH1codeLeng.Text.Trim()) - { - if (code != lb_CH1Code.Text) + + + //code = code.Split(';')[0]; + //Console.WriteLine("扫码枪1串口去掉分隔符:" + code); + + if (code == lastCode) // || code.Length > Convert.ToInt32(tb_CH1codeLeng.Text) + return; + lastCode = code; // 保存 + + if (tb_CH1Code.Text == code || tb_CH2Code.Text == code || tb_CH3Code.Text == code || tb_CH4Code.Text == code) { - lb_CH1Code.Text = code; - SetUITextBox(tb_CH1MainMessage, "CH1扫码完成"); + //MessageBox.Show($"条码 {CODE} 已存在", "重复提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + // 更新条码框 + UpdateCodeBox(code); + + /* + if (codelen == tb_CH1codeLeng.Text.Trim()) + { + if (code != lb_CH1Code.Text) + { + lb_CH1Code.Text = code; + SetUITextBox(tb_CH1MainMessage, "CH1扫码完成"); + } + else + { + //tb_CH1MainMessage.Text = "CH1条形码输入重复"; + } } else { - //tb_CH1MainMessage.Text = "CH1条形码输入重复"; + SetUITextBox(tb_CH1MainMessage, "CH1当前条形码长度为" + code.Length + " 所设置的条码长度为" + tb_CH1codeLeng.Text); } - } - else - { - SetUITextBox(tb_CH1MainMessage, "CH1当前条形码长度为" + code.Length + " 所设置的条码长度为" + tb_CH1codeLeng.Text); - } - */ + */ - SerialPort_CH1Saoma.DiscardInBuffer(); - }))); + SerialPort_CH1Saoma.DiscardInBuffer(); + }))); + } + else + { + return; + } } - else + #elif SAOMA_PLAN_4 { - return; + System.Threading.Thread.Sleep(50); + int len = SerialPort_CH1Saoma.BytesToRead; // 获取可以读取的字节数 + if (len > 1) + { + byte[] buff = new byte[len]; // 创建缓存数据数组 + SerialPort_CH1Saoma.Read(buff, 0, len); // 把数据读取到buff数组 + Invoke((new System.Action(() => + { + string time = DateTime.Now.ToString(); + string code = Encoding.Default.GetString(buff).Replace("\r\n", ""); + string codelen = code.Length.ToString(); + + Console.WriteLine("扫码枪1串口收到:" + code); + + + + if (codelen == tb_CH1codeLeng.Text.Trim()) + { + if (code != tb_CH1Code.Text) + { + tb_CH1Code.Text = code; + //SetUITextBox(tb_CH1MainMessage, "CH1扫码完成"); + } + else + { + SetUITextBox(tb_CH1MainMessage, "CH1条形码输入重复"); + } + } + else + { + SetUITextBox(tb_CH1MainMessage, "CH1当前条形码长度为" + code.Length + " 所设置的条码长度为" + tb_CH1codeLeng.Text); + } + + SerialPort_CH1Saoma.DiscardInBuffer(); + }))); + } + else + { + return; + } } + #endif } catch (Exception ex) { - mxlLog.Instance.Error($"串口扫码枪接收函数 异常 ,行号{ex.StackTrace} ", ex); + mxlLog.Instance.Error($"串口扫码枪1接收函数 异常 ,行号{ex.StackTrace} ", ex); } } @@ -4262,43 +4369,50 @@ namespace SLC1_N { try { - System.Threading.Thread.Sleep(50); - int len = SerialPort_CH2Saoma.BytesToRead; // 获取可以读取的字节数 - if (len > 1) + #if SAOMA_PLAN_4 { - byte[] buff = new byte[len]; // 创建缓存数据数组 - SerialPort_CH2Saoma.Read(buff, 0, len); // 把数据读取到buff数组 - Invoke((new System.Action(() => + System.Threading.Thread.Sleep(50); + int len = SerialPort_CH2Saoma.BytesToRead; // 获取可以读取的字节数 + if (len > 1) { - string time = DateTime.Now.ToString(); - string code = Encoding.Default.GetString(buff).Replace("\r\n", ""); - string codelen = code.Length.ToString(); - - Console.WriteLine("扫码枪2串口收到:" + code); - if (codelen == tb_CH2codeLeng.Text.Trim()) + byte[] buff = new byte[len]; // 创建缓存数据数组 + SerialPort_CH2Saoma.Read(buff, 0, len); // 把数据读取到buff数组 + Invoke((new System.Action(() => { - if (code != tb_CH2Code.Text) + string time = DateTime.Now.ToString(); + string code = Encoding.Default.GetString(buff).Replace("\r\n", ""); + string codelen = code.Length.ToString(); + + Console.WriteLine("扫码枪2串口收到:" + code); + + + + if (codelen == tb_CH2codeLeng.Text.Trim()) { - tb_CH2Code.Text = code; - SetUITextBox(tb_CH2MainMessage, "CH2扫码完成"); + if (code != tb_CH2Code.Text) + { + tb_CH2Code.Text = code; + //SetUITextBox(tb_CH2MainMessage, "CH2扫码完成"); + } + else + { + SetUITextBox(tb_CH2MainMessage, "CH2条形码输入重复"); + } } else { - SetUITextBox(tb_CH2MainMessage, "CH2条形码输入重复"); + SetUITextBox(tb_CH2MainMessage, "CH2当前条形码长度为" + code.Length + " 所设置的条码长度为" + tb_CH2codeLeng.Text); } - } - else - { - SetUITextBox(tb_CH2MainMessage, "CH2当前条形码长度为" + code.Length + " 所设置的条码长度为" + tb_CH2codeLeng.Text); - } - SerialPort_CH2Saoma.DiscardInBuffer(); - }))); - } - else - { - return; + SerialPort_CH2Saoma.DiscardInBuffer(); + }))); + } + else + { + return; + } } + #endif } catch (Exception ex) { @@ -4311,44 +4425,48 @@ namespace SLC1_N { try { - System.Threading.Thread.Sleep(50); - int len = SerialPort_CH3Saoma.BytesToRead; // 获取可以读取的字节数 - if (len > 1) + #if SAOMA_PLAN_4 { - byte[] buff = new byte[len]; // 创建缓存数据数组 - SerialPort_CH3Saoma.Read(buff, 0, len); // 把数据读取到buff数组 - Invoke((new System.Action(() => + System.Threading.Thread.Sleep(50); + int len = SerialPort_CH3Saoma.BytesToRead; // 获取可以读取的字节数 + if (len > 1) { - string time = DateTime.Now.ToString(); - string code = Encoding.Default.GetString(buff).Replace(" ", "").Replace("\r", "").Replace("\n", ""); - - Console.WriteLine("扫码枪3串口收到:" + code); - //code = code.Split(';')[0]; - //Console.WriteLine("扫码枪3串口去掉分隔符:" + code); - - if (tb_CH1Code.Text == code || tb_CH2Code.Text == code || tb_CH3Code.Text == code || tb_CH4Code.Text == code) + byte[] buff = new byte[len]; // 创建缓存数据数组 + SerialPort_CH3Saoma.Read(buff, 0, len); // 把数据读取到buff数组 + Invoke((new System.Action(() => { - //MessageBox.Show($"条码 {CODE} 已存在", "重复提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + string time = DateTime.Now.ToString(); + string code = Encoding.Default.GetString(buff).Replace(" ", "").Replace("\r", "").Replace("\n", ""); + + Console.WriteLine("扫码枪3串口收到:" + code); + //code = code.Split(';')[0]; + //Console.WriteLine("扫码枪3串口去掉分隔符:" + code); + + if (tb_CH1Code.Text == code || tb_CH2Code.Text == code || tb_CH3Code.Text == code || tb_CH4Code.Text == code) + { + //MessageBox.Show($"条码 {CODE} 已存在", "重复提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + SerialPort_CH3Saoma.DiscardInBuffer(); + return; + } + + if (code.Length.ToString() == tb_CH3codeLeng.Text.Trim()) + { + tb_CH3Code.Text = code; + } + else + { + //SetUITextBox(tb_CH3MainMessage, "CH3当前条形码长度为" + code.Length + " 所设置的条码长度为" + tb_CH3codeLeng.Text); + } + SerialPort_CH3Saoma.DiscardInBuffer(); - return; - } - - if (code.Length.ToString() == tb_CH3codeLeng.Text.Trim()) - { - tb_CH3Code.Text = code; - } - else - { - //SetUITextBox(tb_CH3MainMessage, "CH3当前条形码长度为" + code.Length + " 所设置的条码长度为" + tb_CH3codeLeng.Text); - } - - SerialPort_CH3Saoma.DiscardInBuffer(); - }))); - } - else - { - return; + }))); + } + else + { + return; + } } + #endif } catch (Exception ex) { @@ -4361,44 +4479,48 @@ namespace SLC1_N { try { - System.Threading.Thread.Sleep(50); - int len = SerialPort_CH4Saoma.BytesToRead; // 获取可以读取的字节数 - if (len > 1) + #if SAOMA_PLAN_4 { - byte[] buff = new byte[len]; // 创建缓存数据数组 - SerialPort_CH4Saoma.Read(buff, 0, len); // 把数据读取到buff数组 - Invoke((new System.Action(() => + System.Threading.Thread.Sleep(50); + int len = SerialPort_CH4Saoma.BytesToRead; // 获取可以读取的字节数 + if (len > 1) { - string time = DateTime.Now.ToString(); - string code = Encoding.Default.GetString(buff).Replace(" ", "").Replace("\r", "").Replace("\n", ""); - - Console.WriteLine("扫码枪4串口收到:" + code); - //code = code.Split(';')[0]; - //Console.WriteLine("扫码枪4串口去掉分隔符:" + code); - - if (tb_CH1Code.Text == code || tb_CH2Code.Text == code || tb_CH3Code.Text == code || tb_CH4Code.Text == code) + byte[] buff = new byte[len]; // 创建缓存数据数组 + SerialPort_CH4Saoma.Read(buff, 0, len); // 把数据读取到buff数组 + Invoke((new System.Action(() => { - //MessageBox.Show($"条码 {CODE} 已存在", "重复提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + string time = DateTime.Now.ToString(); + string code = Encoding.Default.GetString(buff).Replace(" ", "").Replace("\r", "").Replace("\n", ""); + + Console.WriteLine("扫码枪4串口收到:" + code); + //code = code.Split(';')[0]; + //Console.WriteLine("扫码枪4串口去掉分隔符:" + code); + + if (tb_CH1Code.Text == code || tb_CH2Code.Text == code || tb_CH3Code.Text == code || tb_CH4Code.Text == code) + { + //MessageBox.Show($"条码 {CODE} 已存在", "重复提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + SerialPort_CH4Saoma.DiscardInBuffer(); + return; + } + + if (code.Length.ToString() == tb_CH4codeLeng.Text.Trim()) + { + tb_CH4Code.Text = code; + } + else + { + //SetUITextBox(tb_CH4MainMessage, "CH4当前条形码长度为" + code.Length + " 所设置的条码长度为" + tb_CH4codeLeng.Text); + } + SerialPort_CH4Saoma.DiscardInBuffer(); - return; - } - - if (code.Length.ToString() == tb_CH4codeLeng.Text.Trim()) - { - tb_CH4Code.Text = code; - } - else - { - //SetUITextBox(tb_CH4MainMessage, "CH4当前条形码长度为" + code.Length + " 所设置的条码长度为" + tb_CH4codeLeng.Text); - } - - SerialPort_CH4Saoma.DiscardInBuffer(); - }))); - } - else - { - return; + }))); + } + else + { + return; + } } + #endif } catch (Exception ex) { @@ -4420,13 +4542,12 @@ namespace SLC1_N Console.WriteLine("CH1Code_TextChanged()"); // 治具下压-仪器启动 - if (MESswitch) { Task.Run(() => { // MES入站 - RtValue ret = ruzhan(1, tb_CH1Code.Text); + var ret = ruzhan(tb_CH1Code.Text, m_ActionName, m_Tools); if (ret.result) { SetLabelText(lb_CH1MES_INstatus, "PASS", Color.Green); @@ -4449,7 +4570,7 @@ namespace SLC1_N else { SetLabelText(lb_CH1MES_INstatus, "NG", Color.Red); - SetUITextBox(tb_CH1MainMessage, $"CH1 入站NG:{ret.data}"); + SetUITextBox(tb_CH1MainMessage, $"CH1 入站NG:{ret.msg}"); if (HCPLC_client.Connected) { lock (plcLock) // 加锁 @@ -4518,7 +4639,7 @@ namespace SLC1_N Task.Run(() => { // MES入站 - RtValue ret = ruzhan(2, tb_CH2Code.Text); + var ret = ruzhan(tb_CH2Code.Text, m_ActionName, m_Tools); if (ret.result) { SetLabelText(lb_CH2MES_INstatus, "PASS", Color.Green); @@ -4541,7 +4662,7 @@ namespace SLC1_N else { SetLabelText(lb_CH2MES_INstatus, "NG", Color.Red); - SetUITextBox(tb_CH2MainMessage, $"CH2 入站NG:{ret.data}"); + SetUITextBox(tb_CH2MainMessage, $"CH2 入站NG:{ret.msg}"); if (HCPLC_client.Connected) { lock (plcLock) // 加锁 @@ -4611,7 +4732,7 @@ namespace SLC1_N Task.Run(() => { // MES入站 - RtValue ret = ruzhan(3, tb_CH3Code.Text); + var ret = ruzhan(tb_CH3Code.Text, m_ActionName, m_Tools); if (ret.result) { SetLabelText(lb_CH3MES_INstatus, "PASS", Color.Green); @@ -4634,7 +4755,7 @@ namespace SLC1_N else { SetLabelText(lb_CH3MES_INstatus, "NG", Color.Red); - SetUITextBox(tb_CH1MainMessage, $"CH3 入站NG:{ret.data}"); + SetUITextBox(tb_CH1MainMessage, $"CH3 入站NG:{ret.msg}"); if (HCPLC_client.Connected) { lock (plcLock) // 加锁 @@ -4703,7 +4824,7 @@ namespace SLC1_N Task.Run(() => { // MES入站 - RtValue ret = ruzhan(4, tb_CH4Code.Text); + var ret = ruzhan(tb_CH4Code.Text, m_ActionName, m_Tools); if (ret.result) { SetLabelText(lb_CH4MES_INstatus, "PASS", Color.Green); @@ -4726,7 +4847,7 @@ namespace SLC1_N else { SetLabelText(lb_CH4MES_INstatus, "NG", Color.Red); - SetUITextBox(tb_CH2MainMessage, $"CH4 入站NG:{ret.data}"); + SetUITextBox(tb_CH2MainMessage, $"CH4 入站NG:{ret.msg}"); if (HCPLC_client.Connected) { lock (plcLock) // 加锁 @@ -4891,364 +5012,6 @@ namespace SLC1_N throw new Exception("No IPv4 address found."); } - // 验证当前产品 - private RtValue ruzhan(int CH, string code, string mode = null) - { - RtValue ruzhan_result = new RtValue(false, "##"); - - SNVerification info = new SNVerification(); - info.barcode = code; // 条码 - info.partno = mes_partno;// 料号 - info.station = mes_station; // 工站名称 - info.workorder = mes_workorder;// 工单 - info.equipmentno = mes_equipmentno;// 设备编号 - info.computerName = Environment.MachineName; // 电脑名称 - info.computerIP = GetLocalIPv4(); // 电脑IP - info.intime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - - string response = HttpPostWebService(info, "AutoVerificationTestSN"); // 验证当前产品 - Console.WriteLine($"AutoVerificationTestSN 返回 result:{response}"); - - if (response.Contains("OK") || response.Contains("ok") - || response.Contains("TRUE") || response.Contains("true") - || response.Contains("PASS") || response.Contains("pass")) - //|| response.Contains("Success") || response.Contains("success") - { - ruzhan_result.result = true; - ruzhan_result.data = response; - } - else - { - ruzhan_result.result = false; - ruzhan_result.data = response; - } - - return ruzhan_result; - } - - // 提交测试结果 - private RtValue chuzhan(int CH, string code, bool result, string error = null) - { - RtValue ruzhan_result = new RtValue(false, "##"); - - SubmitTestResults info = new SubmitTestResults(); - info.barcode = code; // 条码 - info.partno = mes_partno;// 料号 - info.station = mes_station; // 工站名称 - info.workorder = mes_workorder;// 工单 - info.equipmentno = mes_equipmentno;// 设备编号 - info.fixturecode = mes_fixturecode; // 夹具编号 - info.computerName = Environment.MachineName; // 电脑名称 - info.computerIP = GetLocalIPv4(); // 电脑IP - info.bootdurationm = "1"; // 开机时长可为空 - info.downduration = "1"; // 关机时长可为空 - info.result = result ? "OK":"NG"; - info.faildescribe = result ? "1" : error;// 失败（NG）描述可为空 - info.outtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - - string response = HttpPostWebService(info, "AutoSubmitTestResults");// 提交测试结果 - Console.WriteLine($"AutoSubmitTestResults 返回 result:{response}"); - - if (response.Contains("OK") || response.Contains("ok") - || response.Contains("TRUE") || response.Contains("true") - || response.Contains("PASS") || response.Contains("pass")) - //|| response.Contains("Success") || response.Contains("success") - { - ruzhan_result.result = true; - ruzhan_result.data = response; - - // 上传测试数据子项 - RtValue ret = UpdateItems(CH, code, result); - return ret; - } - else - { - ruzhan_result.result = false; - ruzhan_result.data = response; - } - - return ruzhan_result; - } - - public string GetStartTime(int min) - { - DateTime nowTime = DateTime.Now; - DateTime startTime = nowTime.AddMinutes(-min); - return startTime.ToString("yyyy-MM-dd HH:mm:ss"); - } - - // 上传测试数据子项 - private RtValue UpdateItems(int CH, string code, bool result, string mode = null) - { - RtValue ruzhan_result = new RtValue(false, "##"); - TestTime testTime; - - string Uplimit = ""; - string Dnlimit = ""; - string Testvalue1 = ""; - switch (CH) - { - case 1: - testTime = CH1TestTime; - Uplimit = LL28CH1client.readFloat(21); - Dnlimit = LL28CH1client.readFloat(23); - - // 处理大于2000, 先显示2000，后续再处理 - string fSmallLeak1 = LL28CH1client.readFloatF2(38); - if (fSmallLeak1.ToDouble() > 2000) - { - fSmallLeak1 = "2000"; - } - Testvalue1 = fSmallLeak1; - break; - case 2: - testTime = CH2TestTime; - Uplimit = LL28CH2client.readFloat(21); - Dnlimit = LL28CH2client.readFloat(23); - string fSmallLeak2 = LL28CH2client.readFloatF2(38); - if (fSmallLeak2.ToDouble() > 2000) - { - fSmallLeak2 = "2000"; - } - Testvalue1 = fSmallLeak2; - break; - case 3: - testTime = CH3TestTime; - Uplimit = LL28CH3client.readFloat(21); - Dnlimit = LL28CH3client.readFloat(23); - string fSmallLeak3 = LL28CH3client.readFloatF2(38); - if (fSmallLeak3.ToDouble() > 2000) - { - fSmallLeak3 = "2000"; - } - Testvalue1 = fSmallLeak3; - break; - case 4: - testTime = CH4TestTime; - Uplimit = LL28CH4client.readFloat(21); - Dnlimit = LL28CH4client.readFloat(23); - string fSmallLeak4 = LL28CH4client.readFloatF2(38); - if (fSmallLeak4.ToDouble() > 2000) - { - fSmallLeak4 = "2000"; - } - Testvalue1 = fSmallLeak4; - break; - default: - testTime = new TestTime(); - break; - } - - DataUp dataUp = new DataUp(); - dataUp.barcode = code; // 条码 - dataUp.partno = mes_partno;// 料号 - dataUp.starttime = testTime.startTime; // 开始测试时间 不可为空 - dataUp.stoptime = testTime.stopTime; // 停止测试时间 不可为空 - dataUp.totalresult = result ? "OK" : "NG"; // 总测试结果 不可为空 - dataUp.computerName = Environment.MachineName; // 电脑名称 - dataUp.computerIP = GetLocalIPv4(); // 电脑IP - dataUp.fixturecode = mes_fixturecode; // 夹具编号 - dataUp.station = mes_station; // 工站名称 - dataUp.poftwareversion = this.Text; // 软件版本 不可为空 - dataUp.plan = mes_plan; // 工厂 不可为空 - dataUp.outtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - - dataUp.exvalue.itemlist = new List(); - DataUp.ItemList item1 = new DataUp.ItemList(); - item1.itemname = $"CH{CH}_Ant7_L"; // 测试项 - item1.itemvalue = new DataUp._item_value(); - item1.itemvalue.Strattime = testTime.startTime;// 开始测试时间 不可为空 - item1.itemvalue.Stoptime = testTime.stopTime;// 停止测试时间 不可为空 - - item1.itemvalue.Uplimit = Uplimit; // 上限 - item1.itemvalue.Dnlimit = Dnlimit; // 下限 - item1.itemvalue.Result = result ? "OK" : "NG"; - item1.itemvalue.Testvalue1 = Testvalue1; // 测试值(泄漏量) - dataUp.exvalue.itemlist.Add(item1); - - string data = JsonConvert.SerializeObject(dataUp); - - SubmitTestItem info = new SubmitTestItem(); - info.josnData = data; - - string response = HttpPostWebService(info, "AutoSubmitTestItem");// 上传测试数据子项 - Console.WriteLine($"AutoSubmitTestItem 返回 result:{response}"); - - if (response.Contains("OK") || response.Contains("ok") - || response.Contains("TRUE") || response.Contains("true") - || response.Contains("PASS") || response.Contains("pass")) - //|| response.Contains("Success") || response.Contains("success") - { - ruzhan_result.result = true; - ruzhan_result.data = response; - } - else - { - ruzhan_result.result = false; - ruzhan_result.data = response; - } - - return ruzhan_result; - } - - - public string mes_urlip = "localhost"; - public string mes_urlport = "43120"; - - // AutoVerificationTestSN - public string HttpPostWebService(SNVerification info, string method) - { - string result = string.Empty; - string param = string.Empty; - - param = JsonConvert.SerializeObject(info); - - try - { - string url = $"http://{mes_urlip}:{mes_urlport}/TestWebService.asmx"; - mxlLog.Instance.MESDebug($"{url}/{method}, {param}"); - HttpWebResponse response = CreatePostHttpResponse(url + "/" + method, param); - - StreamReader r = new StreamReader(response.GetResponseStream(), Encoding.UTF8); - string value = r.ReadToEnd(); - - Console.WriteLine($"{method} 返回 value:{value}"); - mxlLog.Instance.MESDebug($"{method} 返回 value:{value}\n"); - return value; - } - catch (Exception e) - { - - } - - return result; - } - - // AutoSubmitTestResults - public string HttpPostWebService(SubmitTestResults info, string method) - { - string result = string.Empty; - string param = string.Empty; - - param = JsonConvert.SerializeObject(info); - - try - { - string url = $"http://{mes_urlip}:{mes_urlport}/TestWebService.asmx"; - mxlLog.Instance.MESDebug($"{url}/{method}, {param}"); - HttpWebResponse response = CreatePostHttpResponse(url + "/" + method, param); - - StreamReader r = new StreamReader(response.GetResponseStream(), Encoding.UTF8); - string value = r.ReadToEnd(); - - Console.WriteLine($"{method} 返回 value:{value}"); - mxlLog.Instance.MESDebug($"{method} 返回 value:{value}\n"); - return value; - } - catch (Exception e) - { - - } - - return result; - } - - // AutoSubmitTestItem - public string HttpPostWebService(SubmitTestItem info, string method) - { - string result = string.Empty; - string param = string.Empty; - - param = JsonConvert.SerializeObject(info); - - try - { - string url = $"http://{mes_urlip}:{mes_urlport}/TestWebService.asmx"; - mxlLog.Instance.MESDebug($"{url}/{method}, {param}"); - HttpWebResponse response = CreatePostHttpResponse(url + "/" + method, param); - - StreamReader r = new StreamReader(response.GetResponseStream(), Encoding.UTF8); - string value = r.ReadToEnd(); - - Console.WriteLine($"{method} 返回 value:{value}"); - mxlLog.Instance.MESDebug($"{method} 返回 value:{value}\n"); - return value; - } - catch (Exception e) - { - - } - - return result; - } - - - public static HttpWebResponse CreatePostHttpResponse(string url, string jsonParam) - { - HttpWebRequest request = null; - try - { - request = WebRequest.Create(url) as HttpWebRequest; - request.Proxy = null; - request.Method = "POST"; - request.ContentType = "application/json; charset=utf-8"; - - request.Timeout = 3000; // 整个请求超时 - request.ReadWriteTimeout = 3000; // 读写操作超时 - - byte[] data = Encoding.UTF8.GetBytes(jsonParam); - request.ContentLength = data.Length; - using (Stream stream = request.GetRequestStream()) - { - stream.Write(data, 0, data.Length); - } - return request.GetResponse() as HttpWebResponse; - } - catch (WebException ex) - { - // 判断超时 - if (ex.Status == WebExceptionStatus.Timeout) - { - mxlLog.Instance.MESDebug($"调用CreatePostHttpResponse超时: {ex.Message}"); - } - throw; - } - catch (Exception e) - { - mxlLog.Instance.MESDebug($"调用CreatePostHttpResponse异常: {e.Message}"); - throw; - } - } - - // 验证激活码 - private void timer_Activate_Tick(object sender, EventArgs e) - { - //DateTime target = new DateTime(2025, 11, 7); - //DateTime now = DateTime.Now; - - //if (now >= target) - //{ - // // 写入激活状态 - // ActivationManager.WriteActivationStatus(false); - // this.Enabled = false; - - // Form_Activate elec = new Form_Activate(); - // elec.Signal_LoginResult += Slot_MainShow; - // OpenForm(elec, true); - //} - - // 检查激活是否过期 - if (ActivationManager.CheckActivationExpiry()) - { - ActivationManager.WriteActivationStatus(false); - this.Enabled = false; - - Form_Activate elec = new Form_Activate(); - elec.Signal_LoginResult += Slot_MainShow; - OpenForm(elec, true); - } - } - #region USB扫码 private StringBuilder codeBuff = new StringBuilder(); private DateTime lastKeyTime = DateTime.Now; @@ -5313,5 +5076,222 @@ namespace SLC1_N } } #endregion + + #region 华勤MES + [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + public delegate int MESBackFunc(StringBuilder data); + + /// + /// mes函数执行成功 + /// + public const int MesBackOK = 0; + + /// + /// MES的句柄 + /// + public static int hMes = 0; + private const string DLLPATH = "HQMES.dll"; + [DllImport(DLLPATH)] + public static extern int MesInit(MESBackFunc func, ref int hMes, StringBuilder sInfo, ref int InfoLen); + [DllImport(DLLPATH)] + public static extern int MesStart(int hMes, string SN, string ActionName, string Tools, StringBuilder sInfo, ref int InfoLen); + [DllImport(DLLPATH)] + public static extern int MesStart2(int hMes, string SN, string SNType, string ActionName, string Tools, StringBuilder sInfo, ref int InfoLen); + [DllImport(DLLPATH)] + public static extern int MesEnd(int hMes, string SN, string ActionName, string Tools, string ErrorCode, StringBuilder sInfo, ref int InfoLen); + [DllImport(DLLPATH)] + public static extern int MesEnd2(int hMes, string SN, string SNType, string ActionName, string Tools, string ErrorCode, string AllData, StringBuilder sInfo, ref int InfoLen); + [DllImport(DLLPATH)] + private static extern int MesSaveAndGetExtraInfo(int hMes, string G_TYPE, string G_POSITION, string G_KEY, string G_VALUE, string G_EXTINFO, StringBuilder sInfo, ref int InfoLen); + [DllImport(DLLPATH)] + public static extern int MesUnInit(int hMes); + [DllImport(DLLPATH)] + public static extern int MesStart3(int hMes, string SN, string SNType, string ActionName, string Tools, string Extinfo, StringBuilder sInfo, ref int InfoLen); + + + private static MESBackFunc tempFunc;// 必须要加一个变量，这样不会被回收 + public static int WriteLogFile(StringBuilder data) + { + return 0; + } + + // 华勤mes参数 + public static string m_ActionName; + public static string m_Tools; + public static string m_LINE; + public static string G_CHECKFLOWID; + + static int hmes = 0; + + // 华勤MES初始化 + public static bool HQMES_Init() + { + int len = 102400; + StringBuilder strdata = new StringBuilder(len); + if (hMes == 0) + { + tempFunc = WriteLogFile; // 必须要加一个变量，这样不会被回收 这个回调函数赋值只能放在这个位置，防止当多次点击init之后可能会出现回调函数被回收的现象 + if (0 == MesInit(tempFunc, ref hMes, strdata, ref len)) + { + JObject mesObj = (JObject)JsonConvert.DeserializeObject(strdata.ToString()); + string version = ""; + version = mesObj.GetValue("H_MSG") == null ? "" : mesObj.GetValue("H_MSG").ToString(); // 获取meshelepr的版本 + MessageBox.Show("初始化链接MES 成功 ！MEShelper版本：" + version); // strdata会返回一个meshelper的版本号表示初始化成功 + return true; + } + else + { + hMes = 0; + MessageBox.Show("初始化链接MES 失败！"); + return false; + } + } + else + { + //MessageBox.Show("请勿重复初始化MES链接！"); + + return true; + } + } + + // 华勤MES入站 + public static (bool result, string msg) ruzhan(string SN, string ActionName, string toolName) + { + string time1 = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + int InfoLen = 102400; + StringBuilder sInfo = new StringBuilder(InfoLen); + + if (hMes != 0) + { + string DATA = ""; + string H_MSG = ""; + string G_RET_DATA = ""; + string NeedLoad = ""; + + mxlLog.Instance.MESDebug($"入站前 SN:{SN} - ActionName:{ActionName} - toolName:{toolName} - sInfo:{sInfo} - InfoLen:{InfoLen}"); + if (0 == MesStart(hMes, SN, ActionName, toolName, sInfo, ref InfoLen)) + { + mxlLog.Instance.MESDebug($"入站 OK:{SN} - sInfo:{sInfo.ToString()}"); + + JObject retObj = (JObject)JsonConvert.DeserializeObject(sInfo.ToString()); + DATA = retObj.GetValue("DATA") == null ? "" : retObj.GetValue("DATA").ToString(); // data是一个json字符串，其中包含mes返回的主要字段，按照这个参考继续解析出来 例如获取CSN + + // 解析返回信息 + JObject dataObj = (JObject)JsonConvert.DeserializeObject(DATA); + string CSN = dataObj.GetValue("CSN") == null ? "" : dataObj.GetValue("CSN").ToString(); + G_CHECKFLOWID = dataObj.GetValue("G_CHECKFLOWID") == null ? "" : dataObj.GetValue("G_CHECKFLOWID").ToString(); + + H_MSG = retObj.GetValue("H_MSG") == null ? "" : retObj.GetValue("H_MSG").ToString(); + G_RET_DATA = retObj.GetValue("G_RET_DATA") == null ? "" : retObj.GetValue("G_RET_DATA").ToString(); // 标记工具需要回传给MES的字段，是json格式，将其解析出来可以得到字段，工具必须将该字段赋值并回传给MES，在endmes函数回传 + NeedLoad = retObj.GetValue("NeedLoad") == null ? "" : retObj.GetValue("NeedLoad").ToString(); // 标记工具是否需要重启 + + if (!String.IsNullOrEmpty(H_MSG) && H_MSG == "MES response:") + { + return (true, H_MSG); + } + else + { + return (false, H_MSG); + } + } + else + { + mxlLog.Instance.MESDebug($"入站 NG:{SN} - sInfo:{sInfo.ToString()}"); + + JObject retObj = (JObject)JsonConvert.DeserializeObject(sInfo.ToString()); + H_MSG = retObj.GetValue("H_MSG") == null ? "" : retObj.GetValue("H_MSG").ToString(); // mes返回的错误信息最好将其在工具界面展示出来给操作人员查看 + + return (false, sInfo.ToString()); + } + } + else + { + MessageBox.Show("请初始化MES链接！"); + return (false, sInfo.ToString()); + } + } + + public static (bool result, string msg) chuzhan(int CH, string SN, string ActionName, string Tools, string checkFlowId, bool result) + { + int InfoLen = 102400; + Log log = new Log(); + StringBuilder sInfo = new StringBuilder(InfoLen); + + if (hMes != 0) + { + string ErrorCode = "0"; + + Dictionary map = new Dictionary(); + + // 确认错误码和错误项 + if (result) + { + ErrorCode = "0"; + } + else + { + ErrorCode = "NG"; + sInfo.Append($"泄漏量超出设定范围"); // 错误详细描述 + } + + switch (CH) + { + case 1: + map["Xlvall"] = Form1.f1.lb_CH1_TestPressure.Text + Form1.f1.lb_CH1_PressureUnit.Text; // 测试压力 + map["Csvall"] = Form1.f1.LL28CH1client.readFloatF2(38); // 泄漏量 + break; + case 2: + map["Xlvall"] = Form1.f1.lb_CH2_TestPressure.Text + Form1.f1.lb_CH2_PressureUnit.Text; // 测试压力 + map["Csvall"] = Form1.f1.LL28CH2client.readFloatF2(38); // 泄漏量 + break; + case 3: + map["Xlvall"] = Form1.f1.lb_CH3_TestPressure.Text + Form1.f1.lb_CH3_PressureUnit.Text; // 测试压力 + map["Csvall"] = Form1.f1.LL28CH3client.readFloatF2(38); // 泄漏量 + break; + case 4: + map["Xlvall"] = Form1.f1.lb_CH4_TestPressure.Text + Form1.f1.lb_CH4_PressureUnit.Text; // 测试压力 + map["Csvall"] = Form1.f1.LL28CH4client.readFloatF2(38); // 泄漏量 + break; + } + + //压力转换 + map["G_OP_LINE"] = m_LINE; + map["DateTime"] = DateTime.Now.ToString(); + map["G_CHECKFLOWID"] = checkFlowId; + + string AllData = JsonConvert.SerializeObject(map); + string SNType = "1"; + + mxlLog.Instance.MESDebug($"出站-通道{CH} MesEnd2：" + $"hMes:{hMes}-SN:{SN}-SNType:{SNType}-ActionName:{ActionName}-toolName:{Tools}-ErrorCode:{ErrorCode}-AllData:{AllData}-strdata:{sInfo}-len:{InfoLen}"); + if (0 == MesEnd2(hMes, SN, SNType, ActionName, Tools, ErrorCode, AllData, sInfo, ref InfoLen)) + { + mxlLog.Instance.MESDebug($"出站-通道{CH} OK:{SN} - sInfo:{sInfo.ToString()}"); + + JObject retObj = (JObject)JsonConvert.DeserializeObject(sInfo.ToString()); + string msg = retObj.GetValue("G_NEXTWS") == null ? "" : retObj.GetValue("G_NEXTWS").ToString(); + + if (!String.IsNullOrEmpty(msg) && (msg.Contains("过站成功") || msg.Contains("测试PASS"))) // 还需优化，文档未标注已过站字段 + { + return (true, msg); + } + else + { + return (false, msg); + } + } + else + { + mxlLog.Instance.MESDebug($"出站-通道{CH} NG:{SN} - sInfo:{sInfo.ToString()}"); + return (false, sInfo.ToString()); + } + } + else + { + MessageBox.Show("请初始化MES链接！"); + return (false, sInfo.ToString()); + } + } + #endregion + } } diff --git a/SLC1-N/Form1.resx b/SLC1-N/Form1.resx index b46aa06..6c582ff 100644 --- a/SLC1-N/Form1.resx +++ b/SLC1-N/Form1.resx @@ -171,9 +171,6 @@ 24, 56 - - 939, 47 - 1074, 47 diff --git a/SLC1-N/Form_Activate.Designer.cs b/SLC1-N/Form_Activate.Designer.cs deleted file mode 100644 index ff13569..0000000 --- a/SLC1-N/Form_Activate.Designer.cs +++ /dev/null @@ -1,87 +0,0 @@ -namespace SLC1_N -{ - partial class Form_Activate - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form_Activate)); - this.bt_verify = new System.Windows.Forms.Button(); - this.tb_ActivateCode = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // bt_verify - // - this.bt_verify.Location = new System.Drawing.Point(176, 88); - this.bt_verify.Name = "bt_verify"; - this.bt_verify.Size = new System.Drawing.Size(75, 37); - this.bt_verify.TabIndex = 0; - this.bt_verify.Text = "验证"; - this.bt_verify.UseVisualStyleBackColor = true; - this.bt_verify.Click += new System.EventHandler(this.bt_verify_Click); - // - // tb_ActivateCode - // - this.tb_ActivateCode.Location = new System.Drawing.Point(114, 37); - this.tb_ActivateCode.Name = "tb_ActivateCode"; - this.tb_ActivateCode.Size = new System.Drawing.Size(240, 21); - this.tb_ActivateCode.TabIndex = 1; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(55, 40); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(53, 12); - this.label1.TabIndex = 2; - this.label1.Text = "激活码："; - // - // Form_Activate - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(413, 151); - this.Controls.Add(this.label1); - this.Controls.Add(this.tb_ActivateCode); - this.Controls.Add(this.bt_verify); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Name = "Form_Activate"; - this.Text = "激活"; - this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Form_Activate_FormClosed); - this.Load += new System.EventHandler(this.Form_Activate_Load); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Button bt_verify; - private System.Windows.Forms.TextBox tb_ActivateCode; - private System.Windows.Forms.Label label1; - } -} \ No newline at end of file diff --git a/SLC1-N/Form_Activate.cs b/SLC1-N/Form_Activate.cs deleted file mode 100644 index b5d97b3..0000000 --- a/SLC1-N/Form_Activate.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace SLC1_N -{ - public partial class Form_Activate : Form - { - public delegate void MySignalHandler(bool mode); // 声明信号 - public event MySignalHandler Signal_LoginResult; - - bool isActivate = false; - - // 激活信息文件 C:\Users\mxl\AppData\Local\mxlSoftware\activation.bin - - public Form_Activate() - { - InitializeComponent(); - } - - private void Form_Activate_Load(object sender, EventArgs e) - { - tb_ActivateCode.Text = "123"; // 显示记录的激活码 - - var (isActivated, expiryTime) = ActivationManager.ReadActivationStatus(); // 读取激活状态 - if (isActivated) - { - isActivate = isActivated; - this.Close(); // 如果处于激活则关闭激活弹窗 - } - } - - - // 验证激活码 - private void bt_verify_Click(object sender, EventArgs e) - { - if (tb_ActivateCode.Text == "qwertyuiop") - { - // 激活60天 - ActivationManager.WriteActivationStatus(true, 60); - - isActivate = true; - Signal_LoginResult.Invoke(true); - - MessageBox.Show("验证通过！"); - this.Close(); - } - else if (tb_ActivateCode.Text == "qwertyuiop123") - { - // 写入激活状态 - ActivationManager.WriteActivationStatus(true); - - isActivate = true; - Signal_LoginResult.Invoke(true); - - MessageBox.Show("验证通过！"); - this.Close(); - } - else - { - isActivate = false; - MessageBox.Show("验证失败！"); - Signal_LoginResult.Invoke(isActivate); - - } - } - - private void Form_Activate_FormClosed(object sender, FormClosedEventArgs e) - { - Signal_LoginResult.Invoke(isActivate); - } - } -} diff --git a/SLC1-N/Form_Activate.resx b/SLC1-N/Form_Activate.resx deleted file mode 100644 index 8951e3d..0000000 --- a/SLC1-N/Form_Activate.resx +++ /dev/null @@ -1,546 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - AAABAAkAMDAQAAEABABoBgAAlgAAACAgEAABAAQA6AIAAP4GAAAQEBAAAQAEACgBAADmCQAAMDAAAAEA - CACoDgAADgsAACAgAAABAAgAqAgAALYZAAAQEAAAAQAIAGgFAABeIgAAMDAAAAEAIACoJQAAxicAACAg - AAABACAAqBAAAG5NAAAQEAAAAQAgAGgEAAAWXgAAKAAAADAAAABgAAAAAQAEAAAAAACABAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8A - AAD/AP8A//8AAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACKAAAAAAAAAAAAAAAAAAAAAAAAAACq - qnqHeoqqgAAAAAAAAAAAAAAAAAAACqiAAAAAAAAAeqgAAAAAAAAAAAAAAAAKqAAAAAAAAAAAAAqoAAAA - AAAAAAAAAAegAAAAAAAAAAAAAAAIoAAAAAAAAAAAAKcAAAAAAAAAAAAAAAAACqAAAAAAAAAACgAIenqq - qqqqqqqqqqAAAIoAAAAAAAAAoAAAAKqqqqqqqqqqqqgAAAigAAAAAAAKAAAAiqqqqqqqqqqqqqoAAACK - AAAAAAB3AAAAeHiqqqqqqqqqqqoAAAAKAAAAAACgAAAAAAqqqqqqqqqqqqoAAAAAoAAAAAqAAAAAAKqq - qqqqoAAAAAAAAAAAgAAAAAoAAAAAAAAIqqqqpwAAAAAAAAAACgAAAAoAAAAAAAAKqqqqqgAAAAAAAAAA - CgAAAAgAAAAAAAiqqqqqqqAAAAAAAAAABwAAAAoAAAAAAAAACKqqqqAAAAAAAAAACgAAAAgAAAAAAAAA - qqqqqqgAAAAAAAAACgAAAAoAAAAAAAAKqqqqqqoAAAAAAAAACgAAAAoAAAAAAAAAAAqqqqpwAAAAAAAA - CgAAAAoAAAAAAAAAAKqqqqqgAAAAAAAAiAAAAACAAAAAAAAAB6iqqqqoAAAAAAAAoAAAAACgAAAAAAAA - AACKqqqqAAAAAAAIoAAAAAAKAAAAAAAAAAqqqqqqgAAAAAAKAAAAAAAAoAAAAAAAAIqKiqqqoAAAAACg - AAAAAAAAigAAAAAAAAAAqqqqqAAAAAoAAAAAAAAACKAAAAAAAAAKqqqqqgAAAKAAAAAAAAAAAAqAAAAA - AAAAAAAAAAAAqgAAAAAAAAAAAACqgAAAAAAAAAAAAAB6gAAAAAAAAAAAAAAAeqAAAAAAAAAAAKqAAAAA - AAAAAAAAAAAAAAenoAAAAAB6qAAAAAAAAAAAAAAAAAAAAAAAinqqqqhwAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////8AAP///////wAA////////AAD///////8AAP// - /////wAA////////AAD///////8AAP///////wAA////P///AAD//8AAf/8AAP/+H/8P/wAA//j//+P/ - AAD/5///+f8AAP/P///+fwAA/7gAAB8/AAD/fwAAD58AAP78AAAPzwAA/PwAAA/vAAD9/4AAD/cAAPn/ - AB//9wAA+//gD//7AAD7/+AP//sAAPv/gAf/+wAA+//4B//7AAD7//AD//sAAPv/4AP/+wAA+//+Af/7 - AAD7//wB//MAAP3/+AD/9wAA/f//AP/nAAD+//4Af+8AAP9//AB/3wAA/z//wD+/AAD/n/+AP38AAP/n - ///8/wAA//H///H/AAD//H//x/8AAP//h/w//wAA///wAf//AAD///////8AAP///////wAA//////// - AAD///////8AAP///////wAA////////AAD///////8AAP///////wAA////////AAAoAAAAIAAAAEAA - AAABAAQAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAICA - gADAwMAAAAD/AAD/AAAA//8A/wAAAP8A/wD//wAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAACKqAAAenAAAAAAAAAAAACoAAAAAAAAegAAAAAAAAB3AAAAAAAAAACKAAAAAA - AKAAqqqqqqqqoAAIAAAAAAoAAIqqqqqqqqoAAKAAAACAAAinqqqqqqqqAAAIAAAAoAAACqqqqqeqigAA - CgAACAAAAAiKqqoAAAAAAAAAAAoAAAAAqqqqoAAAAAAAgAAKAAAAAACqqqAAAAAAAKAACAAAAAAIqqqq - AAAAAABwAAoAAAAAAAqqqgAAAAAAcAAAAAAAAACqqqqgAAAAAAAAAHAAAAAAAKqqoAAAAAoAAAAIAAAA - AAqqqqgAAACAAAAACgAAAAAACKqqAAAIAAAAAACHAAAAAKqqqqAAoAAAAAAAAKAAAAAAAAAACAAAAAAA - AAAAdwAAAAAAigAAAAAAAAAAAAAHqKeooAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA/////////////////////////////////+Hj//+f/n/+f/+f/cAB7/vAAPf3gAD79+AA++/g - P//v8B/97/wf/e/4D/3v/g/9//wH//f/B/v7/gP3+/+D7/z/Ad//f/+//8/8///4B/////////////// - //////////////////8oAAAAEAAAACAAAAABAAQAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - gAAAgAAAAICAAIAAAACAAIAAgIAAAICAgADAwMAAAAD/AAD/AAAA//8A/wAAAP8A/wD//wAA////AAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqqqqoAAAAAAKqoAAAAAAAAiqoA - AAAAAAAKqgAAAAAAAAiqgAAAAAAAAHqgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA//8AAP//AAD//wAA//8AAP//AAD4DwAA/D8AAPw/AAD+PwAA/h8AAP8fAAD//wAA//8AAP// - AAD//wAA//8AACgAAAAwAAAAYAAAAAEACAAAAAAAAAkAAAAAAAAAAAAAAAEAAAABAAAAAAAAAP4AAAX+ - BQAJ/wkADf4NABH/EQAW/hYAGf8ZAB3+HQAh/iEAJv4mACr+KgAt/i0AMf4xADX+NQA5/jkAPf49AEH+ - QQBF/kUAS/9LAE3+TQBR/lEAVf5VAFn+WQBe/14AYf5hAGX+ZQBp/mkAbv9uAHD/cAB1/nUAef55AH7+ - fgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFggIDhMXFxsXFxIOBgobAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAFgwSIAAAAAAAAAAAAAAAAAAdEQwbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABIMHQAA - AAAAAAAAAAAAAAAAAAAAAAAbDBYAAAAAAAAAAAAAAAAAAAAAAAAAAAAbCAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAB0IAAAAAAAAAAAAAAAAAAAAAAAAAAwWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEREA - AAAAAAAAAAAAAAAAAAAACgAAACAbFgwBAQEBAQEBAQEBAQEBAQEBAQEAAAAAABsOAAAAAAAAAAAAAAAA - AAAKAAAAAAAAAAwBAQEBAQEBAQEBAQEBAQEBAQEbAAAAAAAgDgAAAAAAAAAAAAAAAA4AAAAAAAAdBAEB - AQEBAQEBAQEBAQEBAQEBAQEOAAAAAAAAGxIAAAAAAAAAAAAAGxYAAAAAAAAgICAgCgEBAQEBAQEBAQEB - AQEBAQEBAAAAAAAAAA4AAAAAAAAAAAAADAAAAAAAAAAAAAAWAQEBAQEBAQEBAQEBAQEBAQEBAAAAAAAA - AAAKAAAAAAAAAAAWHQAAAAAAAAAAAAwBAQEBAQEBAQEBAAAAAAAAAAAAAAAAAAAAAAASAAAAAAAAAAAK - AAAAAAAAAAAAAAAAACAGAQEBAQEBFgAAAAAAAAAAAAAAAAAAAAAAEgAAAAAAAAAOAAAAAAAAAAAAAAAA - AAgBAQEBAQEBBAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAAATAAAAAAAAAAAAAAAXAQEBAQEBAQEBARYA - AAAAAAAAAAAAAAAAAAAADAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAFwEBAQEBAQYAAAAAAAAAAAAAAAAA - AAAADAAAAAAAAAAWAAAAAAAAAAAAAAAAAAAWAQEBAQEBAQEXAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAS - AAAAAAAAAAAAAAAAAAoBBAQBAQEBAQEEAAAAAAAAAAAAAAAAAAAADgAAAAAAAAAKAAAAAAAAAAAAAAAA - AAAAAAAOAQEBAQEBGwAAAAAAAAAAAAAAAAAAEQAAAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAYBAQEBAQEB - BAAAAAAAAAAAAAAAAAAbFwAAAAAAAAAAEgAAAAAAAAAAAAAAAAAAEQwODAQBAQEBAR0AAAAAAAAAAAAA - AAAKAAAAAAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAIAQBAQEBAQgAAAAAAAAAAAAAAB0WAAAAAAAAAAAA - AAoAAAAAAAAAAAAAAAAAAAARAQEBAQEBAQEdAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAMAAAAAAAAAAAA - AAAAABsbFxsRAQEBAQEKAAAAAAAAAAAACgAAAAAAAAAAAAAAAAAbEQAAAAAAAAAAAAAAAAAAAAAMAQEB - AQEBIAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAAGw4AAAAAAAAAAAAAAAAAAAYBAQEBAQEBCAAAAAAAAAoA - AAAAAAAAAAAAAAAAAAAAAAAIGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWCgAAAAAAAAAAAAAAAAAA - AAAAAAAAFwgdAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwgbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXDBMA - AAAAAAAAAAAAAAAAAAAAABIMGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAODhIXAAAAAAAAAAAA - FxEMEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgEw4IBAQECA4WIAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAA////////AAD///////8AAP///////wAA////////AAD///////8AAP// - /////wAA////////AAD///////8AAP///z///wAA///AAH//AAD//h//D/8AAP/4///j/wAA/+f///n/ - AAD/z////n8AAP+4AAAfPwAA/38AAA+fAAD+/AAAD88AAPz8AAAP7wAA/f+AAA/3AAD5/wAf//cAAPv/ - 4A//+wAA+//gD//7AAD7/4AH//sAAPv/+Af/+wAA+//wA//7AAD7/+AD//sAAPv//gH/+wAA+//8Af/z - AAD9//gA//cAAP3//wD/5wAA/v/+AH/vAAD/f/wAf98AAP8//8A/vwAA/5//gD9/AAD/5////P8AAP/x - ///x/wAA//x//8f/AAD//4f8P/8AAP//8AH//wAA////////AAD///////8AAP///////wAA//////// - AAD///////8AAP///////wAA////////AAD///////8AAP///////wAAKAAAACAAAABAAAAAAQAIAAAA - AAAABAAAAAAAAAAAAAAAAQAAAAEAAAAAAAAA/gAABf4FAAn+CQAP/g8AHv4eACv+KwAs/ywAM/8zADT/ - NAA+/j4AQv5CAEX+RQBJ/kkATP5MAFD+UABV/lUAWf9ZAF7+XgBh/mEAZf5lAGj+aABt/m0Acv5yAHX+ - dQB5/nkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkODhcAAAAAFg4O - AAAAAAAAAAAAAAAAAAAAAAAAAA8WAAAAAAAAAAAAAAAAExEAAAAAAAAAAAAAAAAAABMWAAAAAAAAAAAA - AAAAAAAAABEXAAAAAAAAAAAAAAANAAAADQQEAgQCBAIEAgQCBAAAAAAPAAAAAAAAAAAADQAAAAARAgIC - AgICAgICAgICCgAAAAAPAAAAAAAAABMAAAAAGREPBAICAgICAgICAgICAAAAAAAZAAAAAAAAFgAAAAAA - ABECAgICAgIGBwgICAgAAAAAAA8AAAAAABMAAAAAAAAAFxYFAgICAgAAAAAAAAAAAAAAAAAAAAAADgAA - AAAAAAAADwICAgICBwAAAAAAAAAAAAAADwAAAAANAAAAAAAAAAAAAAcCAgICAAAAAAAAAAAAAAANAAAA - AA0AAAAAAAAAAAAOAgICAgIHAAAAAAAAAAAAAA0AAAAADgAAAAAAAAAAAAAACgICAgIAAAAAAAAAAAAA - EwAAAAAAAAAAAAAAAAAAAA0CAgICAggAAAAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAPAgICAgAAAAAA - AAAADQAAAAAAAAAXAAAAAAAAAAAADQICAgICCgAAAAAAABEAAAAAAAAAABcAAAAAAAAAAAAAABMCAgIC - AAAAAAAXAAAAAAAAAAAAABkTAAAAAAAAAAAOBAICAgQOAAAADwAAAAAAAAAAAAAAAAAOAAAAAAAAAAAA - AAAAAAAAAA4AAAAAAAAAAAAAAAAAAAAADhMAAAAAAAAAAAAAEw8AAAAAAAAAAAAAAAAAAAAAAAAAAAAT - Dg0KCg0OEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////////////////////////+Hj//+f - /n/+f/+f/cAB7/vAAPf3gAD79+AA++/gP//v8B/97/wf/e/4D/3v/g/9//wH//f/B/v7/gP3+/+D7/z/ - Ad//f/+//8/8///4B/////////////////////////////////8oAAAAEAAAACAAAAABAAgAAAAAAAAB - AAAAAAAAAAAAAAABAAAAAQAAAAAAAAD+AAAE/wQAC/4LAAz/DAAR/hEAFf8VACP/IwA6/zoAQ/5DAFL/ - UgBb/1sAb/5vAHb+dgB5/3kAfv9+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAgICAgIFAAAAAAAA - AAAAAAcCAg4AAAAAAAAAAAAAAAALAwIMAAAAAAAAAAAAAAAAAAgCAwAAAAAAAAAAAAAAAAANBQIOAAAA - AAAAAAAAAAAAAAoCAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAA//8AAP//AAD//wAA//8AAPgP - AAD8PwAA/D8AAP4/AAD+HwAA/x8AAP//AAD//wAA//8AAP//AAD//wAAKAAAADAAAABgAAAAAQAgAAAA - AACAJQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAA/wADAP8AHwD/AEUA/wBjAP8AdgD+AIMA/wCGAP8AfAD/AHIA/wBeAP8AQAD+ - ABkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAD/AAIA/wAnAP4AZgD/AKkA/wDiAP8A5QD/AMkA/wC0AP8ApQD+AJ4A/wCZAP8AnwD/ - AKgA/wC4AP8AzAD+AOkA/wDaAP8AmwD/AFwA/wAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAA/wAQAP8ATgD/AKwA/wDRAP4AuwD/AIAA/wBCAP8AIgD/ABUA/wAMAP8ABQD+ - AAIAAAAAAP8AAwD/AAYA/wANAP8AFwD+ACQA/wBMAP8AjQD/AMAA/wDTAP8AnAD+AD8A/wAKAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAP4ACAD+AEQA/gC5AP4A0QD+AIcA/gA3AP4ACgAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+ABEA/gA+AP4AmwD+ - ANQA/gCmAP4AOAD+AAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/wAZAP4AlgD/AOcA/wB2AP8AGQAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAD+ACcA/wCQAP8A5gD/AH4A/wALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AD8A/wDTAP4AqwD/ACEA/wAGAP8AMAD/ - AF8A/wByAP4AcgD/AHIA/wByAP8AcgD/AHIA/wByAP8AcgD+AHIA/wByAP8AcgD/AHIA/wByAP8AcgD+ - AHIA/wByAP8AcgD/AHIA/wByAP8ACwAAAAAAAAAAAP8AMQD/AMYA/wDBAP8AKwAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/wACAP8ATAD/ANsA/wB3AP4AHwD/ - AEsA/wCHAP8AnAD/AKoA/wDSAP4A/gD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD+AP4A/wD/AP8A/wD/ - AP8A/wD/AP8A/wD+AP4A/wD/AP8A/wD/AP8A/wD/AP8ATAAAAAAAAAAAAAAAAAD/ABMA/wCYAP8AywD+ - ADkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAEA/wA/AP8A3AD/ - AGMA/wAGAAAAAAAAAAAAAAAAAP8ACAD/AFQA/wDVAP4A/gD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD+ - AP4A/wD/AP8A/wD/AP8A/wD/AP8A/wD+AP4A/wD/AP8A/wD/AP8A/wD/AP8AlAD+AAMAAAAAAAAAAAAA - AAAA/wAMAP8AhgD+AMwA/wAmAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/ - ACIA/wDKAP8AfAD/AAIAAAAAAAAAAAAAAAAA/wARAP8AjgD/APIA/wD/AP4A/gD/AP8A/wD/AP8A/wD/ - AP8A/wD/AP8A/wD+AP4A/wD/AP8A/wD/AP8A/wD/AP8A/wD+AP4A/wD/AP8A/wD/AP8A/wD/AP8AzgD+ - ABQAAAAAAAAAAAAAAAAAAAAAAP8ADAD+AJkA/wC8AP8ACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - 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 - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// - /////wAA////////AAD///////8AAP///////wAA////////AAD///////8AAP///////wAA//////// - AAD//+AB//8AAP/+AAAf/wAA//gAQAP/AAD/4D//gP8AAP/B///wfwAA/4AAAAw/AAD+AAAADh8AAPwc - AAAHDwAA/DgAAAeHAAD4eAAAB8MAAPj/AAAH4wAA+PwAAAfjAADx/AAH//EAAPH/gAf/8QAA8f8AA//x - AADx/wAD//EAAPH/wAH/8QAA8f/AAf/xAADx//wA//EAAPH/8AD/8QAA+P/gAH/jAAD4//4Af8MAAPx/ - /AB/xwAA/D/4AD+HAAD+D/8APg8AAP8H/gAcHwAA/4P+ABg/AAD/4H//wP8AAP/wD/4B/wAA//wAAAf/ - AAD//4AAP/8AAP///////wAA////////AAD///////8AAP///////wAA////////AAD///////8AAP// - /////wAA////////AAD///////8AACgAAAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+AA8A/gAzAP4ASwD/AFgA/gBVAP4ASQD+ - ADAA/wALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/gAEAP4ANwD+AIcA/wCzAP4AtAD+AI8A/gB1AP8AaQD+ - AGoA/gB4AP4AkgD/ALcA/gCvAP4AfwD+AC4A/wACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/gADAP8ARAD+AK4A/gCWAP4AQQD/ABMA/gABAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAP8AAQD+ABYA/gBKAP4AnwD/AKYA/gA5AP4AAQAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP8AEwD/AJsA/wCVAP8AHgAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP8AKgD/AKEA/wCMAP8ADAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+ACMA/gC5AP4AUQD/AD8A/gB+AP4AuQD+ - APAA/wD2AP4A9gD+APYA/gD2AP8A9gD+APYA/gD2AP4A9gD/APYA/gD2AP4A9gD+AHkAAAAAAP4AAgD+ - AF0A/gCvAP8AGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/wAXAP4AuAD+AC8AAAAAAAAAAAD+ - ABYA/gCfAP4A+gD/AP8A/gD+AP4A/gD+AP4A/wD/AP4A/gD+AP4A/gD+AP8A/wD+AP4A/gD+AP4AwQD/ - AAUAAAAAAAAAAAD+AEYA/wCvAP4ACQAAAAAAAAAAAAAAAAAAAAAAAAAAAP4AAgD/AJwA/gBHAAAAAAAA - AAAA/wALAP4AhQD+AKoA/gCsAP8A8AD+AP4A/gD+AP4A/gD/AP8A/gD+AP4A/gD+AP4A/wD/AP4A/gD+ - AP4A/gD1AP8AHQAAAAAAAAAAAAAAAAD/AF0A/gCHAP4AAQAAAAAAAAAAAAAAAAAAAAAA/wBAAP8AlgAA - AAAAAAAAAAAAAAAAAAAAAAAAAP8AGgD/AKgA/wD8AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wDUAP8AywD/ - AMwA/wDLAP8AywD/AMsA/wBGAAAAAAAAAAAAAAAAAP8AAgD/AK0A/wAnAAAAAAAAAAAAAAAAAAAAAAD+ - AJcA/wA0AAAAAAAAAAAAAAAAAAAAAAD+AAcA/gBmAP4AjAD/AJIA/gDhAP4A/gD+AP4A/wD/AP4A/gD+ - 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 - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAA////////////////////////////+Af//4AAf/4D8B/8P/8P+AAAh/GA - AGPjAABx58AAceeAH/nn4A/558AP+efwB/nn8Af55/gD+eP4A/Hx/AHj8PwBx/h+AYf+H/4f/wAAP//A - AP////////////////////////////////8oAAAAEAAAACAAAAABACAAAAAAAEAEAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/wADAP8AHwD/ACsA/wAeAP8AAgAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AD4A/gBlAP8AXgD+AEEA/wA1AP4AQgD/ - AF8A/gBmAP8AOAAAAAAAAAAAAAAAAAAAAAAAAAAAAP8ACAD/AG4A/wBcAP8AagD/AHsA/wB7AP8AewD/ - AHsA/wB7AP8AWwD/ADMA/wBpAP8ABgAAAAAAAAAAAAAAAAD/AGwA/gAMAP8AKQD+ALwA/wD7AP4A/gD/ - AP8A/gD+AP8A/wD+AO0A/wAIAP4AEQD/AGcAAAAAAAAAAAD/ADYA/wAzAAAAAAD/AAEA/wBtAP8A3AD/ - AP8A/wD/AP8AgQD/AGYA/wBlAP8AEQAAAAAA/wA/AP8AKAAAAAAA/gBdAP8ABAAAAAAAAAAAAP4AGwD/ - AKQA/gD0AP8A/wD+AJAAAAAAAAAAAAAAAAAAAAAAAP8ABwD+AFoAAAAAAP8AWgD/AAYAAAAAAAAAAAAA - AAAA/wBVAP8AxQD/AP8A/wDzAP8AFwAAAAAAAAAAAAAAAAD/AAwA/wBVAAAAAAD+ACYA/wBFAAAAAAAA - AAAAAAAAAP8ADwD+AIkA/wDqAP4A/gD/AIYAAAAAAAAAAAAAAAAA/wBPAP4AGwAAAAAAAAAAAP8AXwD/ - AB8AAAAAAAAAAAAAAAAA/wBAAP8ArQD/AP4A/wDuAP8AEwAAAAAA/wAnAP8AWAAAAAAAAAAAAAAAAAD/ - AAEA/gBaAP8ATwD+AAUAAAAAAP4ACAD/AGoA/gB6AP8AegD+ADMA/wBUAP4AVAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAD/ABwA/wBgAP8AYgD/AGEA/wBhAP8AYQD/AGIA/wBfAP8AFwAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAP//AAD//wAA/B8AAPAHAADAAQAAwAEAAJAEAACYPAAAnBwAAJwcAADOCQAAwgMAAPAH - AAD//wAA//8AAP//AAA= - - - \ No newline at end of file diff --git a/SLC1-N/Form_HQMESconfig.Designer.cs b/SLC1-N/Form_HQMESconfig.Designer.cs new file mode 100644 index 0000000..294b57a --- /dev/null +++ b/SLC1-N/Form_HQMESconfig.Designer.cs @@ -0,0 +1,149 @@ +namespace SLC1_N +{ + partial class Form_HQMESconfig + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.tb_LINE = new System.Windows.Forms.TextBox(); + this.label10 = new System.Windows.Forms.Label(); + this.button1 = new System.Windows.Forms.Button(); + this.tb_Tools = new System.Windows.Forms.TextBox(); + this.label13 = new System.Windows.Forms.Label(); + this.tb_ActionName = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // tb_LINE + // + this.tb_LINE.Font = new System.Drawing.Font("宋体", 15F); + this.tb_LINE.Location = new System.Drawing.Point(124, 197); + this.tb_LINE.Name = "tb_LINE"; + this.tb_LINE.Size = new System.Drawing.Size(194, 30); + this.tb_LINE.TabIndex = 211; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label10.Location = new System.Drawing.Point(71, 200); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(41, 12); + this.label10.TabIndex = 210; + this.label10.Text = "线体："; + // + // button1 + // + this.button1.Font = new System.Drawing.Font("宋体", 15F); + this.button1.Location = new System.Drawing.Point(137, 306); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(124, 53); + this.button1.TabIndex = 209; + this.button1.Text = "保存"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // tb_Tools + // + this.tb_Tools.Font = new System.Drawing.Font("宋体", 15F); + this.tb_Tools.Location = new System.Drawing.Point(124, 244); + this.tb_Tools.Name = "tb_Tools"; + this.tb_Tools.Size = new System.Drawing.Size(194, 30); + this.tb_Tools.TabIndex = 208; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label13.Location = new System.Drawing.Point(71, 249); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(41, 12); + this.label13.TabIndex = 207; + this.label13.Text = "工具："; + // + // tb_ActionName + // + this.tb_ActionName.Font = new System.Drawing.Font("宋体", 15F); + this.tb_ActionName.Location = new System.Drawing.Point(124, 153); + this.tb_ActionName.Name = "tb_ActionName"; + this.tb_ActionName.Size = new System.Drawing.Size(194, 30); + this.tb_ActionName.TabIndex = 206; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.label9.Location = new System.Drawing.Point(71, 160); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(41, 12); + this.label9.TabIndex = 205; + this.label9.Text = "工位："; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("宋体", 20F); + this.label4.Location = new System.Drawing.Point(141, 84); + this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(108, 27); + this.label4.TabIndex = 204; + this.label4.Text = "MES配置"; + // + // Form_HQMESconfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(421, 450); + this.Controls.Add(this.tb_LINE); + this.Controls.Add(this.label10); + this.Controls.Add(this.button1); + this.Controls.Add(this.tb_Tools); + this.Controls.Add(this.label13); + this.Controls.Add(this.tb_ActionName); + this.Controls.Add(this.label9); + this.Controls.Add(this.label4); + this.Name = "Form_HQMESconfig"; + this.Text = "MES配置"; + this.Load += new System.EventHandler(this.Form_HQMESconfig_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.TextBox tb_LINE; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.TextBox tb_Tools; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.TextBox tb_ActionName; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label4; + } +} \ No newline at end of file diff --git a/SLC1-N/Form_HQMESconfig.cs b/SLC1-N/Form_HQMESconfig.cs new file mode 100644 index 0000000..5004024 --- /dev/null +++ b/SLC1-N/Form_HQMESconfig.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace SLC1_N +{ + public partial class Form_HQMESconfig : Form + { + public Form_HQMESconfig() + { + InitializeComponent(); + } + private void Form_HQMESconfig_Load(object sender, EventArgs e) + { + tb_ActionName.Text = Form1.m_ActionName; + tb_Tools.Text = Form1.m_Tools; + tb_LINE.Text = Form1.m_LINE; + } + + private void button1_Click(object sender, EventArgs e) + { + Form1.m_ActionName = tb_ActionName.Text; + Form1.m_Tools = tb_Tools.Text; + Form1.m_LINE = tb_LINE.Text; + + // Json记录 + var config = new JsonConfig("config.json"); + config.SetValue("LINE", tb_LINE.Text); + config.SetValue("ActionName", tb_ActionName.Text); + config.SetValue("Tools", tb_Tools.Text); + this.Close(); + } + + } +} diff --git a/SLC1-N/Form_HQMESconfig.resx b/SLC1-N/Form_HQMESconfig.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/SLC1-N/Form_HQMESconfig.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SLC1-N/Form_hbMESset.cs b/SLC1-N/Form_hbMESset.cs index 2f51971..48d563e 100644 --- a/SLC1-N/Form_hbMESset.cs +++ b/SLC1-N/Form_hbMESset.cs @@ -20,8 +20,6 @@ namespace SLC1_N private void Form_gdMESset_Load(object sender, EventArgs e) { - tb_url_ip.Text = Form1.f1.mes_urlip; - tb_url_port.Text = Form1.f1.mes_urlport; tb_partno.Text = Form1.f1.mes_partno; tb_station.Text = Form1.f1.mes_station; @@ -46,8 +44,6 @@ namespace SLC1_N config.SetValue($"mes_fixturecode", tb_fixturecode.Text); config.SetValue($"mes_plan", tb_plan.Text); - Form1.f1.mes_urlip = tb_url_ip.Text; - Form1.f1.mes_urlport = tb_url_port.Text; Form1.f1.mes_partno = tb_partno.Text; Form1.f1.mes_station = tb_station.Text; diff --git a/SLC1-N/SLC1-N.csproj b/SLC1-N/SLC1-N.csproj index be374ab..cc6f495 100644 --- a/SLC1-N/SLC1-N.csproj +++ b/SLC1-N/SLC1-N.csproj @@ -7,7 +7,7 @@ {F7F71589-095A-45C2-975C-739BE2D1CE15} WinExe SLC1_N - LL28-V25102401 + LL28-V25111102 v4.8 512 true @@ -110,18 +110,18 @@ - - Form - - - Form_Activate.cs - Form Form_hbMESset.cs + + Form + + + Form_HQMESconfig.cs + Form @@ -208,12 +208,12 @@ Warning.cs - - Form_Activate.cs - Form_hbMESset.cs + + Form_HQMESconfig.cs + Form_NetworkSet.cs diff --git a/SLC1-N/bin/Debug/HQMES.dll b/SLC1-N/bin/Debug/HQMES.dll new file mode 100644 index 0000000..66223a6 Binary files /dev/null and b/SLC1-N/bin/Debug/HQMES.dll differ diff --git a/SLC1-N/bin/Debug/LL28-V25102401.pdb b/SLC1-N/bin/Debug/LL28-V25102401.pdb deleted file mode 100644 index 522fd05..0000000 Binary files a/SLC1-N/bin/Debug/LL28-V25102401.pdb and /dev/null differ diff --git a/SLC1-N/bin/Debug/LL28-V25102401.exe b/SLC1-N/bin/Debug/LL28-V25111102.exe similarity index 96% rename from SLC1-N/bin/Debug/LL28-V25102401.exe rename to SLC1-N/bin/Debug/LL28-V25111102.exe index 1efd749..d20df1d 100644 Binary files a/SLC1-N/bin/Debug/LL28-V25102401.exe and b/SLC1-N/bin/Debug/LL28-V25111102.exe differ diff --git a/SLC1-N/bin/Debug/LL28-V25102401.exe.config b/SLC1-N/bin/Debug/LL28-V25111102.exe.config similarity index 100% rename from SLC1-N/bin/Debug/LL28-V25102401.exe.config rename to SLC1-N/bin/Debug/LL28-V25111102.exe.config diff --git a/SLC1-N/bin/Debug/LL28-V25111102.pdb b/SLC1-N/bin/Debug/LL28-V25111102.pdb new file mode 100644 index 0000000..1ba9591 Binary files /dev/null and b/SLC1-N/bin/Debug/LL28-V25111102.pdb differ diff --git a/SLC1-N/bin/Debug/NetWorkHelper.dll b/SLC1-N/bin/Debug/NetWorkHelper.dll index ee63ad3..813e4f6 100644 Binary files a/SLC1-N/bin/Debug/NetWorkHelper.dll and b/SLC1-N/bin/Debug/NetWorkHelper.dll differ diff --git a/SLC1-N/bin/Debug/NetWorkHelper.pdb b/SLC1-N/bin/Debug/NetWorkHelper.pdb index 5c106b3..4892845 100644 Binary files a/SLC1-N/bin/Debug/NetWorkHelper.pdb and b/SLC1-N/bin/Debug/NetWorkHelper.pdb differ diff --git a/SLC1-N/bin/Debug/config.json b/SLC1-N/bin/Debug/config.json index c6fed80..cc60657 100644 --- a/SLC1-N/bin/Debug/config.json +++ b/SLC1-N/bin/Debug/config.json @@ -104,8 +104,8 @@ "CodeLength4": "12", "ch3AutoConnect": false, "ch4AutoConnect": false, - "ch3ipaddress": "192.168.1.136", - "ch4ipaddress": "192.168.1.136", + "ch3ipaddress": "192.168.1.131", + "ch4ipaddress": "192.168.1.131", "mes_urlip": "localhost", "mes_urlport": "43120", "mes_partno": "1", @@ -144,5 +144,8 @@ "SerialPort_CH4BaudRate": "9600", "SerialPort_CH4PortName": "COM51", "chk_ContinueTest": true, - "tb_ContinueTestCount": 20 + "tb_ContinueTestCount": 3, + "LINE": "222", + "ActionName": "111", + "Tools": "333" } \ No newline at end of file diff --git a/SLC1-N/bin/Debug/productiondata.json b/SLC1-N/bin/Debug/productiondata.json index 33e2bfa..3ba2f48 100644 --- a/SLC1-N/bin/Debug/productiondata.json +++ b/SLC1-N/bin/Debug/productiondata.json @@ -1,9 +1,9 @@ { "ProductionData": { - "Total": 7, - "OK": 7, + "Total": 13, + "OK": 13, "NG": 0, - "LastUpdate": "2025-11-03T17:21:54.0189826+08:00", + "LastUpdate": "2025-11-10T16:45:56.6738591+08:00", "OKRate": 100.0, "NGRate": 0.0 } diff --git a/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 85ef08a..4f9a769 100644 Binary files a/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/SLC1-N/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/SLC1-N/obj/Debug/Interop.ADOX.dll b/SLC1-N/obj/Debug/Interop.ADOX.dll index 34ce100..97e4c7a 100644 Binary files a/SLC1-N/obj/Debug/Interop.ADOX.dll and b/SLC1-N/obj/Debug/Interop.ADOX.dll differ diff --git a/SLC1-N/obj/Debug/LL28-V25102401.pdb b/SLC1-N/obj/Debug/LL28-V25102401.pdb deleted file mode 100644 index 522fd05..0000000 Binary files a/SLC1-N/obj/Debug/LL28-V25102401.pdb and /dev/null differ diff --git a/SLC1-N/obj/Debug/LL28-V25102401.exe b/SLC1-N/obj/Debug/LL28-V25111102.exe similarity index 96% rename from SLC1-N/obj/Debug/LL28-V25102401.exe rename to SLC1-N/obj/Debug/LL28-V25111102.exe index 1efd749..d20df1d 100644 Binary files a/SLC1-N/obj/Debug/LL28-V25102401.exe and b/SLC1-N/obj/Debug/LL28-V25111102.exe differ diff --git a/SLC1-N/obj/Debug/LL28-V25111102.pdb b/SLC1-N/obj/Debug/LL28-V25111102.pdb new file mode 100644 index 0000000..1ba9591 Binary files /dev/null and b/SLC1-N/obj/Debug/LL28-V25111102.pdb differ diff --git a/SLC1-N/obj/Debug/SLC1-N.csproj.AssemblyReference.cache b/SLC1-N/obj/Debug/SLC1-N.csproj.AssemblyReference.cache index de4de5b..3396543 100644 Binary files a/SLC1-N/obj/Debug/SLC1-N.csproj.AssemblyReference.cache and b/SLC1-N/obj/Debug/SLC1-N.csproj.AssemblyReference.cache differ diff --git a/SLC1-N/obj/Debug/SLC1-N.csproj.CoreCompileInputs.cache b/SLC1-N/obj/Debug/SLC1-N.csproj.CoreCompileInputs.cache index 3e348f9..f786452 100644 --- a/SLC1-N/obj/Debug/SLC1-N.csproj.CoreCompileInputs.cache +++ b/SLC1-N/obj/Debug/SLC1-N.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -c01af3f81e11c80737859ab83d4121a4923acc143099473d022c41a88314d7cc +f013823e92bf02912246dfd3c483ff11b8c061f83c23fb5e33cf1f7506010462 diff --git a/SLC1-N/obj/Debug/SLC1-N.csproj.FileListAbsolute.txt b/SLC1-N/obj/Debug/SLC1-N.csproj.FileListAbsolute.txt index 2800529..322b375 100644 --- a/SLC1-N/obj/Debug/SLC1-N.csproj.FileListAbsolute.txt +++ b/SLC1-N/obj/Debug/SLC1-N.csproj.FileListAbsolute.txt @@ -537,9 +537,6 @@ D:\桌面\莫禧亮\华勤\华贝LL-28\直压\USB扫码枪版本\huabei4tongdao\ D:\桌面\莫禧亮\华勤\华贝LL-28\直压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\LL28-V25102401.pdb D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\TCP\ITcpClient.cs D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\TCP\ITcpClient.Designer.cs -D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\LL28-V25102401.exe.config -D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\LL28-V25102401.exe -D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\LL28-V25102401.pdb D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\DocumentFormat.OpenXml.dll D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\EasyModbus.dll D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\Guna.UI.dll @@ -550,13 +547,11 @@ D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\ D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\Spire.XLS.dll D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\SunnyUI.Common.dll D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\SunnyUI.dll -D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\NetWorkHelper.pdb D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\EasyModbus.xml D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\Newtonsoft.Json.xml D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.AssemblyReference.cache D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\Interop.ADOX.dll D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.ResolveComReference.cache -D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_Activate.resources D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_hbMESset.resources D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_NetworkSet.resources D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Electricity.resources @@ -574,5 +569,10 @@ D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\ D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.GenerateResource.cache D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.CoreCompileInputs.cache D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\SLC1-N.csproj.Up2Date -D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\LL28-V25102401.exe -D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\LL28-V25102401.pdb +D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\SLC1_N.Form_HQMESconfig.resources +D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\NetWorkHelper.pdb +D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\LL28-V25111102.exe.config +D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\LL28-V25111102.exe +D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\bin\Debug\LL28-V25111102.pdb +D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\LL28-V25111102.exe +D:\桌面\莫禧亮\华勤\华贝LL-28\差压\USB扫码枪版本\huabei4tongdao\SLC1-N\obj\Debug\LL28-V25111102.pdb diff --git a/SLC1-N/obj/Debug/SLC1-N.csproj.GenerateResource.cache b/SLC1-N/obj/Debug/SLC1-N.csproj.GenerateResource.cache index 1e1091e..55b1d75 100644 Binary files a/SLC1-N/obj/Debug/SLC1-N.csproj.GenerateResource.cache and b/SLC1-N/obj/Debug/SLC1-N.csproj.GenerateResource.cache differ diff --git a/SLC1-N/obj/Debug/SLC1-N.csproj.ResolveComReference.cache b/SLC1-N/obj/Debug/SLC1-N.csproj.ResolveComReference.cache index 6816598..eb29a0a 100644 Binary files a/SLC1-N/obj/Debug/SLC1-N.csproj.ResolveComReference.cache and b/SLC1-N/obj/Debug/SLC1-N.csproj.ResolveComReference.cache differ diff --git a/SLC1-N/obj/Debug/SLC1_N.Form_Activate.resources b/SLC1-N/obj/Debug/SLC1_N.Form_Activate.resources deleted file mode 100644 index a0b6eea..0000000 Binary files a/SLC1-N/obj/Debug/SLC1_N.Form_Activate.resources and /dev/null differ diff --git a/SLC1-N/obj/Debug/SLC1_N.Form_HQMESconfig.resources b/SLC1-N/obj/Debug/SLC1_N.Form_HQMESconfig.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/SLC1-N/obj/Debug/SLC1_N.Form_HQMESconfig.resources differ diff --git a/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.dll b/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.dll index ee63ad3..813e4f6 100644 Binary files a/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.dll and b/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.dll differ diff --git a/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.pdb b/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.pdb index 5c106b3..4892845 100644 Binary files a/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.pdb and b/tongxin/NetWorkHelper/bin/Debug/NetWorkHelper.pdb differ diff --git a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.AssemblyReference.cache b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.AssemblyReference.cache index 3a43c06..92ef77d 100644 Binary files a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.AssemblyReference.cache and b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.csproj.AssemblyReference.cache differ diff --git a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.dll b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.dll index ee63ad3..813e4f6 100644 Binary files a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.dll and b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.dll differ diff --git a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.pdb b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.pdb index 5c106b3..4892845 100644 Binary files a/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.pdb and b/tongxin/NetWorkHelper/obj/Debug/NetWorkHelper.pdb differ