From 38bf604083cb74ec1405559facb42bb69691644f Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期六, 26 七月 2025 17:44:57 +0800
Subject: [PATCH] 工序维护更新
---
DevApp/.vs/GsDevSolution/v17/fileList.bin | 0
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs | 681 +++++++++++++++++++------------------
DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/CodeChunks.db | 0
DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json | 51 ++
DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db | 0
DevApp/Gs.DevApp/Gs.DevApp.csproj | 18 -
DevApp/Gs.DevApp/App.config | 1
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs | 17
DevApp/.vs/GsDevSolution/v17/DocumentLayout.json | 68 +++
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.resx | 212 ++++++-----
10 files changed, 563 insertions(+), 485 deletions(-)
diff --git a/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/CodeChunks.db b/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/CodeChunks.db
index 6f2ff75..0a8ee5a 100644
--- a/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/CodeChunks.db
+++ b/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/CodeChunks.db
Binary files differ
diff --git a/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db b/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db
index 21b5d58..9ab8afb 100644
--- a/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db
+++ b/DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db
Binary files differ
diff --git a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json
index f7409eb..a14d7db 100644
--- a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json
+++ b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json
@@ -3,15 +3,23 @@
"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\\basicdata\\frm_mesdepot.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\basicdata\\frm_mesdepot.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\\wom\\frm_mesprocgx.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_mesprocgx.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\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
+ "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|E:\\MesSourceCode\\PC_Web\\DevApp\\gs.devapp\\devfrm\\wom\\frm_mesprocgx.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_mesprocgx.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\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
"RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
},
{
- "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\basicdata\\frm_mesdepot.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\\basicdata\\frm_mesdepot.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\basicdata\\frm_mesdepot.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\\basicdata\\frm_mesdepot.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\\basicdata\\frm_mesdepot.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
}
],
@@ -22,37 +30,62 @@
"DocumentGroups": [
{
"DockedWidth": 248,
- "SelectedChildIndex": 1,
+ "SelectedChildIndex": 0,
"Children": [
{
"$type": "Document",
+ "DocumentIndex": 0,
+ "Title": "Frm_MesProcGx.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "RelativeToolTip": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "ViewState": "AgIAACECAAAAAAAAAADgvzYCAAARAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-26T08:19:11.392Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
"DocumentIndex": 1,
+ "Title": "Frm_MesProcGx.cs [\u8BBE\u8BA1]",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs [\u8BBE\u8BA1]",
+ "RelativeToolTip": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs [\u8BBE\u8BA1]",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-26T08:19:05.275Z",
+ "EditorCaption": " [\u8BBE\u8BA1]"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 2,
"Title": "App.config",
"DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\App.config",
"RelativeDocumentMoniker": "Gs.DevApp\\App.config",
"ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\App.config",
"RelativeToolTip": "Gs.DevApp\\App.config",
- "ViewState": "AgIAAB4AAAAAAAAAAADwvygAAAACAAAAAAAAAA==",
+ "ViewState": "AgIAAB4AAAAAAAAAAADwvygAAABBAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|",
"WhenOpened": "2025-07-24T10:31:00.761Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 3,
"Title": "Frm_MesDepot.cs",
"DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
"RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
"ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
"RelativeToolTip": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
- "ViewState": "AgIAAJIBAAAAAAAAAAAowKABAAANAAAAAAAAAA==",
+ "ViewState": "AgIAAG4BAAAAAAAAAAAQwIYBAAA5AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-07-24T07:19:16.496Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 4,
"Title": "Frm_MesDepot.cs [\u8BBE\u8BA1]",
"DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
"RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
diff --git a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json
index f7409eb..442636d 100644
--- a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json
+++ b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json
@@ -3,15 +3,27 @@
"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\\basicdata\\frm_mesdepot.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\basicdata\\frm_mesdepot.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\\wom\\frm_mesprocgx.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_mesprocgx.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\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
+ "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\wom\\frm_mesprocgx.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_mesprocgx.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\\wom\\frm_mesprocgx.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_mesprocgx.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\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
"RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
},
{
- "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\basicdata\\frm_mesdepot.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\\basicdata\\frm_mesdepot.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\basicdata\\frm_mesdepot.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\\basicdata\\frm_mesdepot.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\\basicdata\\frm_mesdepot.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
}
],
@@ -22,37 +34,75 @@
"DocumentGroups": [
{
"DockedWidth": 248,
- "SelectedChildIndex": 1,
+ "SelectedChildIndex": 0,
"Children": [
{
"$type": "Document",
+ "DocumentIndex": 0,
+ "Title": "Frm_MesProcGx.Designer.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.Designer.cs",
+ "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.Designer.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.Designer.cs*",
+ "RelativeToolTip": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.Designer.cs*",
+ "ViewState": "AgIAAKQFAAAAAAAAAAASwLEFAAB5AAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-26T09:26:13.162Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
"DocumentIndex": 1,
+ "Title": "Frm_MesProcGx.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "RelativeToolTip": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "ViewState": "AgIAAAkCAAAAAAAAAAAvwBQCAAA6AAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-26T08:19:11.392Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 2,
+ "Title": "Frm_MesProcGx.cs [\u8BBE\u8BA1]",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs [\u8BBE\u8BA1]",
+ "RelativeToolTip": "Gs.DevApp\\DevFrm\\WOM\\Frm_MesProcGx.cs [\u8BBE\u8BA1]",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-26T08:19:05.275Z",
+ "EditorCaption": " [\u8BBE\u8BA1]"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
"Title": "App.config",
"DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\App.config",
"RelativeDocumentMoniker": "Gs.DevApp\\App.config",
"ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\App.config",
"RelativeToolTip": "Gs.DevApp\\App.config",
- "ViewState": "AgIAAB4AAAAAAAAAAADwvygAAAACAAAAAAAAAA==",
+ "ViewState": "AgIAAB4AAAAAAAAAAADwvygAAABBAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|",
"WhenOpened": "2025-07-24T10:31:00.761Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 4,
"Title": "Frm_MesDepot.cs",
"DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
"RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
"ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
"RelativeToolTip": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
- "ViewState": "AgIAAJIBAAAAAAAAAAAowKABAAANAAAAAAAAAA==",
+ "ViewState": "AgIAAG4BAAAAAAAAAAAQwIYBAAA5AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-07-24T07:19:16.496Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 5,
"Title": "Frm_MesDepot.cs [\u8BBE\u8BA1]",
"DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
"RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
diff --git a/DevApp/.vs/GsDevSolution/v17/fileList.bin b/DevApp/.vs/GsDevSolution/v17/fileList.bin
index 0cdf281..dd48662 100644
--- a/DevApp/.vs/GsDevSolution/v17/fileList.bin
+++ b/DevApp/.vs/GsDevSolution/v17/fileList.bin
Binary files differ
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index b064418..67326f1 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -38,7 +38,6 @@
<appSettings>
<add key="WebApiUrl" value="http://localhost:5263/" />
-
<!--<add key="WebApiUrl" value="http://192.168.1.187:81/" />-->
<!--<add key="WebApiUrl" value="http://192.168.1.187:8081/" />-->
<add key="LogPath" value="logs" />
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs
index b508aa5..945244d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs
@@ -39,7 +39,6 @@
DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesProcGx));
DevExpress.XtraGrid.GridLevelNode gridLevelNode1 = new DevExpress.XtraGrid.GridLevelNode();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -52,6 +51,7 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesProcGx));
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -111,33 +111,9 @@
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
- this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.gcMx2 = new DevExpress.XtraGrid.GridControl();
- this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
- this.repositoryItemComboBox4 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
- this.repositoryItemComboBox5 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
- this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gv_workers = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_hours = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_capacity = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_sCapacity = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lineType = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_changeTime = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
- this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
- this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
- this.rptGx = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
- this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
- this.repositoryItemCheckEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -146,10 +122,34 @@
this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptGx = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+ this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
+ this.repositoryItemCheckEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
+ this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_workers = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_hours = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_capacity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_sCapacity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lineType = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox5 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gv_changeTime = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMxTui = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.repositoryItemComboBox4 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -213,28 +213,28 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
- this.xtraTabPage2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+ this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptGx)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptGx)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
- this.tabMx.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
+ this.xtraTabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -1031,214 +1031,18 @@
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem15.TextVisible = false;
//
- // picCheckBox
+ // tabMx
//
- this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
- this.picCheckBox.Location = new System.Drawing.Point(956, 23);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(88, 39);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 9;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
- //
- // xtraTabPage2
- //
- this.xtraTabPage2.Controls.Add(this.gcMx2);
- this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(611, 363);
- this.xtraTabPage2.Text = "鏍囦骇淇℃伅";
- //
- // gcMx2
- //
- this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- gridLevelNode1.RelationName = "Level1";
- this.gcMx2.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
- gridLevelNode1});
- this.gcMx2.Location = new System.Drawing.Point(0, 0);
- this.gcMx2.MainView = this.gvMx2;
- this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.gcMx2.Name = "gcMx2";
- this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit2,
- this.repositoryItemComboBox3,
- this.repositoryItemComboBox4,
- this.repositoryItemComboBox5});
- this.gcMx2.Size = new System.Drawing.Size(611, 363);
- this.gcMx2.TabIndex = 1;
- this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx2});
- //
- // gridView2
- //
- this.gridView2.GridControl = this.gcMx2;
- this.gridView2.Name = "gridView2";
- //
- // repositoryItemButtonEdit2
- //
- this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
- this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- //
- // repositoryItemComboBox3
- //
- this.repositoryItemComboBox3.AutoHeight = false;
- this.repositoryItemComboBox3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemComboBox3.Items.AddRange(new object[] {
- "Y-鏄�",
- "N-鍚�"});
- this.repositoryItemComboBox3.Name = "repositoryItemComboBox3";
- this.repositoryItemComboBox3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- //
- // repositoryItemComboBox4
- //
- this.repositoryItemComboBox4.AutoHeight = false;
- this.repositoryItemComboBox4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemComboBox4.Items.AddRange(new object[] {
- "绌�",
- "I-鎶曞叆",
- "C-閲囬泦",
- "F-瀹屽伐",
- "E-涓嶈壇",
- "J-妫�楠�"});
- this.repositoryItemComboBox4.Name = "repositoryItemComboBox4";
- this.repositoryItemComboBox4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- //
- // repositoryItemComboBox5
- //
- this.repositoryItemComboBox5.AutoHeight = false;
- this.repositoryItemComboBox5.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemComboBox5.Items.AddRange(new object[] {
- "",
- "鎵嬪伐绾�",
- "鑷姩绾�"});
- this.repositoryItemComboBox5.Name = "repositoryItemComboBox5";
- this.repositoryItemComboBox5.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- //
- // gvMx2
- //
- this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
- this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx2.ColumnPanelRowHeight = 39;
- this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_workers,
- this.gv_hours,
- this.gv_capacity,
- this.gv_sCapacity,
- this.gv_lineType,
- this.gv_changeTime,
- this.gridColumn13,
- this.gridColumn14});
- this.gvMx2.DetailHeight = 272;
- this.gvMx2.GridControl = this.gcMx2;
- this.gvMx2.Name = "gvMx2";
- this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
- this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
- this.gvMx2.OptionsView.ShowGroupPanel = false;
- //
- // gv_workers
- //
- this.gv_workers.AppearanceCell.Options.UseFont = true;
- this.gv_workers.Caption = "鏍囧噯浜烘暟";
- this.gv_workers.FieldName = "workers";
- this.gv_workers.MinWidth = 44;
- this.gv_workers.Name = "gv_workers";
- this.gv_workers.OptionsEditForm.StartNewRow = true;
- this.gv_workers.ShowUnboundExpressionMenu = true;
- this.gv_workers.Tag = "edit";
- this.gv_workers.Width = 113;
- //
- // gv_hours
- //
- this.gv_hours.Caption = "鏍囧噯宸ユ椂锛堝皬鏃讹級";
- this.gv_hours.FieldName = "hours";
- this.gv_hours.MinWidth = 22;
- this.gv_hours.Name = "gv_hours";
- this.gv_hours.Tag = "edit";
- this.gv_hours.Width = 82;
- //
- // gv_capacity
- //
- this.gv_capacity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gv_capacity.AppearanceCell.Options.UseFont = true;
- this.gv_capacity.AppearanceCell.Options.UseForeColor = true;
- this.gv_capacity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gv_capacity.AppearanceHeader.Options.UseForeColor = true;
- this.gv_capacity.Caption = "鍗曞皬鏃朵骇鑳�";
- this.gv_capacity.FieldName = "capacity";
- this.gv_capacity.MinWidth = 44;
- this.gv_capacity.Name = "gv_capacity";
- this.gv_capacity.Tag = "edit";
- this.gv_capacity.Width = 100;
- //
- // gv_sCapacity
- //
- this.gv_sCapacity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gv_sCapacity.AppearanceCell.Options.UseForeColor = true;
- this.gv_sCapacity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gv_sCapacity.AppearanceHeader.Options.UseForeColor = true;
- this.gv_sCapacity.Caption = "鏍囧噯浜ц兘";
- this.gv_sCapacity.FieldName = "sCapacity";
- this.gv_sCapacity.MinWidth = 22;
- this.gv_sCapacity.Name = "gv_sCapacity";
- this.gv_sCapacity.Tag = "edit";
- this.gv_sCapacity.Width = 80;
- //
- // gv_lineType
- //
- this.gv_lineType.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gv_lineType.AppearanceCell.Options.UseFont = true;
- this.gv_lineType.AppearanceCell.Options.UseForeColor = true;
- this.gv_lineType.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gv_lineType.AppearanceHeader.Options.UseForeColor = true;
- this.gv_lineType.Caption = "绾夸綋绫诲埆";
- this.gv_lineType.ColumnEdit = this.repositoryItemComboBox5;
- this.gv_lineType.FieldName = "lineType";
- this.gv_lineType.MinWidth = 131;
- this.gv_lineType.Name = "gv_lineType";
- this.gv_lineType.Tag = "edit";
- this.gv_lineType.Width = 131;
- //
- // gv_changeTime
- //
- this.gv_changeTime.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gv_changeTime.AppearanceCell.Options.UseFont = true;
- this.gv_changeTime.AppearanceCell.Options.UseForeColor = true;
- this.gv_changeTime.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gv_changeTime.AppearanceHeader.Options.UseForeColor = true;
- this.gv_changeTime.Caption = "鎹㈢嚎鏃堕棿";
- this.gv_changeTime.FieldName = "changeTime";
- this.gv_changeTime.MinWidth = 44;
- this.gv_changeTime.Name = "gv_changeTime";
- this.gv_changeTime.Tag = "edit";
- this.gv_changeTime.Width = 78;
- //
- // gridColumn13
- //
- this.gridColumn13.Caption = "绉诲嚭";
- this.gridColumn13.ColumnEdit = this.repositoryItemButtonEdit2;
- this.gridColumn13.MinWidth = 22;
- this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.OptionsColumn.ReadOnly = true;
- this.gridColumn13.Width = 57;
- //
- // gridColumn14
- //
- this.gridColumn14.Caption = "涓婚敭Guid";
- this.gridColumn14.FieldName = "guid";
- this.gridColumn14.MinWidth = 22;
- this.gridColumn14.Name = "gridColumn14";
- this.gridColumn14.Width = 82;
+ this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabMx.Name = "tabMx";
+ this.tabMx.SelectedTabPage = this.tabMxPage1;
+ this.tabMx.Size = new System.Drawing.Size(613, 389);
+ this.tabMx.TabIndex = 4;
+ this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.tabMxPage1,
+ this.xtraTabPage2});
//
// tabMxPage1
//
@@ -1252,9 +1056,9 @@
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- gridLevelNode2.RelationName = "Level1";
+ gridLevelNode1.RelationName = "Level1";
this.gcMx1.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
- gridLevelNode2});
+ gridLevelNode1});
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -1269,67 +1073,8 @@
this.gcMx1.Size = new System.Drawing.Size(611, 363);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx1});
- //
- // gridView3
- //
- this.gridView3.GridControl = this.gcMx1;
- this.gridView3.Name = "gridView3";
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
- this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
- // repositoryItemComboBox1
- //
- this.repositoryItemComboBox1.AutoHeight = false;
- this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemComboBox1.Items.AddRange(new object[] {
- "Y-鏄�",
- "N-鍚�"});
- this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
- this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- //
- // repositoryItemComboBox2
- //
- this.repositoryItemComboBox2.AutoHeight = false;
- this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemComboBox2.Items.AddRange(new object[] {
- "绌�",
- "I-鎶曞叆",
- "C-閲囬泦",
- "F-瀹屽伐",
- "E-涓嶈壇",
- "J-妫�楠�"});
- this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
- this.repositoryItemComboBox2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- //
- // rptGx
- //
- this.rptGx.AutoHeight = false;
- this.rptGx.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.rptGx.Name = "rptGx";
- this.rptGx.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- //
- // repositoryItemCheckEdit1
- //
- this.repositoryItemCheckEdit1.AutoHeight = false;
- this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
- //
- // repositoryItemCheckEdit2
- //
- this.repositoryItemCheckEdit2.AutoHeight = false;
- this.repositoryItemCheckEdit2.Name = "repositoryItemCheckEdit2";
+ this.gvMx1,
+ this.gridView3});
//
// gvMx1
//
@@ -1457,6 +1202,14 @@
this.gvMx1daa004.VisibleIndex = 6;
this.gvMx1daa004.Width = 131;
//
+ // rptGx
+ //
+ this.rptGx.AutoHeight = false;
+ this.rptGx.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptGx.Name = "rptGx";
+ this.rptGx.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
// gvMx1reporttime
//
this.gvMx1reporttime.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
@@ -1485,6 +1238,17 @@
this.gvMxDel.VisibleIndex = 8;
this.gvMxDel.Width = 57;
//
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
// gridColumn3
//
this.gridColumn3.Caption = "涓婚敭Guid";
@@ -1493,18 +1257,257 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Width = 82;
//
- // tabMx
+ // repositoryItemComboBox1
//
- this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 0);
- this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.tabMx.Name = "tabMx";
- this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(613, 389);
- this.tabMx.TabIndex = 4;
- this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.tabMxPage1,
- this.xtraTabPage2});
+ this.repositoryItemComboBox1.AutoHeight = false;
+ this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox1.Items.AddRange(new object[] {
+ "Y-鏄�",
+ "N-鍚�"});
+ this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+ this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // repositoryItemComboBox2
+ //
+ this.repositoryItemComboBox2.AutoHeight = false;
+ this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox2.Items.AddRange(new object[] {
+ "绌�",
+ "I-鎶曞叆",
+ "C-閲囬泦",
+ "F-瀹屽伐",
+ "E-涓嶈壇",
+ "J-妫�楠�"});
+ this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
+ this.repositoryItemComboBox2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // repositoryItemCheckEdit1
+ //
+ this.repositoryItemCheckEdit1.AutoHeight = false;
+ this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
+ //
+ // repositoryItemCheckEdit2
+ //
+ this.repositoryItemCheckEdit2.AutoHeight = false;
+ this.repositoryItemCheckEdit2.Name = "repositoryItemCheckEdit2";
+ //
+ // gridView3
+ //
+ this.gridView3.GridControl = this.gcMx1;
+ this.gridView3.Name = "gridView3";
+ //
+ // xtraTabPage2
+ //
+ this.xtraTabPage2.Controls.Add(this.gcMx2);
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.Size = new System.Drawing.Size(611, 363);
+ this.xtraTabPage2.Text = "鏍囦骇淇℃伅";
+ //
+ // gcMx2
+ //
+ this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ gridLevelNode2.RelationName = "Level1";
+ this.gcMx2.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
+ gridLevelNode2});
+ this.gcMx2.Location = new System.Drawing.Point(0, 0);
+ this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMx2.Name = "gcMx2";
+ this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit2,
+ this.repositoryItemComboBox3,
+ this.repositoryItemComboBox4,
+ this.repositoryItemComboBox5});
+ this.gcMx2.Size = new System.Drawing.Size(611, 363);
+ this.gcMx2.TabIndex = 1;
+ this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx2,
+ this.gridView2});
+ //
+ // gvMx2
+ //
+ this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx2.ColumnPanelRowHeight = 39;
+ this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_workers,
+ this.gv_hours,
+ this.gv_capacity,
+ this.gv_sCapacity,
+ this.gv_lineType,
+ this.gv_changeTime,
+ this.gvMxTui,
+ this.gridColumn14});
+ this.gvMx2.DetailHeight = 272;
+ this.gvMx2.GridControl = this.gcMx2;
+ this.gvMx2.Name = "gvMx2";
+ this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
+ this.gvMx2.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_workers
+ //
+ this.gv_workers.AppearanceCell.Options.UseFont = true;
+ this.gv_workers.Caption = "鏍囧噯浜烘暟";
+ this.gv_workers.FieldName = "workers";
+ this.gv_workers.MinWidth = 44;
+ this.gv_workers.Name = "gv_workers";
+ this.gv_workers.OptionsEditForm.StartNewRow = true;
+ this.gv_workers.ShowUnboundExpressionMenu = true;
+ this.gv_workers.Tag = "edit";
+ this.gv_workers.Width = 113;
+ //
+ // gv_hours
+ //
+ this.gv_hours.Caption = "鏍囧噯宸ユ椂锛堝皬鏃讹級";
+ this.gv_hours.FieldName = "hours";
+ this.gv_hours.MinWidth = 22;
+ this.gv_hours.Name = "gv_hours";
+ this.gv_hours.Tag = "edit";
+ this.gv_hours.Width = 82;
+ //
+ // gv_capacity
+ //
+ this.gv_capacity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gv_capacity.AppearanceCell.Options.UseFont = true;
+ this.gv_capacity.AppearanceCell.Options.UseForeColor = true;
+ this.gv_capacity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gv_capacity.AppearanceHeader.Options.UseForeColor = true;
+ this.gv_capacity.Caption = "鍗曞皬鏃朵骇鑳�";
+ this.gv_capacity.FieldName = "capacity";
+ this.gv_capacity.MinWidth = 44;
+ this.gv_capacity.Name = "gv_capacity";
+ this.gv_capacity.Tag = "edit";
+ this.gv_capacity.Width = 100;
+ //
+ // gv_sCapacity
+ //
+ this.gv_sCapacity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gv_sCapacity.AppearanceCell.Options.UseForeColor = true;
+ this.gv_sCapacity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gv_sCapacity.AppearanceHeader.Options.UseForeColor = true;
+ this.gv_sCapacity.Caption = "鏍囧噯浜ц兘";
+ this.gv_sCapacity.FieldName = "sCapacity";
+ this.gv_sCapacity.MinWidth = 22;
+ this.gv_sCapacity.Name = "gv_sCapacity";
+ this.gv_sCapacity.Tag = "edit";
+ this.gv_sCapacity.Width = 80;
+ //
+ // gv_lineType
+ //
+ this.gv_lineType.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gv_lineType.AppearanceCell.Options.UseFont = true;
+ this.gv_lineType.AppearanceCell.Options.UseForeColor = true;
+ this.gv_lineType.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gv_lineType.AppearanceHeader.Options.UseForeColor = true;
+ this.gv_lineType.Caption = "绾夸綋绫诲埆";
+ this.gv_lineType.ColumnEdit = this.repositoryItemComboBox5;
+ this.gv_lineType.FieldName = "lineType";
+ this.gv_lineType.MinWidth = 131;
+ this.gv_lineType.Name = "gv_lineType";
+ this.gv_lineType.Tag = "edit";
+ this.gv_lineType.Width = 131;
+ //
+ // repositoryItemComboBox5
+ //
+ this.repositoryItemComboBox5.AutoHeight = false;
+ this.repositoryItemComboBox5.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox5.Items.AddRange(new object[] {
+ "",
+ "鎵嬪伐绾�",
+ "鑷姩绾�"});
+ this.repositoryItemComboBox5.Name = "repositoryItemComboBox5";
+ this.repositoryItemComboBox5.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // gv_changeTime
+ //
+ this.gv_changeTime.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gv_changeTime.AppearanceCell.Options.UseFont = true;
+ this.gv_changeTime.AppearanceCell.Options.UseForeColor = true;
+ this.gv_changeTime.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gv_changeTime.AppearanceHeader.Options.UseForeColor = true;
+ this.gv_changeTime.Caption = "鎹㈢嚎鏃堕棿";
+ this.gv_changeTime.FieldName = "changeTime";
+ this.gv_changeTime.MinWidth = 44;
+ this.gv_changeTime.Name = "gv_changeTime";
+ this.gv_changeTime.Tag = "edit";
+ this.gv_changeTime.Width = 78;
+ //
+ // gvMxTui
+ //
+ this.gvMxTui.Caption = "绉诲嚭";
+ this.gvMxTui.ColumnEdit = this.repositoryItemButtonEdit2;
+ this.gvMxTui.MinWidth = 22;
+ this.gvMxTui.Name = "gvMxTui";
+ this.gvMxTui.OptionsColumn.ReadOnly = true;
+ this.gvMxTui.Width = 57;
+ //
+ // repositoryItemButtonEdit2
+ //
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+ this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "涓婚敭Guid";
+ this.gridColumn14.FieldName = "guid";
+ this.gridColumn14.MinWidth = 22;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Width = 82;
+ //
+ // repositoryItemComboBox3
+ //
+ this.repositoryItemComboBox3.AutoHeight = false;
+ this.repositoryItemComboBox3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox3.Items.AddRange(new object[] {
+ "Y-鏄�",
+ "N-鍚�"});
+ this.repositoryItemComboBox3.Name = "repositoryItemComboBox3";
+ this.repositoryItemComboBox3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // repositoryItemComboBox4
+ //
+ this.repositoryItemComboBox4.AutoHeight = false;
+ this.repositoryItemComboBox4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox4.Items.AddRange(new object[] {
+ "绌�",
+ "I-鎶曞叆",
+ "C-閲囬泦",
+ "F-瀹屽伐",
+ "E-涓嶈壇",
+ "J-妫�楠�"});
+ this.repositoryItemComboBox4.Name = "repositoryItemComboBox4";
+ this.repositoryItemComboBox4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // gridView2
+ //
+ this.gridView2.GridControl = this.gcMx2;
+ this.gridView2.Name = "gridView2";
+ //
+ // picCheckBox
+ //
+ this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
+ this.picCheckBox.Location = new System.Drawing.Point(956, 23);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(88, 39);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 9;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
//
// Frm_MesProcGx
//
@@ -1580,28 +1583,28 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
- this.xtraTabPage2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+ this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptGx)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptGx)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
- this.tabMx.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
+ this.xtraTabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
this.ResumeLayout(false);
}
@@ -1678,7 +1681,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_lineType;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox5;
private DevExpress.XtraGrid.Columns.GridColumn gv_changeTime;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMxTui;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs
index 83c180e..95b3dda 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs
@@ -1,6 +1,4 @@
-锘�
-using Gs.DevApp.DevFrm.QC;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -42,6 +40,7 @@
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
@@ -242,6 +241,7 @@
{
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
this.btnCopy.Enabled = true;
}
@@ -366,9 +366,8 @@
gvList.Add(gvMx1);
gvList.Add(gvMx2);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
-
toolBarMenu1.currentAction = "";
- //Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
}
catch (Exception ex)
@@ -584,10 +583,10 @@
if (e.Button.Index == 0)
{
var dr = gvMx2.GetDataRow(rowhandle);
- var mxGuid = dr["guid"].ToString();
+ var mxGuid2 = dr["guid"].ToString();
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
return;
- if (string.IsNullOrEmpty(mxGuid))
+ if (string.IsNullOrEmpty(mxGuid2))
{
gvMx2.DeleteRow(rowhandle);
return;
@@ -595,7 +594,7 @@
var _obj = new
{
guid = lbGuid.Text.Trim(),//杩欐槸浜у搧鐨刧uid
- mxGuid = mxGuid,
+ mxGuid2 = mxGuid2,
};
try
{
@@ -605,7 +604,7 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+ getModel(lbGuid.Text);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.resx b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.resx
index 3b4a37e..ed419c0 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.resx
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.resx
@@ -120,106 +120,118 @@
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="picCheckBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- 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
+ 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
+ 2OyW1yHZAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="behaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 5cf3c41..550312a 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -964,12 +964,6 @@
<Compile Include="UserControl\SelectDeleteBar.Designer.cs">
<DependentUpon>SelectDeleteBar.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\SelectKw.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="UserControl\SelectKw.Designer.cs">
- <DependentUpon>SelectKw.cs</DependentUpon>
- </Compile>
<Compile Include="UserControl\UcDictionaryComBox.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -1243,12 +1237,6 @@
</Compile>
<Compile Include="UserControl\UcLookItems.Designer.cs">
<DependentUpon>UcLookItems.cs</DependentUpon>
- </Compile>
- <Compile Include="UserControl\UcLookKw.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="UserControl\UcLookKw.Designer.cs">
- <DependentUpon>UcLookKw.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcLookOrg.cs">
<SubType>UserControl</SubType>
@@ -1708,9 +1696,6 @@
<EmbeddedResource Include="UserControl\SelectDeleteBar.resx">
<DependentUpon>SelectDeleteBar.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\SelectKw.resx">
- <DependentUpon>SelectKw.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcDictionaryComBox.resx">
<DependentUpon>UcDictionaryComBox.cs</DependentUpon>
</EmbeddedResource>
@@ -1845,9 +1830,6 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookItems.resx">
<DependentUpon>UcLookItems.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="UserControl\UcLookKw.resx">
- <DependentUpon>UcLookKw.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookOrg.resx">
<DependentUpon>UcLookOrg.cs</DependentUpon>
--
Gitblit v1.9.3