From 071a7633ba3ed439a20b122b8695744678e2b0ff Mon Sep 17 00:00:00 2001 From: kyy <3283105747@qq.com> Date: 星期四, 17 七月 2025 08:37:43 +0800 Subject: [PATCH] 采购到货新增字段仓管员、仓库编码、仓库名称、本次收量、到货条码打印新增字段仓管员、仓库编码、仓库名称 --- DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/CodeChunks.db | 0 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 37 ++ DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json | 230 +++--------------- DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db | 0 DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | 75 ++++- DevApp/Gs.DevApp/App.config | 5 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 71 ++++- DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 55 ++- DevApp/.vs/GsDevSolution/v17/DocumentLayout.json | 226 +++--------------- 9 files changed, 263 insertions(+), 436 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 6534cef..9880eff 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 82332ea..fece605 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 2d3c5e2..620f45f 100644 --- a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json +++ b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json @@ -3,56 +3,20 @@ "WorkspaceRootPath": "E:\\MesSourceCode\\PC_Web\\DevApp\\", "Documents": [ { + "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\warehouse\\frm_arrivalbarcode.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", + "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\warehouse\\frm_arrivalbarcode.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" + }, + { + "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\warehouse\\frm_arrivalbarcode.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\warehouse\\frm_arrivalbarcode.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\rk\\frm_mesinvitemarn.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\\rk\\frm_mesinvitemarn.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\\rk\\frm_mesinvitemarn.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\rk\\frm_mesinvitemarn.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\\ck\\frm_mescgthsq.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\\ck\\frm_mescgthsq.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\\rk\\frm_mesitemtbl.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\\rk\\frm_mesitemtbl.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_mesqmaql1.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_mesqmaql1.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_messyslookups.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_messyslookups.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_mesqmcheckitemdt.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_mesqmcheckitemdt.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_mesdefectcodeshow.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_mesdefectcodeshow.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_iqclookups.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_iqclookups.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" - }, - { - "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\usercontrol\\ucbtnprint.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\usercontrol\\ucbtnprint.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|E:\\MesSourceCode\\PC_Web\\DevApp\\gs.devapp\\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" - }, - { - "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}", - "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\\rpt\\rptpreview.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\rpt\\rptpreview.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -62,166 +26,56 @@ "DocumentGroups": [ { "DockedWidth": 248, - "SelectedChildIndex": 0, + "SelectedChildIndex": 1, "Children": [ { "$type": "Document", - "DocumentIndex": 0, - "Title": "Frm_MesInvItemArn.cs", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs", - "ViewState": "AgIAAB4BAAAAAAAAAAAnwCgBAABJAAAAAAAAAA==", + "DocumentIndex": 1, + "Title": "Frm_ArrivalBarcode.cs", + "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs", + "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs", + "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs", + "RelativeToolTip": "Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABAAAAA4AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T09:58:44.277Z", + "WhenOpened": "2025-07-16T10:03:08.956Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 1, - "Title": "Frm_MesCgthSq.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Ck\\Frm_MesCgthSq.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Ck\\Frm_MesCgthSq.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Ck\\Frm_MesCgthSq.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\Ck\\Frm_MesCgthSq.cs [\u8BBE\u8BA1]", + "DocumentIndex": 0, + "Title": "Frm_ArrivalBarcode.cs [\u8BBE\u8BA1]", + "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs", + "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs", + "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs [\u8BBE\u8BA1]", + "RelativeToolTip": "Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs [\u8BBE\u8BA1]", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T09:21:25.965Z", - "EditorCaption": " [\u8BBE\u8BA1]" - }, - { - "$type": "Document", - "DocumentIndex": 2, - "Title": "Frm_MesItemTbl.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rk\\Frm_MesItemTbl.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Rk\\Frm_MesItemTbl.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rk\\Frm_MesItemTbl.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\Rk\\Frm_MesItemTbl.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T09:21:16.259Z", + "WhenOpened": "2025-07-16T10:01:36.242Z", "EditorCaption": " [\u8BBE\u8BA1]" }, { "$type": "Document", "DocumentIndex": 3, - "Title": "Frm_MesQmAql1.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQmAql1.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQmAql1.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQmAql1.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQmAql1.cs [\u8BBE\u8BA1]", + "Title": "Frm_MesInvItemArn.cs", + "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs", + "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs", + "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs", + "RelativeToolTip": "Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs", + "ViewState": "AgIAALABAAAAAAAAAAAiwL8BAAAvAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T08:11:27.172Z", - "EditorCaption": " [\u8BBE\u8BA1]" - }, - { - "$type": "Document", - "DocumentIndex": 4, - "Title": "Frm_MesSysLookups.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesSysLookups.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Frm_MesSysLookups.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesSysLookups.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Frm_MesSysLookups.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T08:11:18.291Z", - "EditorCaption": " [\u8BBE\u8BA1]" - }, - { - "$type": "Document", - "DocumentIndex": 5, - "Title": "Frm_MesQmCheckitemDt.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQmCheckitemDt.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQmCheckitemDt.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQmCheckitemDt.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQmCheckitemDt.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T08:11:11.002Z", - "EditorCaption": " [\u8BBE\u8BA1]" - }, - { - "$type": "Document", - "DocumentIndex": 6, - "Title": "Frm_MesDefectCodeShow.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesDefectCodeShow.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Frm_MesDefectCodeShow.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesDefectCodeShow.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Frm_MesDefectCodeShow.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T08:11:00.984Z", - "EditorCaption": " [\u8BBE\u8BA1]" - }, - { - "$type": "Document", - "DocumentIndex": 7, - "Title": "Frm_IQCLookups.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_IQCLookups.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Frm_IQCLookups.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_IQCLookups.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Frm_IQCLookups.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T08:10:58.095Z", - "EditorCaption": " [\u8BBE\u8BA1]" - }, - { - "$type": "Document", - "DocumentIndex": 8, - "Title": "UcBtnPrint.cs", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\UcBtnPrint.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\UserControl\\UcBtnPrint.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\UcBtnPrint.cs", - "RelativeToolTip": "Gs.DevApp\\UserControl\\UcBtnPrint.cs", - "ViewState": "AgIAAIMAAAAAAAAAAAAUwJIAAAAsAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T07:55:29.367Z", + "WhenOpened": "2025-07-16T05:19:16.62Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 10, - "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": "AgIAABgAAAAAAAAAAADwvygAAAA9AAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|", - "WhenOpened": "2025-07-14T09:15:36.127Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 12, - "Title": "RptPreview.cs", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs", - "ViewState": "AgIAAAkAAAAAAAAAAAAAAA8AAAAIAAAAAAAAAA==", + "DocumentIndex": 2, + "Title": "Frm_MesInvItemArn.cs [\u8BBE\u8BA1]", + "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs", + "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs", + "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs [\u8BBE\u8BA1]", + "RelativeToolTip": "Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs [\u8BBE\u8BA1]", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-14T07:55:39.67Z" - }, - { - "$type": "Document", - "DocumentIndex": 11, - "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": "AgIAAD0AAAAAAAAAAAAcwFIAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-14T07:13:06.781Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 9, - "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", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-11T09:39:04.708Z", + "WhenOpened": "2025-07-16T04:54:25.697Z", "EditorCaption": " [\u8BBE\u8BA1]" } ] diff --git a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json index 2d3c5e2..22f8df7 100644 --- a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json +++ b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json @@ -7,52 +7,16 @@ "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\rk\\frm_mesinvitemarn.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\\ck\\frm_mescgthsq.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\\ck\\frm_mescgthsq.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" + "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\warehouse\\frm_arrivalbarcode.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\warehouse\\frm_arrivalbarcode.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\rk\\frm_mesitemtbl.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\\rk\\frm_mesitemtbl.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" + "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\warehouse\\frm_arrivalbarcode.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", + "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\warehouse\\frm_arrivalbarcode.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" }, { - "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\qc\\frm_mesqmaql1.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_mesqmaql1.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_messyslookups.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_messyslookups.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_mesqmcheckitemdt.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_mesqmcheckitemdt.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_mesdefectcodeshow.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_mesdefectcodeshow.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_iqclookups.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_iqclookups.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" - }, - { - "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\usercontrol\\ucbtnprint.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\usercontrol\\ucbtnprint.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|E:\\MesSourceCode\\PC_Web\\DevApp\\gs.devapp\\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" - }, - { - "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}", - "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\\rpt\\rptpreview.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\rpt\\rptpreview.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\rk\\frm_mesinvitemarn.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\\rk\\frm_mesinvitemarn.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" } ], "DocumentGroupContainers": [ @@ -62,8 +26,33 @@ "DocumentGroups": [ { "DockedWidth": 248, - "SelectedChildIndex": 0, + "SelectedChildIndex": 2, "Children": [ + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "Frm_ArrivalBarcode.cs", + "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs", + "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs", + "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs", + "RelativeToolTip": "Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABAAAAA4AAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-16T10:03:08.956Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "Frm_ArrivalBarcode.cs [\u8BBE\u8BA1]", + "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs", + "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs", + "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs [\u8BBE\u8BA1]", + "RelativeToolTip": "Gs.DevApp\\DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs [\u8BBE\u8BA1]", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-16T10:01:36.242Z", + "EditorCaption": " [\u8BBE\u8BA1]" + }, { "$type": "Document", "DocumentIndex": 0, @@ -72,156 +61,21 @@ "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs", "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs", "RelativeToolTip": "Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs", - "ViewState": "AgIAAB4BAAAAAAAAAAAnwCgBAABJAAAAAAAAAA==", + "ViewState": "AgIAAEwCAAAAAAAAAAAkwGYCAABCAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T09:58:44.277Z", + "WhenOpened": "2025-07-16T05:19:16.62Z", "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 1, - "Title": "Frm_MesCgthSq.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Ck\\Frm_MesCgthSq.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Ck\\Frm_MesCgthSq.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Ck\\Frm_MesCgthSq.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\Ck\\Frm_MesCgthSq.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T09:21:25.965Z", - "EditorCaption": " [\u8BBE\u8BA1]" - }, - { - "$type": "Document", - "DocumentIndex": 2, - "Title": "Frm_MesItemTbl.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rk\\Frm_MesItemTbl.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Rk\\Frm_MesItemTbl.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rk\\Frm_MesItemTbl.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\Rk\\Frm_MesItemTbl.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T09:21:16.259Z", - "EditorCaption": " [\u8BBE\u8BA1]" }, { "$type": "Document", "DocumentIndex": 3, - "Title": "Frm_MesQmAql1.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQmAql1.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQmAql1.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQmAql1.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQmAql1.cs [\u8BBE\u8BA1]", + "Title": "Frm_MesInvItemArn.cs [\u8BBE\u8BA1]", + "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs", + "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs", + "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs [\u8BBE\u8BA1]", + "RelativeToolTip": "Gs.DevApp\\DevFrm\\Rk\\Frm_MesInvItemArn.cs [\u8BBE\u8BA1]", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T08:11:27.172Z", - "EditorCaption": " [\u8BBE\u8BA1]" - }, - { - "$type": "Document", - "DocumentIndex": 4, - "Title": "Frm_MesSysLookups.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesSysLookups.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Frm_MesSysLookups.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesSysLookups.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Frm_MesSysLookups.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T08:11:18.291Z", - "EditorCaption": " [\u8BBE\u8BA1]" - }, - { - "$type": "Document", - "DocumentIndex": 5, - "Title": "Frm_MesQmCheckitemDt.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQmCheckitemDt.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQmCheckitemDt.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesQmCheckitemDt.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Frm_MesQmCheckitemDt.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T08:11:11.002Z", - "EditorCaption": " [\u8BBE\u8BA1]" - }, - { - "$type": "Document", - "DocumentIndex": 6, - "Title": "Frm_MesDefectCodeShow.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesDefectCodeShow.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Frm_MesDefectCodeShow.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_MesDefectCodeShow.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Frm_MesDefectCodeShow.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T08:11:00.984Z", - "EditorCaption": " [\u8BBE\u8BA1]" - }, - { - "$type": "Document", - "DocumentIndex": 7, - "Title": "Frm_IQCLookups.cs [\u8BBE\u8BA1]", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_IQCLookups.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Frm_IQCLookups.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Frm_IQCLookups.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Frm_IQCLookups.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T08:10:58.095Z", - "EditorCaption": " [\u8BBE\u8BA1]" - }, - { - "$type": "Document", - "DocumentIndex": 8, - "Title": "UcBtnPrint.cs", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\UcBtnPrint.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\UserControl\\UcBtnPrint.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\UcBtnPrint.cs", - "RelativeToolTip": "Gs.DevApp\\UserControl\\UcBtnPrint.cs", - "ViewState": "AgIAAIMAAAAAAAAAAAAUwJIAAAAsAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-15T07:55:29.367Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 10, - "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": "AgIAABgAAAAAAAAAAADwvygAAAA9AAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|", - "WhenOpened": "2025-07-14T09:15:36.127Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 12, - "Title": "RptPreview.cs", - "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs", - "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\Rpt\\RptPreview.cs", - "ViewState": "AgIAAAkAAAAAAAAAAAAAAA8AAAAIAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-14T07:55:39.67Z" - }, - { - "$type": "Document", - "DocumentIndex": 11, - "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": "AgIAAD0AAAAAAAAAAAAcwFIAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-14T07:13:06.781Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 9, - "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", - "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs [\u8BBE\u8BA1]", - "RelativeToolTip": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs [\u8BBE\u8BA1]", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-11T09:39:04.708Z", + "WhenOpened": "2025-07-16T04:54:25.697Z", "EditorCaption": " [\u8BBE\u8BA1]" } ] diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config index ecac9fe..67326f1 100644 --- a/DevApp/Gs.DevApp/App.config +++ b/DevApp/Gs.DevApp/App.config @@ -36,9 +36,10 @@ </assemblyBinding> </runtime> <appSettings> - <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> + + <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="WebApiUrl" value="http://192.168.1.187:8081/" />--> <add key="LogPath" value="logs" /> <add key="ProductName" value="G-MES V2.0" /> <add key="PageSize" value="50" /> diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs index e83ba9c..3c85512 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs @@ -93,6 +93,7 @@ this.txt_guid = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + this.lab_paperBillNo = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -106,7 +107,6 @@ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); - this.lab_paperBillNo = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -147,8 +147,11 @@ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); this.rptHistory = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); + this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -181,6 +184,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); @@ -194,7 +198,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -538,7 +541,8 @@ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem18, - this.layoutControlItem9}); + this.layoutControlItem9, + this.lab_paperBillNo}); 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"; @@ -729,6 +733,17 @@ this.layoutControlItem9.Text = "涓婚敭GUID"; this.layoutControlItem9.TextSize = new System.Drawing.Size(79, 14); // + // lab_paperBillNo + // + this.lab_paperBillNo.Control = this.txt_paperBillNo; + this.lab_paperBillNo.Location = new System.Drawing.Point(528, 48); + this.lab_paperBillNo.Name = "lab_paperBillNo"; + this.lab_paperBillNo.OptionsTableLayoutItem.ColumnIndex = 2; + this.lab_paperBillNo.OptionsTableLayoutItem.RowIndex = 2; + this.lab_paperBillNo.Size = new System.Drawing.Size(264, 24); + this.lab_paperBillNo.Text = "閫佽揣鍗曞彿"; + this.lab_paperBillNo.TextSize = new System.Drawing.Size(60, 14); + // // Root // this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; @@ -745,8 +760,7 @@ this.layoutControlItem8, this.layoutControlItem5, this.layoutControlItem17, - this.layoutControlItem16, - this.lab_paperBillNo}); + this.layoutControlItem16}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -908,17 +922,6 @@ this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem16.TextVisible = false; // - // lab_paperBillNo - // - this.lab_paperBillNo.Control = this.txt_paperBillNo; - this.lab_paperBillNo.Location = new System.Drawing.Point(528, 48); - this.lab_paperBillNo.Name = "lab_paperBillNo"; - this.lab_paperBillNo.OptionsTableLayoutItem.ColumnIndex = 2; - this.lab_paperBillNo.OptionsTableLayoutItem.RowIndex = 2; - this.lab_paperBillNo.Size = new System.Drawing.Size(264, 24); - this.lab_paperBillNo.Text = "閫佽揣鍗曞彿"; - this.lab_paperBillNo.TextSize = new System.Drawing.Size(60, 14); - // // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; @@ -991,7 +994,10 @@ this.gridColumn16, this.gridColumn2, this.gridColumn17, - this.gridColumn18}); + this.gridColumn18, + this.gridColumn4, + this.gridColumn19, + this.gridColumn20}); this.gvMx1.DetailHeight = 272; this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; @@ -1182,7 +1188,7 @@ this.gvMx1quantity.FieldName = "quantity"; this.gvMx1quantity.MinWidth = 22; this.gvMx1quantity.Name = "gvMx1quantity"; - this.gvMx1quantity.Tag = "yz_quantity_0_edit"; + this.gvMx1quantity.Tag = "edit"; this.gvMx1quantity.Visible = true; this.gvMx1quantity.VisibleIndex = 10; this.gvMx1quantity.Width = 37; @@ -1409,6 +1415,22 @@ this.gridColumn18.Name = "gridColumn18"; this.gridColumn18.Width = 82; // + // gridColumn4 + // + this.gridColumn4.Caption = "浠撳簱缂栫爜"; + this.gridColumn4.FieldName = "depotCode"; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 24; + // + // gridColumn19 + // + this.gridColumn19.Caption = "浠撳簱鍚嶇О"; + this.gridColumn19.FieldName = "depotName"; + this.gridColumn19.Name = "gridColumn19"; + this.gridColumn19.Visible = true; + this.gridColumn19.VisibleIndex = 25; + // // picCheckBox // this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; @@ -1420,6 +1442,14 @@ this.picCheckBox.TabIndex = 6; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; + // + // gridColumn20 + // + this.gridColumn20.Caption = "浠撶鍛�"; + this.gridColumn20.FieldName = "staffName"; + this.gridColumn20.Name = "gridColumn20"; + this.gridColumn20.Visible = true; + this.gridColumn20.VisibleIndex = 26; // // Frm_MesInvItemArn // @@ -1464,6 +1494,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); @@ -1477,7 +1508,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1587,5 +1617,8 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem lab_paperBillNo; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs index b83bf19..b4c1889 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs @@ -174,6 +174,9 @@ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tips = new DevExpress.Utils.ToolTipController(this.components); + this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -1420,7 +1423,10 @@ this.gridColumn19, this.gridColumn12, this.gridColumn27, - this.gridColumn28}); + this.gridColumn28, + this.gridColumn29, + this.gridColumn30, + this.gridColumn31}); this.gvMx1.DetailHeight = 272; this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; @@ -1635,7 +1641,7 @@ this.gridColumn28.Name = "gridColumn28"; this.gridColumn28.OptionsColumn.ReadOnly = true; this.gridColumn28.Visible = true; - this.gridColumn28.VisibleIndex = 13; + this.gridColumn28.VisibleIndex = 16; this.gridColumn28.Width = 66; // // repositoryItemComboBox1 @@ -1843,6 +1849,30 @@ this.gridColumn24.Visible = true; this.gridColumn24.VisibleIndex = 11; this.gridColumn24.Width = 82; + // + // gridColumn29 + // + this.gridColumn29.Caption = "浠撳簱缂栫爜"; + this.gridColumn29.FieldName = "depotCode"; + this.gridColumn29.Name = "gridColumn29"; + this.gridColumn29.Visible = true; + this.gridColumn29.VisibleIndex = 13; + // + // gridColumn30 + // + this.gridColumn30.Caption = "浠撳簱鍚嶇О"; + this.gridColumn30.FieldName = "depotName"; + this.gridColumn30.Name = "gridColumn30"; + this.gridColumn30.Visible = true; + this.gridColumn30.VisibleIndex = 14; + // + // gridColumn31 + // + this.gridColumn31.Caption = "浠撶鍛�"; + this.gridColumn31.FieldName = "staffName"; + this.gridColumn31.Name = "gridColumn31"; + this.gridColumn31.Visible = true; + this.gridColumn31.VisibleIndex = 15; // // Frm_ArrivalBarcode // @@ -2075,5 +2105,8 @@ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2; private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn29; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn30; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn31; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs index a0932ae..6fb1378 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs @@ -54,6 +54,7 @@ this.radioGroup1 = new DevExpress.XtraEditors.RadioGroup(); this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); this.btnIn = new DevExpress.XtraEditors.SimpleButton(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit(); this.panelControl2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); @@ -113,7 +114,8 @@ this.gridColumn10, this.gridColumn2, this.gridColumn4, - this.gridColumn1}); + this.gridColumn1, + this.gridColumn8}); this.gridView1.DetailHeight = 272; this.gridView1.GridControl = this.gcMain; this.gridView1.IndicatorWidth = 44; @@ -140,14 +142,14 @@ this.gv_billNo.Caption = "閲囪喘鍗曞彿"; this.gv_billNo.FieldName = "billNo"; this.gv_billNo.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left; - this.gv_billNo.MinWidth = 9; + this.gv_billNo.MinWidth = 10; this.gv_billNo.Name = "gv_billNo"; this.gv_billNo.OptionsColumn.AllowEdit = false; this.gv_billNo.OptionsColumn.ReadOnly = true; this.gv_billNo.Tag = "query_a.BILL_NO"; this.gv_billNo.Visible = true; this.gv_billNo.VisibleIndex = 1; - this.gv_billNo.Width = 9; + this.gv_billNo.Width = 10; // // gv_guid // @@ -177,46 +179,46 @@ // this.gridColumn3.Caption = "閲囪喘鏃堕棿"; this.gridColumn3.FieldName = "purchaseDate"; - this.gridColumn3.MinWidth = 9; + this.gridColumn3.MinWidth = 10; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.OptionsColumn.ReadOnly = true; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 2; - this.gridColumn3.Width = 9; + this.gridColumn3.Width = 10; // // gv_supplierItemCode // this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true; this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜"; this.gv_supplierItemCode.FieldName = "wlbm"; - this.gv_supplierItemCode.MinWidth = 9; + this.gv_supplierItemCode.MinWidth = 10; this.gv_supplierItemCode.Name = "gv_supplierItemCode"; this.gv_supplierItemCode.OptionsColumn.AllowEdit = false; this.gv_supplierItemCode.OptionsColumn.ReadOnly = true; this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE"; this.gv_supplierItemCode.Visible = true; this.gv_supplierItemCode.VisibleIndex = 3; - this.gv_supplierItemCode.Width = 9; + this.gv_supplierItemCode.Width = 10; // // gv_supplierItemName // this.gv_supplierItemName.AppearanceCell.Options.UseFont = true; this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О"; this.gv_supplierItemName.FieldName = "wlmc"; - this.gv_supplierItemName.MinWidth = 9; + this.gv_supplierItemName.MinWidth = 10; this.gv_supplierItemName.Name = "gv_supplierItemName"; this.gv_supplierItemName.OptionsColumn.AllowEdit = false; this.gv_supplierItemName.OptionsColumn.ReadOnly = true; this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME"; this.gv_supplierItemName.Visible = true; this.gv_supplierItemName.VisibleIndex = 4; - this.gv_supplierItemName.Width = 9; + this.gv_supplierItemName.Width = 10; // // gridColumn6 // this.gridColumn6.Caption = "閲囪喘鏁伴噺"; this.gridColumn6.FieldName = "purchaseQty"; - this.gridColumn6.MinWidth = 9; + this.gridColumn6.MinWidth = 10; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.OptionsColumn.ReadOnly = true; this.gridColumn6.Visible = true; @@ -227,7 +229,7 @@ // this.gridColumn9.Caption = "宸叉敹鏁伴噺"; this.gridColumn9.FieldName = "yssl"; - this.gridColumn9.MinWidth = 9; + this.gridColumn9.MinWidth = 10; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.OptionsColumn.ReadOnly = true; this.gridColumn9.Visible = true; @@ -242,19 +244,19 @@ this.gridColumn7.AppearanceHeader.Options.UseForeColor = true; this.gridColumn7.Caption = "鏈敹鏁伴噺"; this.gridColumn7.FieldName = "wssl"; - this.gridColumn7.MinWidth = 9; + this.gridColumn7.MinWidth = 10; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.OptionsColumn.ReadOnly = true; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 7; - this.gridColumn7.Width = 9; + this.gridColumn7.Width = 10; // // gv_purchaseUnit // this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true; this.gv_purchaseUnit.Caption = "閲囪喘鍗曚綅"; this.gv_purchaseUnit.FieldName = "fname"; - this.gv_purchaseUnit.MinWidth = 9; + this.gv_purchaseUnit.MinWidth = 10; this.gv_purchaseUnit.Name = "gv_purchaseUnit"; this.gv_purchaseUnit.OptionsColumn.AllowEdit = false; this.gv_purchaseUnit.OptionsColumn.ReadOnly = true; @@ -268,20 +270,20 @@ this.gv_remarks.AppearanceCell.Options.UseFont = true; this.gv_remarks.Caption = "澶囨敞"; this.gv_remarks.FieldName = "remarks"; - this.gv_remarks.MinWidth = 9; + this.gv_remarks.MinWidth = 10; this.gv_remarks.Name = "gv_remarks"; this.gv_remarks.OptionsColumn.AllowEdit = false; this.gv_remarks.OptionsColumn.ReadOnly = true; this.gv_remarks.Tag = "query_a.REMARKS"; this.gv_remarks.Visible = true; this.gv_remarks.VisibleIndex = 9; - this.gv_remarks.Width = 9; + this.gv_remarks.Width = 10; // // gridColumn5 // this.gridColumn5.Caption = "鐗╂枡瑙勬牸"; this.gridColumn5.FieldName = "wlgg"; - this.gridColumn5.MinWidth = 9; + this.gridColumn5.MinWidth = 10; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.OptionsColumn.ReadOnly = true; this.gridColumn5.Visible = true; @@ -292,7 +294,7 @@ // this.gridColumn10.Caption = "渚涘簲鍟�"; this.gridColumn10.FieldName = "gysName"; - this.gridColumn10.MinWidth = 9; + this.gridColumn10.MinWidth = 10; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 11; @@ -302,17 +304,17 @@ // this.gridColumn2.Caption = "鏀舵枡缁勭粐"; this.gridColumn2.FieldName = "fSubsidiary"; - this.gridColumn2.MinWidth = 9; + this.gridColumn2.MinWidth = 10; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 12; - this.gridColumn2.Width = 9; + this.gridColumn2.Width = 10; // // gridColumn4 // this.gridColumn4.Caption = "閿�鍞鍗�"; this.gridColumn4.FieldName = "xxdd"; - this.gridColumn4.MinWidth = 9; + this.gridColumn4.MinWidth = 10; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.OptionsColumn.ReadOnly = true; this.gridColumn4.Visible = true; @@ -323,7 +325,7 @@ // this.gridColumn1.Caption = "鍗曟嵁绫诲瀷"; this.gridColumn1.FieldName = "documentTypeTxt"; - this.gridColumn1.MinWidth = 9; + this.gridColumn1.MinWidth = 10; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 14; @@ -387,6 +389,14 @@ this.btnIn.TabIndex = 4; this.btnIn.Text = "纭畾瀵煎叆"; // + // gridColumn8 + // + this.gridColumn8.Caption = "鏈鏀堕噺"; + this.gridColumn8.FieldName = "bcsl"; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 15; + // // SelectCgMx // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); @@ -440,5 +450,6 @@ private DevExpress.XtraEditors.SimpleButton btnIn; private System.Windows.Forms.Label label1; private DevExpress.XtraGrid.Columns.GridColumn colChkInt; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs index 72d4ae2..31aed7b 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs @@ -8,36 +8,58 @@ namespace Gs.DevApp.UserControl { + // 缁ф壙鑷猉traForm锛岃繖鏄疍evExpress鎻愪緵鐨勫寮哄瀷琛ㄥ崟鎺т欢 public partial class SelectCgMx : XtraForm { - + // Web鏈嶅姟鍚嶇О甯搁噺锛岀敤浜庤皟鐢ㄥ悗绔帴鍙� private readonly string _webServiceName = "MesInvItemArnManager/"; + // 渚涘簲鍟咺D鍜屾敹鏂欑粍缁嘔D鐨勭鏈夊彉閲� private string suppId = ""; private string receiveOrgId = ""; + /// <summary> - /// + /// 鏋勯�犲嚱鏁� /// </summary> - /// <param name="_suppId">渚涘簲鍟�</param> - /// <param name="_receiveOrgId">鏀舵枡缁勭粐</param> - /// <param name="_isWw">鏄惁濮斿</param> + /// <param name="_suppId">渚涘簲鍟咺D鍙傛暟</param> + /// <param name="_receiveOrgId">鏀舵枡缁勭粐ID鍙傛暟</param> public SelectCgMx(string _suppId, string _receiveOrgId) { + // 鍒濆鍖栬〃鍗曟帶浠� InitializeComponent(); + + // 涓篏ridView鐨勫垪鏍囬缁樺埗浜嬩欢娣诲姞澶勭悊鏂规硶锛屼娇鐢ㄨ嚜瀹氫箟缁樺埗 this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); }; + + // 涓篏ridView鐨勯紶鏍囨姮璧蜂簨浠舵坊鍔犲鐞嗘柟娉曪紝瀹炵幇鑷畾涔変氦浜� this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); }; + + // 閰嶇疆澶嶉�夊垪鐨勬帓搴忓拰绛涢�夐�夐」锛岀鐢ㄦ帓搴忓拰绛涢�夊姛鑳� this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.colChkInt.OptionsFilter.AllowAutoFilter = false; this.colChkInt.OptionsFilter.AllowFilter = false; this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False; + + // 璁剧疆鍗曢�夋寜閽粍榛樿閫変腑绗竴椤癸紙閲囪喘绫诲瀷锛� radioGroup1.SelectedIndex = 0; + + // 淇濆瓨浼犲叆鐨勪緵搴斿晢ID鍜屾敹鏂欑粍缁嘔D this.suppId = _suppId; this.receiveOrgId = _receiveOrgId; + + // 璁剧疆GridView鐨勫弬鏁伴厤缃� Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false); + + // 鍔犺浇绗竴椤垫暟鎹� getPageList(1); + + // 涓�"纭畾"鎸夐挳娣诲姞鐐瑰嚮浜嬩欢澶勭悊 btnIn.Click += (s, e) => { + // 鎻愪氦缂栬緫骞舵洿鏂板綋鍓嶈鏁版嵁 gridView1.PostEditor(); gridView1.UpdateCurrentRow(); + + // 鏀堕泦閫変腑琛岀殑GUID var list = new List<string>(); DataTable dt = this.gcMain.DataSource as DataTable; { @@ -45,14 +67,20 @@ { string checkBox = dr["chkInt"].ToString(); string _guid = dr["guid"].ToString(); + // 妫�鏌ユ槸鍚﹂�変腑 if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox)) { list.Add(_guid); } } } - UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list }); Close(); + + // 瑙﹀彂鍥炶皟浜嬩欢锛屼紶閫掗�変腑鐨凣UID鍒楄〃锛岀劧鍚庡叧闂〃鍗� + UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list }); + Close(); }; + + // 涓哄崟閫夋寜閽粍娣诲姞閫変腑椤瑰彉鍖栦簨浠讹紝鍒囨崲鏃堕噸鏂板姞杞芥暟鎹� radioGroup1.SelectedIndexChanged += (s, e) => { getPageList(1); @@ -60,40 +88,53 @@ } /// <summary> - /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢 + /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢锛岀敤浜庡悜鐖剁獥浣撲紶閫掗�変腑鐨勬暟鎹� /// </summary> public event EventHandler<UpdateParentEventArgs> UpdateParent; /// <summary> + /// 浠庢湇鍔″櫒鑾峰彇鍒嗛〉鏁版嵁骞剁粦瀹氬埌GridView /// </summary> - /// <param name="curPage">绗嚑椤�</param> - /// <param name="pageSize">姣忛〉鍑犳潯</param> + /// <param name="curPage">褰撳墠椤电爜</param> private void getPageList(int curPage) { + // 鍒涘缓璇锋眰鍙傛暟瀵硅薄 var _obj = new { - currentPage = curPage, - everyPageSize = 999999, - sortName = "", - keyWhere = "", - inBusType = (radioGroup1.SelectedIndex + 1),//1鏄噰璐紝2鏄澶� - inSupId = this.suppId, - inReceiveOrgId = this.receiveOrgId, + currentPage = curPage, // 褰撳墠椤电爜 + everyPageSize = 999999, // 姣忛〉璁板綍鏁�(杩欓噷璁剧疆浜嗕竴涓緢澶х殑鍊硷紝鍙兘鏄负浜嗚幏鍙栨墍鏈夋暟鎹�) + sortName = "", // 鎺掑簭瀛楁 + keyWhere = "", // 鏌ヨ鏉′欢 + inBusType = (radioGroup1.SelectedIndex + 1), // 涓氬姟绫诲瀷锛�1鏄噰璐紝2鏄澶� + inSupId = this.suppId, // 渚涘簲鍟咺D + inReceiveOrgId = this.receiveOrgId, // 鏀舵枡缁勭粐ID }; + + // 灏嗗弬鏁板璞″簭鍒楀寲涓篔SON瀛楃涓� var json = JsonConvert.SerializeObject(_obj); + try { + // 璋冪敤Web鏈嶅姟鑾峰彇鏁版嵁 var strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectForm", json); + + // 瑙f瀽杩斿洖缁撴灉涓篋ataTable var dd = UtilityHelper.ReturnToTablePage(strReturn); var dt = dd.rtnData.list; + + // 缁戝畾鏁版嵁鍒癎ridControl gcMain.BindingContext = new BindingContext(); gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); + + // 鑷姩璋冩暣鍒楀骞跺簲鐢ㄧ綉鏍煎竷灞� + gridView1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } catch (Exception ex) { + // 鏄剧ず閿欒淇℃伅 MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } -- Gitblit v1.9.3