From eb242586da065e5f8cfc39d8b3d6cc2481e4da88 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期六, 19 七月 2025 09:19:13 +0800
Subject: [PATCH] 1、异常处置单新增选别下拉框、处理意见下拉框、退料类型下拉框 2、检验接收水平新增数值 3、期初条码重打优化
---
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx | 3
DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json | 123 ++++++--
DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db | 0
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | 118 +++++++
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 268 ++++++++++--------
DevApp/.vs/GsDevSolution/v17/DocumentLayout.json | 137 +++++++-
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 2
DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/CodeChunks.db | 0
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs | 9
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeQc.Designer.cs | 28 +
DevApp/Gs.DevApp/Properties/licenses.licx | 35 +-
DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs | 72 ++++
13 files changed, 589 insertions(+), 208 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 efd3252..fa508a3 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 0aaff04..caf0bce 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 53c1c68..77b21f5 100644
--- a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json
+++ b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json
@@ -3,16 +3,32 @@
"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\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\program.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\\jyxm.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\\jyxm.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\\jyxm.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\\jyxm.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\\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}"
}
],
"DocumentGroupContainers": [
@@ -22,44 +38,95 @@
"DocumentGroups": [
{
"DockedWidth": 248,
- "SelectedChildIndex": 0,
+ "SelectedChildIndex": 5,
"Children": [
{
"$type": "Document",
- "DocumentIndex": 0,
- "Title": "Program.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\Program.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\Program.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\Program.cs",
- "RelativeToolTip": "Gs.DevApp\\Program.cs",
- "ViewState": "AgIAACUAAAAAAAAAAAAIwDkAAAAdAAAAAAAAAA==",
+ "DocumentIndex": 5,
+ "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-17T02:05:55.42Z",
+ "WhenOpened": "2025-07-18T08:23:34.817Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 6,
+ "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": 4,
+ "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": 1,
- "Title": "Jyxm.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
- "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
- "ViewState": "AgIAANoCAAAAAAAAAAAQwOcCAAAkAAAAAAAAAA==",
+ "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-17T01:55:59.985Z",
+ "WhenOpened": "2025-07-18T08:57:21.429Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 2,
- "Title": "Jyxm.cs [\u8BBE\u8BA1]",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Jyxm.cs [\u8BBE\u8BA1]",
- "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Jyxm.cs [\u8BBE\u8BA1]",
+ "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-17T01:35:47.579Z",
+ "WhenOpened": "2025-07-18T06:15:21.936Z",
+ "EditorCaption": " [\u8BBE\u8BA1]"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 0,
+ "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==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-17T08:34:17.565Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "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",
"EditorCaption": " [\u8BBE\u8BA1]"
}
]
diff --git a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json
index 53c1c68..2718e33 100644
--- a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json
+++ b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json
@@ -3,16 +3,36 @@
"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\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\program.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_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\\devfrm\\qc\\jyxm.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\\jyxm.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\\jyxm.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\\jyxm.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\\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}"
}
],
"DocumentGroupContainers": [
@@ -27,39 +47,102 @@
{
"$type": "Document",
"DocumentIndex": 0,
- "Title": "Program.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\Program.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\Program.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\Program.cs",
- "RelativeToolTip": "Gs.DevApp\\Program.cs",
- "ViewState": "AgIAACUAAAAAAAAAAAAIwDkAAAAdAAAAAAAAAA==",
+ "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]",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-17T02:05:55.42Z",
+ "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",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
- "Title": "Jyxm.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
- "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
- "ViewState": "AgIAANoCAAAAAAAAAAAQwOcCAAAkAAAAAAAAAA==",
+ "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-17T01:55:59.985Z",
+ "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": "Jyxm.cs [\u8BBE\u8BA1]",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Jyxm.cs [\u8BBE\u8BA1]",
- "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Jyxm.cs [\u8BBE\u8BA1]",
+ "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-17T01:35:47.579Z",
+ "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==",
+ "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",
"EditorCaption": " [\u8BBE\u8BA1]"
}
]
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
index 2eb8c05..9136842 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
@@ -17,95 +17,160 @@
List<FilterEntity> _filterList = new List<FilterEntity>();
public string strType = "";//绫诲埆(鏅�氫俊鎭紝璁よ瘉淇℃伅)
+ /// <summary>
+ /// DefectCode绫荤殑鏋勯�犲嚱鏁�
+ /// </summary>
+ /// <param name="_strType">浼犲叆鐨勭被鍨嬪弬鏁帮紙濡�"QC鍩虹璧勬枡"锛岀敤浜庢爣璇嗘暟鎹被鍒級</param>
public DefectCode(string _strType)
{
+ // 1. 鍒濆鍖栨帶浠跺竷灞�锛堣璁″櫒鑷姩鐢熸垚鐨勬柟娉曪紝璁剧疆鎺т欢浣嶇疆銆佸ぇ灏忕瓑锛�
InitializeComponent();
+ // 灏嗕紶鍏ョ殑绫诲瀷鍙傛暟璧嬪�肩粰绫荤殑鎴愬憳鍙橀噺锛堝悗缁�昏緫涓娇鐢級
strType = _strType;
+
+ // 2. 缁戝畾宸ュ叿鏍忔寜閽簨浠讹紙鍔犺浇銆佹煡璇級
+ // 缁戝畾"鍔犺浇"鎸夐挳鐐瑰嚮浜嬩欢锛氱偣鍑诲悗瑙﹀彂 ToolBarMenu1_btnLoadClick 鏂规硶
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ // 缁戝畾"鏌ヨ"鎸夐挳鐐瑰嚮浜嬩欢锛氱偣鍑诲悗瑙﹀彂 ToolBarMenu1_btnQueryClick 鏂规硶
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+
+ // 3. 閰嶇疆鏍戝舰鍒楄〃锛坱lMenu锛夌殑搴忓彿鍒楁牱寮�
+ // 璁剧疆鏍戝舰鍒楄〃鐨�"搴忓彿鍒�"瀹藉害涓�50鍍忕礌
tlMenu.IndicatorWidth = 50;
+ // 缁戝畾"鑷畾涔夌粯鍒跺簭鍙峰垪"浜嬩欢锛氳嚜瀹氫箟搴忓彿鏄剧ず閫昏緫
tlMenu.CustomDrawNodeIndicator += (s, ee) =>
{
+ // 鍒ゆ柇褰撳墠缁樺埗鐨勬槸"搴忓彿鍒�"
if (ee.IsNodeIndicator)
{
+ // 鑾峰彇褰撳墠鑺傜偣鍦ㄥ彲瑙佸垪琛ㄤ腑鐨勭储寮曪紙浠�0寮�濮嬶級
var index = ee.Node.TreeList.GetVisibleIndexByNode(ee.Node);
+ // 搴忓彿鏄剧ず涓�"绱㈠紩+1"锛堜粠1寮�濮嬭鏁帮級
ee.Info.DisplayText = (index + 1).ToString();
}
};
+
+
+ // 4. 鍒濆鍔犺浇绗竴椤垫暟鎹�
getPageList(1);
+
+
+ // 5. 缁戝畾鏍戝舰鍒楄〃榧犳爣鐐瑰嚮浜嬩欢锛堝悗缁彲鍦� TlMenu_MouseDown 涓鐞嗙偣鍑婚�昏緫锛�
this.tlMenu.MouseDown += TlMenu_MouseDown;
+
+
+ // 6. 缁戝畾"娣诲姞瀛愯妭鐐�"鑿滃崟鎸夐挳浜嬩欢锛堝彸閿彍鍗曟垨宸ュ叿鏍忔寜閽級
this.toolStripMenuItemAdd.Click += (s, ee) =>
{
+ // 鍒濆鍖栬妭鐐笽D锛堟柊澧炶妭鐐规殏鏈敓鎴怚D锛屼负绌猴級
string strGuid = "";
+ // 鐖惰妭鐐笽D锛氬鏋滈�変腑浜嗘煇涓妭鐐癸紝鍒欎互璇ヨ妭鐐逛负鐖惰妭鐐癸紱鍚﹀垯鐖惰妭鐐逛负绌猴紙椤剁骇鑺傜偣锛�
string strUpGuid = "";
if (tlMenu.FocusedNode != null)
{
+ // 鑾峰彇閫変腑鑺傜偣鐨�"guid"瀛楁鍊硷紝浣滀负鏂拌妭鐐圭殑鐖禝D
strUpGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
}
- Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid,strType);
+
+ // 鎵撳紑鏂板鑺傜偣鐨勫脊绐楋紙鍙傛暟锛氳妭鐐笽D銆佺埗鑺傜偣ID銆佹暟鎹被鍨嬶級
+ Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid, strType);
+ // 缁戝畾寮圭獥鐨�"鏇存柊鐖舵帶浠�"浜嬩欢锛氬脊绐楀叧闂悗鍒锋柊褰撳墠椤甸潰鏁版嵁
frm.UpdateParent += (s2, ee2) =>
{
- getPageList(1);
+ getPageList(1); // 閲嶆柊鍔犺浇绗竴椤垫暟鎹�
};
+ // 浠ユā鎬佺獥鍙ｆ樉绀哄脊绐楋紙闃诲褰撳墠鐣岄潰锛岀洿鍒板脊绐楀叧闂級
frm.ShowDialog();
};
+
+
+ // 7. 缁戝畾"娣诲姞鏍硅妭鐐�"鑿滃崟鎸夐挳浜嬩欢
this.toolStripMenuItemRoot.Click += (s, ee) =>
{
+ // 鏂板鏍硅妭鐐癸細鑺傜偣ID鍜岀埗鑺傜偣ID鍧囦负绌猴紙鏃犵埗鑺傜偣锛�
string strGuid = "";
string strUpGuid = "";
+ // 鎵撳紑鏂板寮圭獥锛堟槑纭坊鍔犳牴鑺傜偣锛岀埗ID涓虹┖锛�
Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid, strType);
+ // 寮圭獥鍏抽棴鍚庡埛鏂版暟鎹�
frm.UpdateParent += (s2, ee2) =>
{
getPageList(1);
};
frm.ShowDialog();
};
+
+
+ // 8. 缁戝畾"鍒犻櫎鑺傜偣"鑿滃崟鎸夐挳浜嬩欢
this.toolStripMenuItemDel.Click += (s, ee) =>
{
+ // 鍒ゆ柇鏄惁閫変腑浜嗚妭鐐癸紙鏈�変腑鍒欐彁绀猴級
if (tlMenu.FocusedNode != null)
{
+ // 鑾峰彇閫変腑鑺傜偣鐨処D鍜屽悕绉帮紙鐢ㄤ簬鍒犻櫎纭锛�
string rowGuid = "";
string rowName = "";
rowGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
rowName = tlMenu.FocusedNode.GetValue("defectName").ToString();
+
+ // 鑺傜偣ID涓虹┖鏃舵彁绀猴紙寮傚父鎯呭喌澶勭悊锛�
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
+
+ // 寮瑰嚭纭妗嗭細鎻愮ず鐢ㄦ埛鏄惁鍒犻櫎閫変腑鐨勮妭鐐�
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
- return;
+ return; // 鐢ㄦ埛鍙栨秷鍒犻櫎锛岀洿鎺ヨ繑鍥�
+
+ // 鍑嗗鍒犻櫎鍙傛暟锛氬皢鑺傜偣ID瀛樺叆鍒楄〃锛堥�傞厤鎺ュ彛鍙傛暟鏍煎紡锛�
List<dynamic> lst = new List<dynamic>();
lst.Add(rowGuid);
var _obj = lst;
+
try
{
+ // 璋冪敤WebService鎺ュ彛鍒犻櫎鑺傜偣锛圥OST璇锋眰锛屼紶鍏ヨ妭鐐笽D鍒楄〃锛�
string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
+ // 瑙ｆ瀽鎺ュ彛杩斿洖缁撴灉
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+
+ // 鎺ュ彛杩斿洖鎴愬姛锛坮tnCode>0锛夛細浠庢爲褰㈠垪琛ㄤ腑绉婚櫎璇ヨ妭鐐�
if (_rtn.rtnCode > 0)
{
tlMenu.DeleteNode(tlMenu.FocusedNode);
}
+ // 鎺ュ彛杩斿洖澶辫触锛氭彁绀洪敊璇俊鎭�
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
+ // 鎹曡幏寮傚父锛堝缃戠粶閿欒銆佹帴鍙ｆ姤閿欙級骞舵彁绀�
catch (Exception ex)
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
};
+
+
+ // 9. 缁戝畾"缂栬緫鑺傜偣"鑿滃崟鎸夐挳浜嬩欢
this.toolStripMenuItemEdt.Click += (s, ee) =>
{
+ // 鑺傜偣ID锛氶�変腑鑺傜偣鐨処D锛堢敤浜庡洖鏄炬暟鎹級
string strGuid = "";
+ // 鐖惰妭鐐笽D锛氶�変腑鑺傜偣鐨勭埗ID锛堢紪杈戞椂淇濇寔鐖惰妭鐐逛笉鍙橈級
string strUpGuid = "";
if (tlMenu.FocusedNode != null)
{
strGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
strUpGuid = tlMenu.FocusedNode.GetValue("pid").ToString();
}
+
+ // 鎵撳紑缂栬緫寮圭獥锛堝弬鏁帮細鑺傜偣ID銆佺埗鑺傜偣ID銆佹暟鎹被鍨嬶級
Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid, strType);
+ // 寮圭獥鍏抽棴鍚庡埛鏂板綋鍓嶉〉闈㈡暟鎹�
frm.UpdateParent += (s2, ee2) =>
{
getPageList(1);
@@ -113,7 +178,6 @@
frm.ShowDialog();
};
}
-
/// <summary>
/// 鍙抽敭寮瑰嚭鑿滃崟,濡傛灉鏄锛屽鍔犲瓙椤圭洰锛屽惁鍒欏鍔犱富椤�
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeQc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeQc.Designer.cs
index e167501..a487da3 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeQc.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeQc.Designer.cs
@@ -26,31 +26,51 @@
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
+ // 鍒濆鍖栫獥浣撳強鎺т欢鐨勬柟娉曪紙鑷姩鐢熸垚锛岀敤浜庡竷灞�鍜屽睘鎬ц缃級
private void InitializeComponent()
{
+ // 1. 鍒涘缓"缂洪櫡浠ｇ爜"鎺т欢瀹炰緥
+ // DefectCode 鏄嚜瀹氫箟鎺т欢绫诲瀷锛屾瀯閫犲嚱鏁颁紶鍏�"QC鍩虹璧勬枡"锛堝彲鑳戒綔涓烘帶浠舵爣棰樻垨鏁版嵁婧愭爣璇嗭級
this.defectCode1 = new Gs.DevApp.DevFrm.QC.DefectCode("QC鍩虹璧勬枡");
+
+ // 2. 鏆傚仠绐椾綋鐨勫竷灞�閫昏緫
+ // 閬垮厤鍦ㄩ绻佷慨鏀规帶浠跺睘鎬ф椂鍙嶅鍒锋柊鐣岄潰锛屾彁鍗囧垵濮嬪寲鏁堢巼
this.SuspendLayout();
+
//
- // defectCode1
+ // 3. 閰嶇疆 defectCode1 鎺т欢鐨勫睘鎬�
//
+ // 璁剧疆鎺т欢鍋滈潬鏂瑰紡锛氬～鍏呮暣涓埗瀹瑰櫒锛堝嵆褰撳墠绐椾綋锛�
this.defectCode1.Dock = System.Windows.Forms.DockStyle.Fill;
+ // 璁剧疆鎺т欢鍦ㄧ獥浣撲腑鐨勮捣濮嬩綅缃紙宸︿笂瑙掑潗鏍囷細X=0锛孻=0锛�
this.defectCode1.Location = new System.Drawing.Point(0, 0);
+ // 璁剧疆鎺т欢鐨勫悕绉帮紙鐢ㄤ簬鏍囪瘑鎺т欢锛屽彲鍦ㄨ璁″櫒鎴栦唬鐮佷腑寮曠敤锛�
this.defectCode1.Name = "defectCode1";
+ // 璁剧疆鎺т欢鐨勫垵濮嬪ぇ灏忥紙瀹藉害1001鍍忕礌锛岄珮搴�568鍍忕礌锛�
this.defectCode1.Size = new System.Drawing.Size(1001, 568);
+ // 璁剧疆鎺т欢鐨凾ab閿『搴忥紙鎸塗ab閿椂锛屾鎺т欢鏄1涓閫変腑鐨勬帶浠讹紝绱㈠紩浠�0寮�濮嬶級
this.defectCode1.TabIndex = 0;
+
//
- // DefectCodeDic
+ // 4. 閰嶇疆褰撳墠绐椾綋锛圖efectCodeDic锛夌殑灞炴��
//
+ // 璁剧疆绐椾綋鐨勮嚜鍔ㄧ缉鏀惧昂瀵革紙瀛椾綋缂╂斁鍩哄噯锛氬搴�8F锛岄珮搴�18F锛�
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ // 璁剧疆绐椾綋鐨勮嚜鍔ㄧ缉鏀炬ā寮忥細鎸夊瓧浣撳ぇ灏忕缉鏀撅紙褰撶郴缁熷瓧浣撳彉鍖栨椂锛岀獥浣撳拰鎺т欢浼氭寜姣斾緥缂╂斁锛�
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ // 璁剧疆绐椾綋瀹㈡埛鍖虹殑澶у皬锛堜笉鍖呭惈鏍囬鏍忋�佽竟妗嗭紝瀹藉害1001鍍忕礌锛岄珮搴�568鍍忕礌锛�
this.ClientSize = new System.Drawing.Size(1001, 568);
+ // 灏� defectCode1 鎺т欢娣诲姞鍒扮獥浣撶殑鎺т欢闆嗗悎涓紙浣垮叾鏄剧ず鍦ㄧ獥浣撲笂锛�
this.Controls.Add(this.defectCode1);
+ // 璁剧疆绐椾綋鐨勫悕绉帮紙鐢ㄤ簬鏍囪瘑绐椾綋锛屽彲鍦ㄤ唬鐮佷腑寮曠敤锛�
this.Name = "DefectCodeDic";
+ // 璁剧疆绐椾綋鏍囬鏍忔樉绀虹殑鏂囨湰
this.Text = "瀛楀吀-QC淇℃伅";
+
+ // 5. 鎭㈠绐椾綋鐨勫竷灞�閫昏緫
+ // 搴旂敤鎵�鏈夊睘鎬ц缃苟鍒锋柊鐣岄潰锛屼娇鎺т欢鎸夐厤缃樉绀�
this.ResumeLayout(false);
-
}
-
#endregion
private DefectCode defectCode1;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index d7decc4..704e359 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -54,6 +54,8 @@
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
btnIpt.Click += BtnIpt_Click;
btnYcReport.Click += BtnYcReport_Click;
+
+
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 7535089..ffdbd65 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -741,7 +741,7 @@
,"2.50---(AQL_0_250)"
,"4.00---(AQL_0_400)"
,"6.50---(AQL_0_650)"
- ,"10.00---(AQL_0_1000)"
+ ,"10.00---(AQL_1_000)"
});
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
index d615d8d..993cd4d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -109,21 +109,29 @@
this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
+ this.repositoryItemLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+ this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
+ this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -172,6 +180,9 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit();
@@ -180,9 +191,13 @@
((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -862,7 +877,12 @@
this.repositoryItemDateEdit2,
this.repositoryItemButtonEdit1,
this.rptJYBZ,
- this.repositoryItemDateEdit3});
+ this.repositoryItemDateEdit3,
+ this.repositoryItemLookUpEdit1,
+ this.repositoryItemComboBox1,
+ this.repositoryItemSearchLookUpEdit1,
+ this.repositoryItemComboBox2,
+ this.repositoryItemComboBox3});
this.gcMx1.Size = new System.Drawing.Size(983, 279);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -889,7 +909,8 @@
this.gridColumn16,
this.gridColumn20,
this.gridColumn21,
- this.gridColumn22});
+ this.gridColumn22,
+ this.gridColumn23});
this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -1004,6 +1025,7 @@
//
this.gvMx1reporttime.AppearanceCell.Options.UseFont = true;
this.gvMx1reporttime.Caption = "閫夊埆绫诲瀷";
+ this.gvMx1reporttime.ColumnEdit = this.repositoryItemComboBox2;
this.gvMx1reporttime.FieldName = "chooseType";
this.gvMx1reporttime.MinWidth = 44;
this.gvMx1reporttime.Name = "gvMx1reporttime";
@@ -1012,6 +1034,16 @@
this.gvMx1reporttime.VisibleIndex = 7;
this.gvMx1reporttime.Width = 89;
//
+ // 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[] {
+ "閫夊埆绫诲埆1",
+ "閫夊埆绫诲埆2"});
+ this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
+ //
// gridColumn14
//
this.gridColumn14.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
@@ -1019,12 +1051,27 @@
this.gridColumn14.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gridColumn14.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn14.Caption = "澶勭疆鎰忚";
+ this.gridColumn14.ColumnEdit = this.repositoryItemComboBox1;
this.gridColumn14.FieldName = "handResult";
this.gridColumn14.MinWidth = 22;
this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.None, "handResult", "", "1"),
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.None, "handResult", "", "2")});
+ this.gridColumn14.Tag = "edit";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 8;
this.gridColumn14.Width = 82;
+ //
+ // 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[] {
+ "閫�璐�",
+ "鐗归噰鐩存帴浣跨敤"});
+ this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
//
// gridColumn15
//
@@ -1033,7 +1080,7 @@
this.gridColumn15.MinWidth = 22;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 9;
+ this.gridColumn15.VisibleIndex = 10;
this.gridColumn15.Width = 82;
//
// gridColumn16
@@ -1043,7 +1090,7 @@
this.gridColumn16.MinWidth = 22;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 10;
+ this.gridColumn16.VisibleIndex = 11;
this.gridColumn16.Width = 82;
//
// gridColumn20
@@ -1053,7 +1100,7 @@
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Tag = "";
this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 11;
+ this.gridColumn20.VisibleIndex = 12;
this.gridColumn20.Width = 66;
//
// gridColumn21
@@ -1063,7 +1110,7 @@
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Tag = "edit";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 12;
+ this.gridColumn21.VisibleIndex = 13;
this.gridColumn21.Width = 66;
//
// gridColumn22
@@ -1073,8 +1120,28 @@
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Tag = "edit";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 13;
+ this.gridColumn22.VisibleIndex = 14;
this.gridColumn22.Width = 66;
+ //
+ // gridColumn23
+ //
+ this.gridColumn23.Caption = "閫�鏂欐柟寮�";
+ this.gridColumn23.ColumnEdit = this.repositoryItemComboBox3;
+ this.gridColumn23.FieldName = "process";
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Tag = "edit";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 9;
+ //
+ // 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[] {
+ "閫�鏂欒ˉ鏂�",
+ "閫�鏂欏苟鎵ｆ"});
+ this.repositoryItemComboBox3.Name = "repositoryItemComboBox3";
//
// repositoryItemDateEdit1
//
@@ -1121,6 +1188,28 @@
this.repositoryItemDateEdit3.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3";
+ //
+ // repositoryItemLookUpEdit1
+ //
+ this.repositoryItemLookUpEdit1.AutoHeight = false;
+ this.repositoryItemLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemLookUpEdit1.Name = "repositoryItemLookUpEdit1";
+ //
+ // repositoryItemSearchLookUpEdit1
+ //
+ this.repositoryItemSearchLookUpEdit1.AutoHeight = false;
+ this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";
+ this.repositoryItemSearchLookUpEdit1.PopupView = this.repositoryItemSearchLookUpEdit1View;
+ //
+ // repositoryItemSearchLookUpEdit1View
+ //
+ this.repositoryItemSearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+ this.repositoryItemSearchLookUpEdit1View.Name = "repositoryItemSearchLookUpEdit1View";
+ this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+ this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
//
// picCheckBox
//
@@ -1206,6 +1295,9 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit();
@@ -1214,9 +1306,13 @@
((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
this.ResumeLayout(false);
}
@@ -1302,5 +1398,13 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEdit1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
+ private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View;
+ private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
index d8b600b..ddf3ed8 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
@@ -6,8 +6,10 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Diagnostics;
using System.Threading.Tasks;
using System.Windows.Forms;
+
namespace Gs.DevApp.DevFrm.QC
{
@@ -51,7 +53,10 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+
+
+
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -253,6 +258,10 @@
BatchQty = (row["batchQty"].ToString()), // 鎵规鏁伴噺
GfRkqty = (row["gfRkqty"].ToString()), // 鍚堟牸鍏ュ簱鏁伴噺
LfRkqtyz = (row["lfRkqty"].ToString()), // 涓嶅悎鏍煎叆搴撴暟閲�
+ HandResult = (row["handResult"].ToString()), // 閫夊埆绫诲瀷
+ ChooseType = (row["chooseType"].ToString()), // 澶勭悊鎰忚
+ Process = (row["process"].ToString()), // 閫�鏂欐柟寮�
+
});
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx
index 5160e8b..9f852af 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx
@@ -120,4 +120,7 @@
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <metadata name="behaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>93, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
index 6d0a41f..50b4232 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
@@ -164,9 +164,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = "rpt_ItemInv{}";
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(987, 62);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -174,10 +175,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(987, 468);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -186,8 +188,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(985, 442);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -196,6 +199,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -208,17 +212,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.Size = new System.Drawing.Size(985, 442);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain1.Size = new System.Drawing.Size(985, 402);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -233,8 +239,9 @@
this.gv_itemName,
this.gv_itemModel,
this.gv_itemUnit});
+ this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 44;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -244,96 +251,97 @@
//
this.gridColumn4.Caption = "浣跨敤缁勭粐";
this.gridColumn4.FieldName = "fSubsidiary";
- this.gridColumn4.MinWidth = 250;
+ this.gridColumn4.MinWidth = 219;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.Tag = "org.fnumber";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 0;
- this.gridColumn4.Width = 250;
+ this.gridColumn4.Width = 219;
//
// gv_id
//
this.gv_id.AppearanceCell.Options.UseFont = true;
this.gv_id.Caption = "鐗╂枡ID ";
this.gv_id.FieldName = "id";
- this.gv_id.MinWidth = 50;
+ this.gv_id.MinWidth = 44;
this.gv_id.Name = "gv_id";
this.gv_id.OptionsColumn.AllowEdit = false;
this.gv_id.Tag = "query_a.id";
this.gv_id.Visible = true;
this.gv_id.VisibleIndex = 1;
- this.gv_id.Width = 94;
+ this.gv_id.Width = 82;
//
// gv_itemNo
//
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
this.gv_itemNo.FieldName = "itemNo";
- this.gv_itemNo.MinWidth = 120;
+ this.gv_itemNo.MinWidth = 105;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
this.gv_itemNo.VisibleIndex = 2;
- this.gv_itemNo.Width = 120;
+ this.gv_itemNo.Width = 105;
//
// gv_itemName
//
this.gv_itemName.AppearanceCell.Options.UseFont = true;
this.gv_itemName.Caption = "鐗╂枡鍚嶇О";
this.gv_itemName.FieldName = "itemName";
- this.gv_itemName.MinWidth = 150;
+ this.gv_itemName.MinWidth = 131;
this.gv_itemName.Name = "gv_itemName";
this.gv_itemName.OptionsColumn.AllowEdit = false;
this.gv_itemName.Tag = "query_a.item_name";
this.gv_itemName.Visible = true;
this.gv_itemName.VisibleIndex = 3;
- this.gv_itemName.Width = 150;
+ this.gv_itemName.Width = 131;
//
// gv_itemModel
//
this.gv_itemModel.AppearanceCell.Options.UseFont = true;
this.gv_itemModel.Caption = "瑙勬牸鍨嬪彿";
this.gv_itemModel.FieldName = "itemModel";
- this.gv_itemModel.MinWidth = 250;
+ this.gv_itemModel.MinWidth = 219;
this.gv_itemModel.Name = "gv_itemModel";
this.gv_itemModel.OptionsColumn.AllowEdit = false;
this.gv_itemModel.Tag = "query_a.item_model";
this.gv_itemModel.Visible = true;
this.gv_itemModel.VisibleIndex = 4;
- this.gv_itemModel.Width = 250;
+ this.gv_itemModel.Width = 219;
//
// gv_itemUnit
//
this.gv_itemUnit.AppearanceCell.Options.UseFont = true;
this.gv_itemUnit.Caption = "鐗╂枡鍗曚綅";
this.gv_itemUnit.FieldName = "itemUnit";
- this.gv_itemUnit.MinWidth = 50;
+ this.gv_itemUnit.MinWidth = 44;
this.gv_itemUnit.Name = "gv_itemUnit";
this.gv_itemUnit.OptionsColumn.AllowEdit = false;
this.gv_itemUnit.Tag = "query_b.fname";
this.gv_itemUnit.Visible = true;
this.gv_itemUnit.VisibleIndex = 5;
- this.gv_itemUnit.Width = 94;
+ this.gv_itemUnit.Width = 82;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 402);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(985, 30);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(985, 442);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -341,6 +349,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -353,8 +362,8 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 139;
+ this.splitMx1.Size = new System.Drawing.Size(985, 442);
+ this.splitMx1.SplitterPosition = 108;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -376,55 +385,60 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem12});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(471, 509, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 139);
+ this.layoutMx1.Size = new System.Drawing.Size(985, 108);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(825, 108);
+ this.lbGuid.Location = new System.Drawing.Point(722, 84);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(268, 28);
+ this.lbGuid.Size = new System.Drawing.Size(234, 22);
this.lbGuid.TabIndex = 275;
this.lbGuid.Text = "lbGuid";
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(666, 71);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(567, 58);
+ this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_psnQty_1.Name = "txt_psnQty_1";
- this.txt_psnQty_1.Size = new System.Drawing.Size(170, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(151, 20);
this.txt_psnQty_1.StyleController = this.layoutMx1;
this.txt_psnQty_1.TabIndex = 273;
this.txt_psnQty_1.Tag = "readOnly-1";
//
// ucBtnPrint1
//
+ this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(563, 99);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(484, 80);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(274, 30);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(235, 24);
this.ucBtnPrint1.TabIndex = 266;
//
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(666, 41);
+ this.txt_iCount_1.Location = new System.Drawing.Point(567, 34);
+ this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_iCount_1.Name = "txt_iCount_1";
- this.txt_iCount_1.Size = new System.Drawing.Size(170, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(151, 20);
this.txt_iCount_1.StyleController = this.layoutMx1;
this.txt_iCount_1.TabIndex = 272;
this.txt_iCount_1.Tag = "readOnly-1";
//
// txt_fSubsidiary
//
- this.txt_fSubsidiary.Location = new System.Drawing.Point(114, 12);
+ this.txt_fSubsidiary.Location = new System.Drawing.Point(93, 10);
+ this.txt_fSubsidiary.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_fSubsidiary.Name = "txt_fSubsidiary";
this.txt_fSubsidiary.Properties.Appearance.Options.UseFont = true;
- this.txt_fSubsidiary.Size = new System.Drawing.Size(170, 24);
+ this.txt_fSubsidiary.Size = new System.Drawing.Size(151, 20);
this.txt_fSubsidiary.StyleController = this.layoutMx1;
this.txt_fSubsidiary.TabIndex = 270;
this.txt_fSubsidiary.Tag = "";
@@ -432,78 +446,85 @@
// txt_suppNo_1
//
this.txt_suppNo_1.IsReadly = false;
- this.txt_suppNo_1.Location = new System.Drawing.Point(666, 12);
+ this.txt_suppNo_1.Location = new System.Drawing.Point(567, 10);
this.txt_suppNo_1.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppNo_1.Name = "txt_suppNo_1";
- this.txt_suppNo_1.Size = new System.Drawing.Size(170, 24);
+ this.txt_suppNo_1.Size = new System.Drawing.Size(151, 20);
this.txt_suppNo_1.TabIndex = 264;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(114, 41);
+ this.txt_itemNo.Location = new System.Drawing.Point(93, 34);
+ this.txt_itemNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(151, 20);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 217;
this.txt_itemNo.Tag = "";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(114, 71);
+ this.txt_itemName.Location = new System.Drawing.Point(93, 58);
+ this.txt_itemName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(170, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(151, 20);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 219;
this.txt_itemName.Tag = "";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(114, 101);
+ this.txt_itemModel.Location = new System.Drawing.Point(93, 82);
+ this.txt_itemModel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(446, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(388, 20);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 226;
this.txt_itemModel.Tag = "";
//
// txt_suppId
//
- this.txt_suppId.Location = new System.Drawing.Point(390, 12);
+ this.txt_suppId.Location = new System.Drawing.Point(330, 10);
+ this.txt_suppId.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_suppId.Name = "txt_suppId";
this.txt_suppId.Properties.Appearance.Options.UseFont = true;
- this.txt_suppId.Size = new System.Drawing.Size(170, 24);
+ this.txt_suppId.Size = new System.Drawing.Size(151, 20);
this.txt_suppId.StyleController = this.layoutMx1;
this.txt_suppId.TabIndex = 256;
this.txt_suppId.Tag = "";
//
// txt_createDate1
//
- this.txt_createDate1.Location = new System.Drawing.Point(390, 41);
+ this.txt_createDate1.Location = new System.Drawing.Point(330, 34);
+ this.txt_createDate1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_createDate1.Name = "txt_createDate1";
this.txt_createDate1.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate1.Size = new System.Drawing.Size(170, 24);
+ this.txt_createDate1.Size = new System.Drawing.Size(151, 20);
this.txt_createDate1.StyleController = this.layoutMx1;
this.txt_createDate1.TabIndex = 252;
this.txt_createDate1.Tag = "";
//
// txt_itemUnit
//
- this.txt_itemUnit.Location = new System.Drawing.Point(390, 71);
+ this.txt_itemUnit.Location = new System.Drawing.Point(330, 58);
+ this.txt_itemUnit.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_itemUnit.Name = "txt_itemUnit";
this.txt_itemUnit.Properties.Appearance.Options.UseFont = true;
- this.txt_itemUnit.Size = new System.Drawing.Size(170, 24);
+ this.txt_itemUnit.Size = new System.Drawing.Size(151, 20);
this.txt_itemUnit.StyleController = this.layoutMx1;
this.txt_itemUnit.TabIndex = 231;
this.txt_itemUnit.Tag = "";
//
// txt_tc_1
//
- this.txt_tc_1.Location = new System.Drawing.Point(840, 12);
+ this.txt_tc_1.Location = new System.Drawing.Point(722, 10);
+ this.txt_tc_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_tc_1.Name = "txt_tc_1";
this.txt_tc_1.Properties.Caption = "鐗归噰鏍囪瘑";
- this.txt_tc_1.Size = new System.Drawing.Size(274, 24);
+ this.txt_tc_1.Size = new System.Drawing.Size(235, 20);
this.txt_tc_1.StyleController = this.layoutMx1;
this.txt_tc_1.TabIndex = 276;
//
@@ -564,7 +585,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1126, 139);
+ this.Root.Size = new System.Drawing.Size(968, 112);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -572,115 +593,115 @@
this.layoutControlItem1.Control = this.txt_fSubsidiary;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem1.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem1.Text = "浣跨敤缁勭粐";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_itemNo;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 29);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 24);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem2.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem2.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_itemName;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 59);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 48);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem3.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem3.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_itemModel;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 89);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 72);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(552, 30);
+ this.layoutControlItem4.Size = new System.Drawing.Size(474, 24);
this.layoutControlItem4.Text = "瑙勬牸鍨嬪彿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_suppId;
- this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(237, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem5.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鍙�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_createDate1;
- this.layoutControlItem6.Location = new System.Drawing.Point(276, 29);
+ this.layoutControlItem6.Location = new System.Drawing.Point(237, 24);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem6.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem6.Text = "鍏ュ簱鏃堕棿";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_itemUnit;
- this.layoutControlItem7.Location = new System.Drawing.Point(276, 59);
+ this.layoutControlItem7.Location = new System.Drawing.Point(237, 48);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem7.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem7.Text = "鐗╂枡鍗曚綅";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_suppNo_1;
- this.layoutControlItem8.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(474, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem8.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem8.Text = "鍏堥�夋嫨渚涘簲鍟�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_iCount_1;
- this.layoutControlItem9.Location = new System.Drawing.Point(552, 29);
+ this.layoutControlItem9.Location = new System.Drawing.Point(474, 24);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem9.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem9.Text = "鎵撳嵃鏉＄爜寮犳暟";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_psnQty_1;
- this.layoutControlItem10.Location = new System.Drawing.Point(552, 59);
+ this.layoutControlItem10.Location = new System.Drawing.Point(474, 48);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem10.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem10.Text = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.ucBtnPrint1;
- this.layoutControlItem11.Location = new System.Drawing.Point(552, 89);
- this.layoutControlItem11.MinSize = new System.Drawing.Size(1, 5);
+ this.layoutControlItem11.Location = new System.Drawing.Point(474, 72);
+ this.layoutControlItem11.MinSize = new System.Drawing.Size(1, 4);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem11.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem11.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem11.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem11.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
@@ -689,10 +710,10 @@
// txt_tc_1123
//
this.txt_tc_1123.Control = this.txt_tc_1;
- this.txt_tc_1123.Location = new System.Drawing.Point(828, 0);
+ this.txt_tc_1123.Location = new System.Drawing.Point(711, 0);
this.txt_tc_1123.Name = "txt_tc_1123";
this.txt_tc_1123.OptionsTableLayoutItem.ColumnIndex = 3;
- this.txt_tc_1123.Size = new System.Drawing.Size(278, 29);
+ this.txt_tc_1123.Size = new System.Drawing.Size(239, 24);
this.txt_tc_1123.Text = "鐗归噰鏍囪瘑";
this.txt_tc_1123.TextSize = new System.Drawing.Size(0, 0);
this.txt_tc_1123.TextVisible = false;
@@ -701,9 +722,10 @@
//
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(1126, 419);
+ this.tabMx.Size = new System.Drawing.Size(985, 324);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -711,19 +733,22 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 387);
+ this.tabMxPage1.Size = new System.Drawing.Size(983, 298);
this.tabMxPage1.Text = "鏉＄爜鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.rptChongDa});
- this.gcMx1.Size = new System.Drawing.Size(1124, 387);
+ this.gcMx1.Size = new System.Drawing.Size(983, 298);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -733,7 +758,7 @@
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gvMx1.Appearance.Row.Options.UseFont = true;
- this.gvMx1.ColumnPanelRowHeight = 50;
+ this.gvMx1.ColumnPanelRowHeight = 39;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gridColumn2,
@@ -747,140 +772,142 @@
this.gridColumn6,
this.gridColumn7,
this.gvBtnAlawys});
+ this.gvMx1.CustomizationFormBounds = new System.Drawing.Rectangle(666, 243, 264, 432);
+ this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
this.gvMx1.OptionsView.ShowGroupPanel = false;
+ this.gvMx1.SortInfo.AddRange(new DevExpress.XtraGrid.Columns.GridColumnSortInfo[] {
+ new DevExpress.XtraGrid.Columns.GridColumnSortInfo(this.gvBtnAlawys, DevExpress.Data.ColumnSortOrder.Ascending)});
//
// gvMx1guid
//
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid ";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
+ this.gvMx1guid.MinWidth = 44;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
+ this.gvMx1guid.Width = 82;
//
// gridColumn2
//
this.gridColumn2.Caption = "鍏ュ簱鏍囪";
this.gridColumn2.FieldName = "inChk";
- this.gridColumn2.MaxWidth = 50;
- this.gridColumn2.MinWidth = 50;
+ this.gridColumn2.MaxWidth = 44;
+ this.gridColumn2.MinWidth = 44;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 0;
- this.gridColumn2.Width = 50;
+ this.gridColumn2.Width = 44;
//
// gvMx1itemBarcode
//
this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜 ";
this.gvMx1itemBarcode.FieldName = "itemBarcode";
- this.gvMx1itemBarcode.MinWidth = 50;
+ this.gvMx1itemBarcode.MinWidth = 44;
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
this.gvMx1itemBarcode.VisibleIndex = 1;
- this.gvMx1itemBarcode.Width = 300;
+ this.gvMx1itemBarcode.Width = 262;
//
// gvMx1quantity
//
this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
this.gvMx1quantity.Caption = "鏁伴噺 ";
this.gvMx1quantity.FieldName = "quantity";
- this.gvMx1quantity.MinWidth = 50;
+ this.gvMx1quantity.MinWidth = 44;
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.QUANTITY";
this.gvMx1quantity.Visible = true;
this.gvMx1quantity.VisibleIndex = 2;
- this.gvMx1quantity.Width = 94;
+ this.gvMx1quantity.Width = 82;
//
// gvMx1trLotno
//
this.gvMx1trLotno.AppearanceCell.Options.UseFont = true;
this.gvMx1trLotno.Caption = "渚涘簲鍟�";
this.gvMx1trLotno.FieldName = "suppID";
- this.gvMx1trLotno.MinWidth = 50;
+ this.gvMx1trLotno.MinWidth = 44;
this.gvMx1trLotno.Name = "gvMx1trLotno";
this.gvMx1trLotno.Tag = "query_a.TR_LOTNO";
this.gvMx1trLotno.Visible = true;
this.gvMx1trLotno.VisibleIndex = 3;
- this.gvMx1trLotno.Width = 150;
+ this.gvMx1trLotno.Width = 131;
//
// gvMx1createBy
//
this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
this.gvMx1createBy.Caption = "鍒涘缓浜� ";
this.gvMx1createBy.FieldName = "createBy";
- this.gvMx1createBy.MinWidth = 50;
+ this.gvMx1createBy.MinWidth = 44;
this.gvMx1createBy.Name = "gvMx1createBy";
this.gvMx1createBy.Tag = "query_a.CREATE_BY";
this.gvMx1createBy.Visible = true;
this.gvMx1createBy.VisibleIndex = 4;
- this.gvMx1createBy.Width = 94;
+ this.gvMx1createBy.Width = 82;
//
// gridColumn5
//
this.gridColumn5.Caption = "寤虹珛鏃ユ湡";
this.gridColumn5.FieldName = "createDate";
- this.gridColumn5.MinWidth = 50;
+ this.gridColumn5.MinWidth = 44;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 5;
- this.gridColumn5.Width = 180;
+ this.gridColumn5.Width = 157;
//
// gridColumn3
//
this.gridColumn3.Caption = "鍏ヤ粨鍚嶇О";
this.gridColumn3.FieldName = "depotName";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 22;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 6;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 82;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍏ヤ粨搴撲綅";
this.gridColumn1.FieldName = "depotSectionsCode";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 22;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 7;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 82;
//
// gridColumn6
//
this.gridColumn6.Caption = "鍏ュ簱浜�";
this.gridColumn6.FieldName = "rkUser";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 22;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 8;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 82;
//
// gridColumn7
//
this.gridColumn7.Caption = "鍏ュ簱鏃堕棿";
this.gridColumn7.FieldName = "rkDate";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 22;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 9;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 82;
//
// gvBtnAlawys
//
this.gvBtnAlawys.Caption = "閲嶆墦";
this.gvBtnAlawys.ColumnEdit = this.rptChongDa;
- this.gvBtnAlawys.MinWidth = 25;
+ this.gvBtnAlawys.MinWidth = 22;
this.gvBtnAlawys.Name = "gvBtnAlawys";
- this.gvBtnAlawys.Visible = true;
- this.gvBtnAlawys.VisibleIndex = 10;
- this.gvBtnAlawys.Width = 94;
+ this.gvBtnAlawys.Width = 82;
//
// rptChongDa
//
@@ -895,11 +922,12 @@
//
// Frm_InitialBarcode
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(987, 530);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "Frm_InitialBarcode";
this.Text = "鏈熷垵鏉＄爜鎵撳嵃";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
diff --git a/DevApp/Gs.DevApp/Properties/licenses.licx b/DevApp/Gs.DevApp/Properties/licenses.licx
index 535e318..e6eb2d1 100644
--- a/DevApp/Gs.DevApp/Properties/licenses.licx
+++ b/DevApp/Gs.DevApp/Properties/licenses.licx
@@ -1,23 +1,24 @@
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--
Gitblit v1.9.3