From 262746cb15ee6779f24adeca62eded6389df6ef9 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 24 七月 2025 13:50:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesClient
---
DevApp/.vs/GsDevSolution/v17/DocumentLayout.json | 138 +++++++---------------------------------------
1 files changed, 21 insertions(+), 117 deletions(-)
diff --git a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json
index 2718e33..264f55e 100644
--- a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json
+++ b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json
@@ -3,36 +3,12 @@
"WorkspaceRootPath": "E:\\MesSourceCode\\PC_Web\\DevApp\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\warehouse\\frm_initialbarcode.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_initialbarcode.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\\usercontrol\\selectdeletebar.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\usercontrol\\selectdeletebar.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\\qc\\frm_mesqaitemsdetect01.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_mesqaitemsdetect01.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\\qc\\mesqcexceptional.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\\mesqcexceptional.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\\qc\\mesqcexceptional.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\\mesqcexceptional.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\\qc\\frm_mesqaitemsdetect01.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_mesqaitemsdetect01.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\\qc\\defectcodeqc.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\\defectcodeqc.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\\qc\\defectcode.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\\defectcode.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\\qc\\defectcodeqc.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\\qc\\defectcodeqc.designer.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\\usercontrol\\selectdeletebar.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
+ "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\usercontrol\\selectdeletebar.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
}
],
"DocumentGroupContainers": [
@@ -47,102 +23,26 @@
{
"$type": "Document",
"DocumentIndex": 0,
- "Title": "Frm_InitialBarcode.cs [\u8BBE\u8BA1]",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Warehouse\\Frm_InitialBarcode.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Warehouse\\Frm_InitialBarcode.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Warehouse\\Frm_InitialBarcode.cs [\u8BBE\u8BA1]",
- "RelativeToolTip": "Gs.DevApp\\DevFrm\\Warehouse\\Frm_InitialBarcode.cs [\u8BBE\u8BA1]",
+ "Title": "SelectDeleteBar.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
+ "RelativeDocumentMoniker": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
+ "RelativeToolTip": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
+ "ViewState": "AgIAADEAAAAAAAAAAAAAwL4AAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-19T00:44:03.403Z",
- "EditorCaption": " [\u8BBE\u8BA1]"
- },
- {
- "$type": "Document",
- "DocumentIndex": 6,
- "Title": "DefectCode.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\DefectCode.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\DefectCode.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\DefectCode.cs",
- "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\DefectCode.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAP0AAABNAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-18T08:23:34.817Z",
+ "WhenOpened": "2025-07-23T06:57:36.465Z",
"EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 7,
- "Title": "DefectCodeQc.Designer.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\DefectCodeQc.Designer.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\DefectCodeQc.Designer.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\DefectCodeQc.Designer.cs",
- "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\DefectCodeQc.Designer.cs",
- "ViewState": "AgIAAA4AAAAAAAAAAAAhwCEAAABBAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-18T08:15:53.176Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 5,
- "Title": "DefectCodeQc.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\DefectCodeQc.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\DefectCodeQc.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\DefectCodeQc.cs",
- "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\DefectCodeQc.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAADwvxEAAAAfAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-18T08:15:45.743Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 2,
- "Title": "MesQcExceptional.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\MesQcExceptional.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\MesQcExceptional.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\MesQcExceptional.cs",
- "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\MesQcExceptional.cs",
- "ViewState": "AgIAAOoAAAAAAAAAAAASwAoBAAAMAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-18T08:57:21.429Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 3,
- "Title": "MesQcExceptional.cs [\u8BBE\u8BA1]",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\MesQcExceptional.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\MesQcExceptional.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\MesQcExceptional.cs [\u8BBE\u8BA1]",
- "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\MesQcExceptional.cs [\u8BBE\u8BA1]",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-18T06:15:21.936Z",
- "EditorCaption": " [\u8BBE\u8BA1]"
},
{
"$type": "Document",
"DocumentIndex": 1,
- "Title": "Frm_MesQaItemsDetect01.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQaItemsDetect01.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQaItemsDetect01.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQaItemsDetect01.cs",
- "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQaItemsDetect01.cs",
- "ViewState": "AgIAAHYCAAAAzMzMzMzsv4sCAABCAAAAAAAAAA==",
+ "Title": "SelectDeleteBar.cs [\u8BBE\u8BA1]",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
+ "RelativeDocumentMoniker": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs [\u8BBE\u8BA1]",
+ "RelativeToolTip": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs [\u8BBE\u8BA1]",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-17T08:34:17.565Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 4,
- "Title": "Frm_MesQaItemsDetect01.cs [\u8BBE\u8BA1]",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQaItemsDetect01.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQaItemsDetect01.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQaItemsDetect01.cs [\u8BBE\u8BA1]",
- "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQaItemsDetect01.cs [\u8BBE\u8BA1]",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-17T08:34:11.684Z",
+ "WhenOpened": "2025-07-23T06:57:22.853Z",
"EditorCaption": " [\u8BBE\u8BA1]"
}
]
@@ -154,6 +54,10 @@
{
"$type": "Bookmark",
"Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c64b9c2-e352-428e-a56d-0ace190b99a6}"
}
]
},
--
Gitblit v1.9.3