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.backup.json | 118 ++++++++++++++++++++---------------------------------------
1 files changed, 40 insertions(+), 78 deletions(-)
diff --git a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json
index ed00c70..3fb5836 100644
--- a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json
+++ b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json
@@ -3,28 +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\\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|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\\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|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|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|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|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": [
@@ -33,79 +17,57 @@
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
- "DockedWidth": 200,
+ "DockedWidth": 248,
"SelectedChildIndex": 0,
"Children": [
{
"$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": "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": "AgIAALQAAAAAAAAAAAAYwMQAAAABAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-04T05:39:57.427Z",
+ "WhenOpened": "2025-07-23T06:57:36.465Z",
"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": "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-04T05:41:03.722Z"
+ "WhenOpened": "2025-07-23T06:57:22.853Z",
+ "EditorCaption": " [\u8BBE\u8BA1]"
+ }
+ ]
+ },
+ {
+ "DockedWidth": 79,
+ "SelectedChildIndex": -1,
+ "Children": [
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
},
{
- "$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"
- },
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c64b9c2-e352-428e-a56d-0ace190b99a6}"
+ }
+ ]
+ },
+ {
+ "DockedWidth": 364,
+ "SelectedChildIndex": -1,
+ "Children": [
{
- "$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]",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-04T05:27:07.091Z"
- },
- {
- "$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==",
- "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"
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
}
]
}
--
Gitblit v1.9.3