From eb69973ed3c7f1f6af1395865cc6402cbc967056 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期一, 11 八月 2025 17:22:37 +0800
Subject: [PATCH] 1、合并按钮优化

---
 DevApp/.vs/GsDevSolution/v17/DocumentLayout.json |  137 +++++++++++++++++++++++----------------------
 1 files changed, 71 insertions(+), 66 deletions(-)

diff --git a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json
index ed00c70..e607cbe 100644
--- a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json
+++ b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json
@@ -1,30 +1,26 @@
 {
   "Version": 1,
-  "WorkspaceRootPath": "E:\\MesSourceCode\\PC_Web\\DevApp\\",
+  "WorkspaceRootPath": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesClient\\DevApp\\",
   "Documents": [
     {
-      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\usercontrol\\ucbtnprint.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\usercontrol\\ucbtnprint.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|d:\\visual studios job\\lw\\lw_mesclient\\devapp\\gs.devapp\\devfrm\\qc\\frm_mesqamj.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\qc\\frm_mesqamj.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|E:\\MesSourceCode\\PC_Web\\DevApp\\gs.devapp\\devfrm\\rpt\\rptpreview.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\rpt\\rptpreview.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|d:\\visual studios job\\lw\\lw_mesclient\\devapp\\gs.devapp\\devfrm\\qc\\frm_mesqamj.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
+      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\qc\\frm_mesqamj.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|E:\\MesSourceCode\\PC_Web\\DevApp\\gs.devapp\\devfrm\\warehouse\\frm_arrivalbarcode.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
-      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\warehouse\\frm_arrivalbarcode.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
+      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|D:\\VISUAL STUDIOS JOB\\LW\\LW_MesClient\\DevApp\\gs.devapp\\devfrm\\wom\\frm_messcrksqdj.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
+      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\wom\\frm_messcrksqdj.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|E:\\MesSourceCode\\PC_Web\\DevApp\\gs.devapp\\devfrm\\warehouse\\frm_arrivalbarcode.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\warehouse\\frm_arrivalbarcode.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|D:\\VISUAL STUDIOS JOB\\LW\\LW_MesClient\\DevApp\\gs.devapp\\devfrm\\wom\\frm_messcrksqdj.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\wom\\frm_messcrksqdj.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|E:\\MesSourceCode\\PC_Web\\DevApp\\gs.devapp\\devfrm\\rpt\\rptpreview.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\rpt\\rptpreview.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|E:\\MesSourceCode\\PC_Web\\DevApp\\gs.devapp\\devfrm\\rpt\\rptpreview.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
-      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\rpt\\rptpreview.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
+      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|D:\\VISUAL STUDIOS JOB\\LW\\LW_MesClient\\DevApp\\gs.devapp\\devfrm\\wom\\frm_messcrksqdj.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\wom\\frm_messcrksqdj.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     }
   ],
   "DocumentGroupContainers": [
@@ -34,78 +30,87 @@
       "DocumentGroups": [
         {
           "DockedWidth": 200,
-          "SelectedChildIndex": 0,
+          "SelectedChildIndex": 5,
           "Children": [
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{b1e99781-ab81-11d0-b683-00aa00a3ee26}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
             {
               "$type": "Document",
               "DocumentIndex": 0,
-              "Title": "UcBtnPrint.cs",
-              "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\UcBtnPrint.cs",
-              "RelativeDocumentMoniker": "Gs.DevApp\\UserControl\\UcBtnPrint.cs",
-              "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\UcBtnPrint.cs",
-              "RelativeToolTip": "Gs.DevApp\\UserControl\\UcBtnPrint.cs",
-              "ViewState": "AgIAABsAAAAAAQAAAAAQwCYAAAAnAAAAAAAAAA==",
+              "Title": "Frm_MesQaMj.cs",
+              "DocumentMoniker": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesClient\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQaMj.cs",
+              "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQaMj.cs",
+              "ToolTip": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesClient\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQaMj.cs",
+              "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQaMj.cs",
+              "ViewState": "AgIAAOEAAAAAAAAAAAAqwPAAAAAZAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-07-04T05:39:57.427Z",
+              "WhenOpened": "2025-08-01T00:15:55.108Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
               "DocumentIndex": 1,
-              "Title": "RptPreview.Designer.cs",
-              "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rpt\\RptPreview.Designer.cs",
-              "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Rpt\\RptPreview.Designer.cs",
-              "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rpt\\RptPreview.Designer.cs",
-              "RelativeToolTip": "Gs.DevApp\\DevFrm\\Rpt\\RptPreview.Designer.cs",
-              "ViewState": "AgIAAA0AAAAAAAAAAAAswB8AAAAMAAAAAAAAAA==",
+              "Title": "Frm_MesQaMj.cs [\u8BBE\u8BA1]",
+              "DocumentMoniker": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesClient\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQaMj.cs",
+              "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQaMj.cs",
+              "ToolTip": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesClient\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQaMj.cs [\u8BBE\u8BA1]",
+              "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQaMj.cs [\u8BBE\u8BA1]",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-07-04T05:41:03.722Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 3,
-              "Title": "Frm_ArrivalBarcode.cs",
-              "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs",
-              "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs",
-              "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs",
-              "RelativeToolTip": "Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs",
-              "ViewState": "AgIAABgAAAAAAAAAAAAswCoAAAAQAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-07-04T05:27:36.796Z"
+              "WhenOpened": "2025-08-01T00:13:20.091Z",
+              "EditorCaption": " [\u8BBE\u8BA1]"
             },
             {
               "$type": "Document",
               "DocumentIndex": 2,
-              "Title": "Frm_ArrivalBarcode.cs [\u8BBE\u8BA1]",
-              "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs",
-              "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs",
-              "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs [\u8BBE\u8BA1]",
-              "RelativeToolTip": "Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs [\u8BBE\u8BA1]",
+              "Title": "Frm_MesScrksqDj.cs [\u8BBE\u8BA1]",
+              "DocumentMoniker": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesClient\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesScrksqDj.cs",
+              "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesScrksqDj.cs",
+              "ToolTip": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesClient\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesScrksqDj.cs [\u8BBE\u8BA1]",
+              "RelativeToolTip": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesScrksqDj.cs [\u8BBE\u8BA1]",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-07-04T05:27:07.091Z"
+              "WhenOpened": "2025-07-31T00:44:48.518Z"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 3,
+              "Title": "Frm_MesScrksqDj.cs",
+              "DocumentMoniker": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesClient\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesScrksqDj.cs",
+              "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesScrksqDj.cs",
+              "ToolTip": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesClient\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesScrksqDj.cs",
+              "RelativeToolTip": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesScrksqDj.cs",
+              "ViewState": "AgIAABABAAAAAAAAAADwvxwBAABEAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-07-31T00:38:28.728Z"
             },
             {
               "$type": "Document",
               "DocumentIndex": 4,
-              "Title": "RptPreview.cs",
-              "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs",
-              "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs",
-              "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs",
-              "RelativeToolTip": "Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs",
-              "ViewState": "AgIAAAUAAAAAAAAAAAAowBIAAAAMAAAAAAAAAA==",
+              "Title": "Frm_MesScrksqDj.Designer.cs",
+              "DocumentMoniker": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesClient\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesScrksqDj.Designer.cs",
+              "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesScrksqDj.Designer.cs",
+              "ToolTip": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesClient\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesScrksqDj.Designer.cs",
+              "RelativeToolTip": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesScrksqDj.Designer.cs",
+              "ViewState": "AgIAAP0CAAAAAAAAAAAUwP8CAAA+AAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-07-04T05:24:08.631Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 5,
-              "Title": "RptPreview.cs [\u8BBE\u8BA1]",
-              "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs",
-              "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs",
-              "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs [\u8BBE\u8BA1]",
-              "RelativeToolTip": "Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs [\u8BBE\u8BA1]",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-07-04T05:19:07.914Z"
+              "WhenOpened": "2025-07-31T00:39:21.033Z"
             }
           ]
         }

--
Gitblit v1.9.3