From 8ecbedaeb1a0b438f83c36f4f19f50b03e2723dc Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 25 七月 2025 08:38:57 +0800
Subject: [PATCH] 1、仓库新增打印模板切换、排序 2、检验样本数保存逻辑更改 3、采购模块新增入库类型
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs | 159 ++++++++
DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/CodeChunks.db | 0
DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json | 59 ++-
DevApp/.vs/GsDevSolution/CopilotIndices/17.14.786.1071/SemanticSymbols.db | 0
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs | 480 +++++++++++++++------------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs | 144 +++++---
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 7
DevApp/Gs.DevApp/App.config | 5
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 51 +-
DevApp/.vs/GsDevSolution/v17/DocumentLayout.json | 59 ++-
10 files changed, 608 insertions(+), 356 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 5c1a78b..b9a086c 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 6d1d3b3..5f6c7ed 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 3fb5836..f7409eb 100644
--- a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json
+++ b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json
@@ -3,12 +3,16 @@
"WorkspaceRootPath": "E:\\MesSourceCode\\PC_Web\\DevApp\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\usercontrol\\selectdeletebar.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\usercontrol\\selectdeletebar.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\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\\usercontrol\\selectdeletebar.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
- "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\usercontrol\\selectdeletebar.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
+ "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
+ "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\basicdata\\frm_mesdepot.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
+ "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"
}
],
"DocumentGroupContainers": [
@@ -18,31 +22,44 @@
"DocumentGroups": [
{
"DockedWidth": 248,
- "SelectedChildIndex": 0,
+ "SelectedChildIndex": 1,
"Children": [
{
"$type": "Document",
- "DocumentIndex": 0,
- "Title": "SelectDeleteBar.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs*",
- "RelativeToolTip": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs*",
- "ViewState": "AgIAALQAAAAAAAAAAAAYwMQAAAABAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-23T06:57:36.465Z",
+ "DocumentIndex": 1,
+ "Title": "App.config",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\App.config",
+ "RelativeDocumentMoniker": "Gs.DevApp\\App.config",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\App.config",
+ "RelativeToolTip": "Gs.DevApp\\App.config",
+ "ViewState": "AgIAAB4AAAAAAAAAAADwvygAAAACAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|",
+ "WhenOpened": "2025-07-24T10:31:00.761Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
- "Title": "SelectDeleteBar.cs [\u8BBE\u8BA1]",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs [\u8BBE\u8BA1]*",
- "RelativeToolTip": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs [\u8BBE\u8BA1]*",
+ "DocumentIndex": 0,
+ "Title": "Frm_MesDepot.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
+ "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
+ "RelativeToolTip": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
+ "ViewState": "AgIAAJIBAAAAAAAAAAAowKABAAANAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-23T06:57:22.853Z",
+ "WhenOpened": "2025-07-24T07:19:16.496Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 2,
+ "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-24T06:45:15.578Z",
"EditorCaption": " [\u8BBE\u8BA1]"
}
]
diff --git a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json
index 264f55e..f7409eb 100644
--- a/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json
+++ b/DevApp/.vs/GsDevSolution/v17/DocumentLayout.json
@@ -3,12 +3,16 @@
"WorkspaceRootPath": "E:\\MesSourceCode\\PC_Web\\DevApp\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\usercontrol\\selectdeletebar.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\usercontrol\\selectdeletebar.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\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\\usercontrol\\selectdeletebar.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
- "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\usercontrol\\selectdeletebar.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
+ "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
+ "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\basicdata\\frm_mesdepot.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
+ "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"
}
],
"DocumentGroupContainers": [
@@ -18,31 +22,44 @@
"DocumentGroups": [
{
"DockedWidth": 248,
- "SelectedChildIndex": 0,
+ "SelectedChildIndex": 1,
"Children": [
{
"$type": "Document",
- "DocumentIndex": 0,
- "Title": "SelectDeleteBar.cs",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
- "RelativeToolTip": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
- "ViewState": "AgIAADEAAAAAAAAAAAAAwL4AAAAAAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-23T06:57:36.465Z",
+ "DocumentIndex": 1,
+ "Title": "App.config",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\App.config",
+ "RelativeDocumentMoniker": "Gs.DevApp\\App.config",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\App.config",
+ "RelativeToolTip": "Gs.DevApp\\App.config",
+ "ViewState": "AgIAAB4AAAAAAAAAAADwvygAAAACAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|",
+ "WhenOpened": "2025-07-24T10:31:00.761Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
- "Title": "SelectDeleteBar.cs [\u8BBE\u8BA1]",
- "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
- "RelativeDocumentMoniker": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
- "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs [\u8BBE\u8BA1]",
- "RelativeToolTip": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs [\u8BBE\u8BA1]",
+ "DocumentIndex": 0,
+ "Title": "Frm_MesDepot.cs",
+ "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
+ "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
+ "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
+ "RelativeToolTip": "Gs.DevApp\\DevFrm\\BasicData\\Frm_MesDepot.cs",
+ "ViewState": "AgIAAJIBAAAAAAAAAAAowKABAAANAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-23T06:57:22.853Z",
+ "WhenOpened": "2025-07-24T07:19:16.496Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 2,
+ "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-24T06:45:15.578Z",
"EditorCaption": " [\u8BBE\u8BA1]"
}
]
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 4aa1533..b064418 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -37,8 +37,9 @@
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
-<add key="WebApiUrl" value="http://192.168.1.187:81/" />
+ <add key="WebApiUrl" value="http://localhost:5263/" />
+
+ <!--<add key="WebApiUrl" value="http://192.168.1.187:81/" />-->
<!--<add key="WebApiUrl" value="http://192.168.1.187:8081/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
index 8ee892f..cea5c95 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -78,8 +78,8 @@
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.txt_description = new DevExpress.XtraEditors.TextEdit();
this.txt_depottype = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -88,7 +88,6 @@
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -105,6 +104,9 @@
this.bandedGridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_DepotModel = new DevExpress.XtraEditors.ComboBoxEdit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -132,8 +134,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
@@ -142,7 +144,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -150,6 +151,9 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bandedGridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_DepotModel.Properties)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -495,6 +499,7 @@
this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_description);
this.layoutMx1.Controls.Add(this.txt_depottype);
+ this.layoutMx1.Controls.Add(this.txt_DepotModel);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem9});
@@ -529,98 +534,109 @@
//
// txt_isFkc
//
- this.txt_isFkc.Location = new System.Drawing.Point(897, 12);
+ this.txt_isFkc.Location = new System.Drawing.Point(909, 12);
this.txt_isFkc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_isFkc.Name = "txt_isFkc";
this.txt_isFkc.Properties.Appearance.Options.UseFont = true;
- this.txt_isFkc.Size = new System.Drawing.Size(197, 20);
+ this.txt_isFkc.Size = new System.Drawing.Size(185, 20);
this.txt_isFkc.StyleController = this.layoutMx1;
this.txt_isFkc.TabIndex = 291;
this.txt_isFkc.Tag = "readonly";
//
// txt_isNg
//
- this.txt_isNg.Location = new System.Drawing.Point(897, 43);
+ this.txt_isNg.Location = new System.Drawing.Point(909, 43);
this.txt_isNg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_isNg.Name = "txt_isNg";
this.txt_isNg.Properties.Appearance.Options.UseFont = true;
- this.txt_isNg.Size = new System.Drawing.Size(197, 20);
+ this.txt_isNg.Size = new System.Drawing.Size(185, 20);
this.txt_isNg.StyleController = this.layoutMx1;
this.txt_isNg.TabIndex = 267;
this.txt_isNg.Tag = "readonly";
//
// txt_depotCode
//
- this.txt_depotCode.Location = new System.Drawing.Point(84, 12);
+ this.txt_depotCode.Location = new System.Drawing.Point(96, 12);
this.txt_depotCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_depotCode.Name = "txt_depotCode";
this.txt_depotCode.Properties.Appearance.Options.UseFont = true;
- this.txt_depotCode.Size = new System.Drawing.Size(195, 20);
+ this.txt_depotCode.Size = new System.Drawing.Size(183, 20);
this.txt_depotCode.StyleController = this.layoutMx1;
this.txt_depotCode.TabIndex = 213;
this.txt_depotCode.Tag = "readonly";
//
// txt_zuid
//
- this.txt_zuid.Location = new System.Drawing.Point(626, 43);
+ this.txt_zuid.Location = new System.Drawing.Point(638, 43);
this.txt_zuid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_zuid.Name = "txt_zuid";
this.txt_zuid.Properties.Appearance.Options.UseFont = true;
- this.txt_zuid.Size = new System.Drawing.Size(195, 20);
+ this.txt_zuid.Size = new System.Drawing.Size(183, 20);
this.txt_zuid.StyleController = this.layoutMx1;
this.txt_zuid.TabIndex = 285;
this.txt_zuid.Tag = "readonly";
//
// txt_depotName
//
- this.txt_depotName.Location = new System.Drawing.Point(355, 12);
+ this.txt_depotName.Location = new System.Drawing.Point(367, 12);
this.txt_depotName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_depotName.Name = "txt_depotName";
this.txt_depotName.Properties.Appearance.Options.UseFont = true;
- this.txt_depotName.Size = new System.Drawing.Size(195, 20);
+ this.txt_depotName.Size = new System.Drawing.Size(183, 20);
this.txt_depotName.StyleController = this.layoutMx1;
this.txt_depotName.TabIndex = 216;
this.txt_depotName.Tag = "readonly";
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(626, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(638, 12);
this.txt_createBy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(195, 20);
+ this.txt_createBy.Size = new System.Drawing.Size(183, 20);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 219;
this.txt_createBy.Tag = "readonly";
//
// txt_description
//
- this.txt_description.Location = new System.Drawing.Point(84, 43);
+ this.txt_description.Location = new System.Drawing.Point(96, 43);
this.txt_description.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_description.Name = "txt_description";
this.txt_description.Properties.Appearance.Options.UseFont = true;
- this.txt_description.Size = new System.Drawing.Size(195, 20);
+ this.txt_description.Size = new System.Drawing.Size(183, 20);
this.txt_description.StyleController = this.layoutMx1;
this.txt_description.TabIndex = 217;
this.txt_description.Tag = "readonly";
//
// txt_depottype
//
- this.txt_depottype.Location = new System.Drawing.Point(355, 43);
+ this.txt_depottype.Location = new System.Drawing.Point(367, 43);
this.txt_depottype.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_depottype.Name = "txt_depottype";
this.txt_depottype.Properties.Appearance.Options.UseFont = true;
- this.txt_depottype.Size = new System.Drawing.Size(195, 20);
+ this.txt_depottype.Size = new System.Drawing.Size(183, 20);
this.txt_depottype.StyleController = this.layoutMx1;
this.txt_depottype.TabIndex = 231;
this.txt_depottype.Tag = "readonly";
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.lbGuid;
+ this.layoutControlItem9.Location = new System.Drawing.Point(813, 62);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem9.Size = new System.Drawing.Size(273, 31);
+ this.layoutControlItem9.Text = "lbGuid";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem9.TextVisible = false;
//
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem1,
this.layoutControlItem2,
this.layoutControlItem3,
this.layoutControlItem4,
@@ -628,7 +644,9 @@
this.layoutControlItem6,
this.layoutControlItem7,
this.layoutControlItem8,
- this.layoutControlItem10});
+ this.layoutControlItem10,
+ this.layoutControlItem11,
+ this.layoutControlItem1});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -657,15 +675,6 @@
this.Root.Size = new System.Drawing.Size(1106, 113);
this.Root.TextVisible = false;
//
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.txt_depotCode;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem1.Text = "浠撳簱缂栫爜";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 14);
- //
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_depotName;
@@ -674,7 +683,7 @@
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem2.Text = "浠撳簱鍚嶇О";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem3
//
@@ -684,7 +693,7 @@
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem3.Text = "浠撳簱璐熻矗浜�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem4
//
@@ -694,7 +703,7 @@
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem4.Text = "澶囨敞";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem5
//
@@ -705,7 +714,7 @@
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem5.Text = "浠撳簱绫诲瀷";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem6
//
@@ -716,7 +725,7 @@
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem6.Text = "鍒嗙粍";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem7
//
@@ -726,7 +735,7 @@
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.Size = new System.Drawing.Size(273, 31);
this.layoutControlItem7.Text = "鍏佽璐熷簱瀛�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem8
//
@@ -737,7 +746,7 @@
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem8.Size = new System.Drawing.Size(273, 31);
this.layoutControlItem8.Text = "绂佺敤鐘舵��";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem10
//
@@ -750,18 +759,6 @@
this.layoutControlItem10.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.lbGuid;
- this.layoutControlItem9.Location = new System.Drawing.Point(813, 62);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(273, 31);
- this.layoutControlItem9.Text = "lbGuid";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem9.TextVisible = false;
//
// tabMx
//
@@ -936,6 +933,43 @@
this.gridBand1.Name = "gridBand1";
this.gridBand1.VisibleIndex = 0;
//
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_DepotModel;
+ this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem11.CustomizationFormText = "閫夋嫨搴撲綅妯℃澘";
+ this.layoutControlItem11.Location = new System.Drawing.Point(271, 62);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem11.Text = "閫夋嫨搴撲綅妯℃澘";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_depotCode;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem1.Text = "浠撳簱缂栫爜";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // txt_DepotModel
+ //
+ this.txt_DepotModel.Location = new System.Drawing.Point(367, 74);
+ this.txt_DepotModel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_DepotModel.Name = "txt_DepotModel";
+ this.txt_DepotModel.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_DepotModel.Properties.Items.AddRange(new object[] {
+ "搴撲綅鐮侊紙灏忥級",
+ "搴撲綅鐮侊紙澶э級"});
+ this.txt_DepotModel.Size = new System.Drawing.Size(183, 20);
+ this.txt_DepotModel.StyleController = this.layoutMx1;
+ this.txt_DepotModel.TabIndex = 272;
+ this.txt_DepotModel.Tag = "readOnly-1";
+ //
// Frm_MesDepot
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -973,8 +1007,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
@@ -983,7 +1017,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -991,6 +1024,9 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bandedGridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_DepotModel.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -1027,7 +1063,6 @@
private DevExpress.XtraEditors.TextEdit txt_description;
private DevExpress.XtraEditors.TextEdit txt_depotName;
private DevExpress.XtraEditors.TextEdit txt_depotCode;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
@@ -1058,5 +1093,8 @@
private UserControl.UcBtnPrint ucBtnPrint1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_iCount_1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
index 36b0ad3..0bc8584 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -21,6 +21,72 @@
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesDepotsManager/";
+ private DevExpress.XtraEditors.ComboBoxEdit txt_DepotModel;
+ private string _kwModel;
+ /* public Frm_MesDepot()
+ {
+ InitializeComponent();
+ toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+ toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+ toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ this.toolBarMenu1.getXmlConfig();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }, lbGuid);
+ getPageList(1);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+
+ //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
+ this.ucBtnPrint1.btnAllClick += (s, e) =>
+ {
+ string rowGuid = lbGuid.Text.Trim();
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "浠撲綅鐮�");
+ string strCodeList = "";
+ frm.UpdateParent += (ss, ee) =>
+ {
+ strCodeList = ee.StringSingle;
+ };
+ frm.ShowDialog();
+ if (string.IsNullOrEmpty(strCodeList))
+ return;
+ try
+ {
+ string rptParameter = "rpt_KW1{"
+ + "100"//閲嶆墦閮芥槸浼�100锛�
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
+ };
+ this.ucBtnPrint1.SetPrintButton(false);
+
+ }
+ */
+
+ /*******搴撲綅鏉＄爜妯℃澘鍒囨崲*****/
public Frm_MesDepot()
{
InitializeComponent();
@@ -32,9 +98,9 @@
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- }, tips);
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -44,6 +110,9 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+
+ // 鍒濆鍖杢xt_DepotModel鎺т欢
+ InitDepotModelControl();
//鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
this.ucBtnPrint1.btnAllClick += (s, e) =>
@@ -58,16 +127,29 @@
frm.ShowDialog();
if (string.IsNullOrEmpty(strCodeList))
return;
+
try
{
- string rptParameter = "rpt_KW{"
- + "100"//閲嶆墦閮芥槸浼�100锛�
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + strCodeList
- + "}";
+ // 鏍规嵁閫夋嫨鐨勫�艰缃姤琛ㄦā鍨�
+ SetKwModelBySelectedValue();
+
+ // 楠岃瘉妯″瀷鏄惁鏈夋晥
+ if (string.IsNullOrEmpty(_kwModel))
+ {
+ MsgHelper.Warning("璇烽�夋嫨鏈夋晥鐨勫簱浣嶆ā鍨嬬被鍨�");
+ return;
+ }
+
+ // 浣跨敤鍔ㄦ�佹ā鍨嬪悕绉版瀯寤哄弬鏁�
+ string rptParameter = $"{_kwModel}{{"
+ + "100" // 閲嶆墦閮芥槸浼�100
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+
using (Form rpt = new RptPreview(rowGuid, rptParameter))
{
rpt.ShowDialog();
@@ -80,7 +162,58 @@
}
};
this.ucBtnPrint1.SetPrintButton(false);
+ }
+ /// <summary>
+ /// 鍒濆鍖杢xt_DepotModel鎺т欢锛堟煡鎵惧苟璧嬪�硷級
+ /// </summary>
+ private void InitDepotModelControl()
+ {
+ // 閫掑綊鏌ユ壘绐椾綋涓墍鏈夋帶浠讹紙鍖呮嫭瀛愬鍣級
+ Control[] foundControls = this.Controls.Find("txt_DepotModel", true);
+ if (foundControls != null && foundControls.Length > 0 && foundControls[0] is DevExpress.XtraEditors.ComboBoxEdit)
+ {
+ txt_DepotModel = (DevExpress.XtraEditors.ComboBoxEdit)foundControls[0];
+ }
+ else
+ {
+ System.Diagnostics.Debug.WriteLine("璀﹀憡锛氭湭鎵惧埌txt_DepotModel鎺т欢锛岃妫�鏌ユ帶浠禢ame鏄惁姝ｇ‘");
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁txt_DepotModel閫夋嫨鐨勫�艰缃甠kwModel
+ /// </summary>
+ private void SetKwModelBySelectedValue()
+ {
+ // 閲嶇疆妯″瀷鍊�
+ _kwModel = string.Empty;
+
+ // 妫�鏌ユ帶浠舵槸鍚﹀瓨鍦�
+ if (txt_DepotModel == null)
+ {
+ MsgHelper.ShowError("鏈壘鍒板簱浣嶆ā鍨嬮�夋嫨鎺т欢");
+ return;
+ }
+
+ // 鑾峰彇閫夋嫨鐨勫��
+ string selectedValue = txt_DepotModel.EditValue?.ToString().Trim() ?? string.Empty;
+ string selectedText = txt_DepotModel.Text?.Trim() ?? string.Empty;
+
+ // 鍒ゆ柇閫夋嫨鐨勫�煎苟璁剧疆瀵瑰簲鐨勬ā鍨�
+ // 杩欓噷鍚屾椂鍒ゆ柇EditValue鍜孴ext锛岀‘淇濆吋瀹规�э紙鏍规嵁瀹為檯鏁版嵁缁戝畾鎯呭喌璋冩暣锛�
+ if (selectedValue == "搴撲綅鐮侊紙灏忥級" || selectedText == "搴撲綅鐮侊紙灏忥級")
+ {
+ _kwModel = "rpt_KW";
+ }
+ else if (selectedValue == "搴撲綅鐮侊紙澶э級" || selectedText == "搴撲綅鐮侊紙澶э級")
+ {
+ _kwModel = "rpt_KW1";
+ }
+ else
+ {
+ MsgHelper.Warning("璇烽�夋嫨鏈夋晥鐨勫簱浣嶇爜绫诲瀷锛堝皬/澶э級");
+ }
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -275,7 +408,9 @@
private void getPageList(int curPage)
{
gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.depot_code", "asc",
+ var pgq = new PageQueryModel(curPage,
+ this.pageBar1.RowsCount,
+ "org.FNumber asc ,a.depot_code", "asc",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
index 895445d..b348feb 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -30,24 +30,24 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -132,11 +132,11 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptCk = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -204,9 +204,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 = null;
- 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;
@@ -214,10 +215,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,
@@ -226,8 +228,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
@@ -236,6 +239,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
@@ -248,17 +252,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});
@@ -268,7 +274,7 @@
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.ColumnPanelRowHeight = 39;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn1,
this.gv_status,
@@ -285,8 +291,9 @@
this.gv_suppId,
this.gv_remark,
this.gridColumn7});
+ 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;
@@ -296,197 +303,209 @@
//
this.gridColumn1.Caption = "閫�璐х粍缁�";
this.gridColumn1.FieldName = "receivingOrg";
+ this.gridColumn1.MinWidth = 17;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "org.fnamber";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 250;
+ this.gridColumn1.Width = 219;
//
// gv_status
//
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "瀹℃牳鐘舵��";
this.gv_status.FieldName = "status";
- this.gv_status.MaxWidth = 50;
- this.gv_status.MinWidth = 50;
+ this.gv_status.MaxWidth = 44;
+ this.gv_status.MinWidth = 44;
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.STATUS";
this.gv_status.Visible = true;
this.gv_status.VisibleIndex = 1;
- this.gv_status.Width = 50;
+ this.gv_status.Width = 44;
//
// gv_isFinish
//
this.gv_isFinish.AppearanceCell.Options.UseFont = true;
this.gv_isFinish.Caption = "鏄惁瀹屾垚";
this.gv_isFinish.FieldName = "isFinish";
- this.gv_isFinish.MaxWidth = 50;
- this.gv_isFinish.MinWidth = 50;
+ this.gv_isFinish.MaxWidth = 44;
+ this.gv_isFinish.MinWidth = 44;
this.gv_isFinish.Name = "gv_isFinish";
this.gv_isFinish.OptionsColumn.AllowEdit = false;
this.gv_isFinish.Tag = "query_a.IS_FINISH";
- this.gv_isFinish.Width = 50;
+ this.gv_isFinish.Width = 44;
//
// gv_isOut
//
this.gv_isOut.AppearanceCell.Options.UseFont = true;
this.gv_isOut.Caption = "濮斿鏍囪瘑";
this.gv_isOut.FieldName = "isOut";
- this.gv_isOut.MaxWidth = 50;
- this.gv_isOut.MinWidth = 50;
+ this.gv_isOut.MaxWidth = 44;
+ this.gv_isOut.MinWidth = 44;
this.gv_isOut.Name = "gv_isOut";
this.gv_isOut.OptionsColumn.AllowEdit = false;
this.gv_isOut.Tag = "query_a.IS_OUT";
this.gv_isOut.Visible = true;
this.gv_isOut.VisibleIndex = 2;
- this.gv_isOut.Width = 50;
+ this.gv_isOut.Width = 44;
//
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍗曟嵁缂栫爜";
this.gv_billNo.FieldName = "billNo";
+ this.gv_billNo.MinWidth = 17;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 3;
- this.gv_billNo.Width = 120;
+ this.gv_billNo.Width = 105;
//
// gv_lastUpdateUser
//
this.gv_lastUpdateUser.AppearanceCell.Options.UseFont = true;
this.gv_lastUpdateUser.Caption = "鏈�鍚庤窡鏂颁汉 ";
this.gv_lastUpdateUser.FieldName = "lastUpdateUser";
+ this.gv_lastUpdateUser.MinWidth = 17;
this.gv_lastUpdateUser.Name = "gv_lastUpdateUser";
this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false;
this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER";
this.gv_lastUpdateUser.Visible = true;
this.gv_lastUpdateUser.VisibleIndex = 4;
- this.gv_lastUpdateUser.Width = 94;
+ this.gv_lastUpdateUser.Width = 82;
//
// gv_lastUpdateTime
//
this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
this.gv_lastUpdateTime.Caption = "鏈�鍚庝慨鏀规椂闂� ";
this.gv_lastUpdateTime.FieldName = "lastUpdateTime";
+ this.gv_lastUpdateTime.MinWidth = 17;
this.gv_lastUpdateTime.Name = "gv_lastUpdateTime";
this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME";
this.gv_lastUpdateTime.Visible = true;
this.gv_lastUpdateTime.VisibleIndex = 5;
- this.gv_lastUpdateTime.Width = 180;
+ this.gv_lastUpdateTime.Width = 157;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
this.gv_checkUser.FieldName = "checkUser";
+ this.gv_checkUser.MinWidth = 17;
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
this.gv_checkUser.VisibleIndex = 6;
- this.gv_checkUser.Width = 94;
+ this.gv_checkUser.Width = 82;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃堕棿 ";
this.gv_checkDate.FieldName = "checkDate";
+ this.gv_checkDate.MinWidth = 17;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.CHECK_DATE";
this.gv_checkDate.Visible = true;
this.gv_checkDate.VisibleIndex = 7;
- this.gv_checkDate.Width = 94;
+ this.gv_checkDate.Width = 82;
//
// gv_returnMethod
//
this.gv_returnMethod.AppearanceCell.Options.UseFont = true;
this.gv_returnMethod.Caption = "閫�鏂欐柟寮� ";
this.gv_returnMethod.FieldName = "returnMethod";
+ this.gv_returnMethod.MinWidth = 17;
this.gv_returnMethod.Name = "gv_returnMethod";
this.gv_returnMethod.OptionsColumn.AllowEdit = false;
this.gv_returnMethod.Tag = "query_a.RETURN_METHOD";
this.gv_returnMethod.Visible = true;
this.gv_returnMethod.VisibleIndex = 8;
- this.gv_returnMethod.Width = 94;
+ this.gv_returnMethod.Width = 82;
//
// gv_returnType
//
this.gv_returnType.AppearanceCell.Options.UseFont = true;
this.gv_returnType.Caption = "閫�鏂欑被鍨� ";
this.gv_returnType.FieldName = "returnType";
+ this.gv_returnType.MinWidth = 17;
this.gv_returnType.Name = "gv_returnType";
this.gv_returnType.OptionsColumn.AllowEdit = false;
this.gv_returnType.Tag = "query_a.RETURN_TYPE";
this.gv_returnType.Visible = true;
this.gv_returnType.VisibleIndex = 9;
- this.gv_returnType.Width = 94;
+ this.gv_returnType.Width = 82;
//
// gv_depotId
//
this.gv_depotId.AppearanceCell.Options.UseFont = true;
this.gv_depotId.Caption = "浠撳簱";
this.gv_depotId.FieldName = "dptName";
+ this.gv_depotId.MinWidth = 17;
this.gv_depotId.Name = "gv_depotId";
this.gv_depotId.OptionsColumn.AllowEdit = false;
this.gv_depotId.Tag = "query_a.DEPOT_ID";
this.gv_depotId.Visible = true;
this.gv_depotId.VisibleIndex = 10;
- this.gv_depotId.Width = 94;
+ this.gv_depotId.Width = 82;
//
// gv_suppId
//
this.gv_suppId.AppearanceCell.Options.UseFont = true;
this.gv_suppId.Caption = "渚涘簲鍟�";
this.gv_suppId.FieldName = "supName";
+ this.gv_suppId.MinWidth = 17;
this.gv_suppId.Name = "gv_suppId";
this.gv_suppId.OptionsColumn.AllowEdit = false;
this.gv_suppId.Tag = "query_a.SUPP_ID";
this.gv_suppId.Visible = true;
this.gv_suppId.VisibleIndex = 11;
- this.gv_suppId.Width = 94;
+ this.gv_suppId.Width = 82;
//
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "鐢宠澶囨敞";
this.gv_remark.FieldName = "remark";
+ this.gv_remark.MinWidth = 17;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.REMARK";
this.gv_remark.Visible = true;
this.gv_remark.VisibleIndex = 12;
- this.gv_remark.Width = 94;
+ this.gv_remark.Width = 82;
//
// gridColumn7
//
this.gridColumn7.Caption = "涓婚敭GUID";
this.gridColumn7.FieldName = "guid";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 22;
this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Width = 94;
+ this.gridColumn7.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
@@ -494,6 +513,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
@@ -506,8 +526,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 = 146;
+ this.splitMx1.Size = new System.Drawing.Size(985, 442);
+ this.splitMx1.SplitterPosition = 114;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -533,28 +553,30 @@
this.layoutControlItem17,
this.layoutControlItem13});
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(832, 224, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 146);
+ this.layoutMx1.Size = new System.Drawing.Size(985, 114);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 105);
+ this.btnSelect.Location = new System.Drawing.Point(12, 84);
+ this.btnSelect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(116, 27);
+ this.btnSelect.Size = new System.Drawing.Size(101, 20);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 525;
this.btnSelect.Text = "閫夋嫨閫�璐ф槑缁�";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(840, 114);
+ this.lbGuid.Location = new System.Drawing.Point(735, 89);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(274, 30);
+ this.lbGuid.Size = new System.Drawing.Size(240, 23);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
@@ -562,15 +584,17 @@
// txt_thOrgId
//
this.txt_thOrgId.IsReadly = false;
- this.txt_thOrgId.Location = new System.Drawing.Point(114, 43);
+ this.txt_thOrgId.Location = new System.Drawing.Point(96, 36);
+ this.txt_thOrgId.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_thOrgId.Name = "txt_thOrgId";
- this.txt_thOrgId.Size = new System.Drawing.Size(170, 24);
+ this.txt_thOrgId.Size = new System.Drawing.Size(149, 20);
this.txt_thOrgId.TabIndex = 526;
//
// txt_returnType
//
this.txt_returnType.EditValue = "-璇烽�夋嫨-";
- this.txt_returnType.Location = new System.Drawing.Point(390, 74);
+ this.txt_returnType.Location = new System.Drawing.Point(333, 60);
+ this.txt_returnType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_returnType.Name = "txt_returnType";
this.txt_returnType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -582,16 +606,17 @@
"渚涘簲鍟嗙墿鍝佸彿閿欒",
"閲囪喘鏂欏彿鍙樻洿"});
this.txt_returnType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_returnType.Size = new System.Drawing.Size(170, 24);
+ this.txt_returnType.Size = new System.Drawing.Size(149, 20);
this.txt_returnType.StyleController = this.layoutMx1;
this.txt_returnType.TabIndex = 521;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(114, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(96, 12);
+ this.txt_billNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(149, 20);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
@@ -599,7 +624,8 @@
// txt_returnMethod
//
this.txt_returnMethod.EditValue = "-璇烽�夋嫨-";
- this.txt_returnMethod.Location = new System.Drawing.Point(390, 43);
+ this.txt_returnMethod.Location = new System.Drawing.Point(333, 36);
+ this.txt_returnMethod.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_returnMethod.Name = "txt_returnMethod";
this.txt_returnMethod.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -608,35 +634,38 @@
"閫�鏂欒ˉ鏂�",
"閫�鏂欏苟鎵ｆ"});
this.txt_returnMethod.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_returnMethod.Size = new System.Drawing.Size(170, 24);
+ this.txt_returnMethod.Size = new System.Drawing.Size(149, 20);
this.txt_returnMethod.StyleController = this.layoutMx1;
this.txt_returnMethod.TabIndex = 520;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(942, 43);
+ this.txt_checkDate.Location = new System.Drawing.Point(807, 36);
+ this.txt_checkDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(172, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(149, 20);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 226;
this.txt_checkDate.Tag = "readonly";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(390, 105);
+ this.txt_remark.Location = new System.Drawing.Point(333, 84);
+ this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(446, 24);
+ this.txt_remark.Size = new System.Drawing.Size(386, 20);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 252;
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(942, 12);
+ this.txt_checkUser.Location = new System.Drawing.Point(807, 12);
+ this.txt_checkUser.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(172, 24);
+ this.txt_checkUser.Size = new System.Drawing.Size(149, 20);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 222;
this.txt_checkUser.Tag = "readonly";
@@ -644,65 +673,71 @@
// txt_suppId
//
this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(114, 74);
+ this.txt_suppId.Location = new System.Drawing.Point(96, 60);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(170, 24);
+ this.txt_suppId.Size = new System.Drawing.Size(149, 20);
this.txt_suppId.TabIndex = 259;
//
// txt_isOut
//
- this.txt_isOut.Location = new System.Drawing.Point(288, 12);
+ this.txt_isOut.Location = new System.Drawing.Point(249, 12);
+ this.txt_isOut.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_isOut.Name = "txt_isOut";
this.txt_isOut.Properties.Caption = "濮斿鏍囪瘑";
- this.txt_isOut.Size = new System.Drawing.Size(272, 24);
+ this.txt_isOut.Size = new System.Drawing.Size(233, 20);
this.txt_isOut.StyleController = this.layoutMx1;
this.txt_isOut.TabIndex = 527;
this.txt_isOut.Tag = "readOnly";
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(840, 74);
+ this.txt_status.Location = new System.Drawing.Point(723, 60);
+ this.txt_status.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_status.Size = new System.Drawing.Size(274, 24);
+ this.txt_status.Size = new System.Drawing.Size(233, 20);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 528;
this.txt_status.Tag = "readonly";
//
// txt_isFinish
//
- this.txt_isFinish.Location = new System.Drawing.Point(564, 74);
+ this.txt_isFinish.Location = new System.Drawing.Point(486, 60);
+ this.txt_isFinish.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_isFinish.Name = "txt_isFinish";
this.txt_isFinish.Properties.Caption = "瀹岀粨鏍囪瘑";
- this.txt_isFinish.Size = new System.Drawing.Size(272, 24);
+ this.txt_isFinish.Size = new System.Drawing.Size(233, 20);
this.txt_isFinish.StyleController = this.layoutMx1;
this.txt_isFinish.TabIndex = 529;
this.txt_isFinish.Tag = "readonly";
//
// lastUpdateUser
//
- this.lastUpdateUser.Location = new System.Drawing.Point(666, 12);
+ this.lastUpdateUser.Location = new System.Drawing.Point(570, 12);
+ this.lastUpdateUser.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.lastUpdateUser.Name = "lastUpdateUser";
- this.lastUpdateUser.Size = new System.Drawing.Size(170, 24);
+ this.lastUpdateUser.Size = new System.Drawing.Size(149, 20);
this.lastUpdateUser.StyleController = this.layoutMx1;
this.lastUpdateUser.TabIndex = 530;
this.lastUpdateUser.Tag = "readonly";
//
// lastUpdateTime
//
- this.lastUpdateTime.Location = new System.Drawing.Point(666, 43);
+ this.lastUpdateTime.Location = new System.Drawing.Point(570, 36);
+ this.lastUpdateTime.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.lastUpdateTime.Name = "lastUpdateTime";
- this.lastUpdateTime.Size = new System.Drawing.Size(170, 24);
+ this.lastUpdateTime.Size = new System.Drawing.Size(149, 20);
this.lastUpdateTime.StyleController = this.layoutMx1;
this.lastUpdateTime.TabIndex = 531;
this.lastUpdateTime.Tag = "readonly";
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(942, 148);
+ this.txt_guid.Location = new System.Drawing.Point(824, 115);
+ this.txt_guid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(172, 24);
+ this.txt_guid.Size = new System.Drawing.Size(150, 20);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 532;
//
@@ -715,7 +750,7 @@
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem17.Size = new System.Drawing.Size(278, 35);
this.layoutControlItem17.Text = "涓婚敭Guid";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(50, 20);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(44, 16);
//
// layoutControlItem13
//
@@ -750,33 +785,33 @@
this.layoutControlItem16});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8});
- this.Root.Size = new System.Drawing.Size(1126, 146);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(968, 116);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -784,49 +819,49 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
+ 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_thOrgId;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
+ 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, 31);
+ 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);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_returnType;
- this.layoutControlItem6.Location = new System.Drawing.Point(276, 62);
+ this.layoutControlItem6.Location = new System.Drawing.Point(237, 48);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 31);
+ 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);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_returnMethod;
- this.layoutControlItem5.Location = new System.Drawing.Point(276, 31);
+ this.layoutControlItem5.Location = new System.Drawing.Point(237, 24);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
+ 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);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_isOut;
- this.layoutControlItem8.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(237, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem8.Text = "濮斿鏍囪瘑";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
@@ -835,65 +870,65 @@
//
this.layoutControlItem9.Control = this.txt_checkUser;
this.layoutControlItem9.CustomizationFormText = "瀹℃牳浜哄憳";
- this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(711, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(278, 31);
+ 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_checkDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(828, 31);
+ this.layoutControlItem10.Location = new System.Drawing.Point(711, 24);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(278, 31);
+ 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);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.lastUpdateUser;
- this.layoutControlItem14.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(474, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem14.Text = "鏈�鍚庢洿鏂颁汉";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.lastUpdateTime;
- this.layoutControlItem15.Location = new System.Drawing.Point(552, 31);
+ this.layoutControlItem15.Location = new System.Drawing.Point(474, 24);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem15.Text = "鏈�鍚庢洿鏂版椂闂�";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_remark;
- this.layoutControlItem7.Location = new System.Drawing.Point(276, 93);
+ this.layoutControlItem7.Location = new System.Drawing.Point(237, 72);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem7.Size = new System.Drawing.Size(552, 33);
+ this.layoutControlItem7.Size = new System.Drawing.Size(474, 24);
this.layoutControlItem7.Text = "鐢宠澶囨敞";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_status;
- this.layoutControlItem11.Location = new System.Drawing.Point(828, 62);
+ this.layoutControlItem11.Location = new System.Drawing.Point(711, 48);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -901,11 +936,11 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_isFinish;
- this.layoutControlItem12.Location = new System.Drawing.Point(552, 62);
+ this.layoutControlItem12.Location = new System.Drawing.Point(474, 48);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
@@ -913,22 +948,22 @@
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_suppId;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 48);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem4.Text = "閫変緵搴斿晢";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.btnSelect;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 93);
- this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
- this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 72);
+ this.layoutControlItem16.MaxSize = new System.Drawing.Size(105, 24);
+ this.layoutControlItem16.MinSize = new System.Drawing.Size(17, 24);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(276, 33);
+ this.layoutControlItem16.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "閫�璐ф槑缁�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -938,9 +973,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, 412);
+ this.tabMx.Size = new System.Drawing.Size(985, 318);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -948,20 +984,23 @@
// 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, 380);
+ this.tabMxPage1.Size = new System.Drawing.Size(983, 292);
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.repositoryItemButtonEdit1,
this.rptCk});
- this.gcMx1.Size = new System.Drawing.Size(1124, 380);
+ this.gcMx1.Size = new System.Drawing.Size(983, 292);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -992,6 +1031,7 @@
this.gridColumn8,
this.gridColumn10,
this.gridColumn9});
+ this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1002,113 +1042,113 @@
//
this.rkmxGuid.Caption = "鍏ュ簱鏄庣粏GUID";
this.rkmxGuid.FieldName = "rkmxGuid";
- this.rkmxGuid.MinWidth = 25;
+ this.rkmxGuid.MinWidth = 22;
this.rkmxGuid.Name = "rkmxGuid";
- this.rkmxGuid.Width = 94;
+ this.rkmxGuid.Width = 82;
//
// gvMx1id
//
this.gvMx1id.AppearanceCell.Options.UseFont = true;
this.gvMx1id.Caption = "鏄庣粏GUID";
this.gvMx1id.FieldName = "id";
- this.gvMx1id.MinWidth = 50;
+ this.gvMx1id.MinWidth = 44;
this.gvMx1id.Name = "gvMx1id";
this.gvMx1id.Tag = "query_a.ID";
- this.gvMx1id.Width = 94;
+ this.gvMx1id.Width = 82;
//
// gvMx1mid
//
this.gvMx1mid.AppearanceCell.Options.UseFont = true;
this.gvMx1mid.Caption = "涓昏〃GUID";
this.gvMx1mid.FieldName = "mid";
- this.gvMx1mid.MinWidth = 50;
+ this.gvMx1mid.MinWidth = 44;
this.gvMx1mid.Name = "gvMx1mid";
this.gvMx1mid.Tag = "query_a.MID";
- this.gvMx1mid.Width = 94;
+ this.gvMx1mid.Width = 82;
//
// gvMx1isFinish
//
this.gvMx1isFinish.AppearanceCell.Options.UseFont = true;
this.gvMx1isFinish.Caption = "鏄惁瀹屾垚";
this.gvMx1isFinish.FieldName = "isFinish";
- this.gvMx1isFinish.MinWidth = 50;
+ this.gvMx1isFinish.MinWidth = 44;
this.gvMx1isFinish.Name = "gvMx1isFinish";
this.gvMx1isFinish.Tag = "query_a.IS_FINISH";
- this.gvMx1isFinish.Width = 94;
+ this.gvMx1isFinish.Width = 82;
//
// gvMx1invBillNo
//
this.gvMx1invBillNo.AppearanceCell.Options.UseFont = true;
this.gvMx1invBillNo.Caption = "鍏ュ簱鍗曞彿";
this.gvMx1invBillNo.FieldName = "invBillNo";
- this.gvMx1invBillNo.MinWidth = 50;
+ this.gvMx1invBillNo.MinWidth = 44;
this.gvMx1invBillNo.Name = "gvMx1invBillNo";
this.gvMx1invBillNo.Tag = "query_a.INV_BILL_NO";
this.gvMx1invBillNo.Visible = true;
this.gvMx1invBillNo.VisibleIndex = 1;
- this.gvMx1invBillNo.Width = 94;
+ this.gvMx1invBillNo.Width = 82;
//
// gvMx1ebeln
//
this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
this.gvMx1ebeln.Caption = "閲囪喘鍗曞彿";
this.gvMx1ebeln.FieldName = "cgdh";
- this.gvMx1ebeln.MinWidth = 50;
+ this.gvMx1ebeln.MinWidth = 44;
this.gvMx1ebeln.Name = "gvMx1ebeln";
this.gvMx1ebeln.Tag = "query_a.EBELN";
this.gvMx1ebeln.Visible = true;
this.gvMx1ebeln.VisibleIndex = 2;
- this.gvMx1ebeln.Width = 94;
+ this.gvMx1ebeln.Width = 82;
//
// gvMx1itemId
//
this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
this.gvMx1itemId.Caption = "鐗╂枡ID";
this.gvMx1itemId.FieldName = "itemId";
- this.gvMx1itemId.MinWidth = 50;
+ this.gvMx1itemId.MinWidth = 44;
this.gvMx1itemId.Name = "gvMx1itemId";
this.gvMx1itemId.Tag = "query_a.ITEM_ID";
- this.gvMx1itemId.Width = 94;
+ this.gvMx1itemId.Width = 82;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡缂栫爜";
this.gridColumn2.FieldName = "wlbm";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 22;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 3;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 82;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
this.gridColumn5.FieldName = "wlmc";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 22;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 4;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 82;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡瑙勬牸";
this.gridColumn3.FieldName = "wlgg";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 22;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 5;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 82;
//
// gridColumn4
//
this.gridColumn4.Caption = "鍗曚綅";
this.gridColumn4.FieldName = "dwName";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 22;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 6;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 82;
//
// gvMx1sqNum
//
@@ -1119,24 +1159,24 @@
this.gvMx1sqNum.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1sqNum.Caption = "鐢宠鏁伴噺";
this.gvMx1sqNum.FieldName = "sqNum";
- this.gvMx1sqNum.MinWidth = 50;
+ this.gvMx1sqNum.MinWidth = 44;
this.gvMx1sqNum.Name = "gvMx1sqNum";
this.gvMx1sqNum.Tag = "yz_quantity_0_edit";
this.gvMx1sqNum.Visible = true;
this.gvMx1sqNum.VisibleIndex = 8;
- this.gvMx1sqNum.Width = 94;
+ this.gvMx1sqNum.Width = 82;
//
// gvMx1ysNum
//
this.gvMx1ysNum.AppearanceCell.Options.UseFont = true;
this.gvMx1ysNum.Caption = "宸叉壂鏁伴噺";
this.gvMx1ysNum.FieldName = "ysNum";
- this.gvMx1ysNum.MinWidth = 50;
+ this.gvMx1ysNum.MinWidth = 44;
this.gvMx1ysNum.Name = "gvMx1ysNum";
this.gvMx1ysNum.Tag = "query_a.YS_NUM";
this.gvMx1ysNum.Visible = true;
this.gvMx1ysNum.VisibleIndex = 11;
- this.gvMx1ysNum.Width = 94;
+ this.gvMx1ysNum.Width = 82;
//
// gvMx1remark
//
@@ -1147,72 +1187,72 @@
this.gvMx1remark.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1remark.Caption = "澶囨敞";
this.gvMx1remark.FieldName = "remark";
- this.gvMx1remark.MinWidth = 50;
+ this.gvMx1remark.MinWidth = 44;
this.gvMx1remark.Name = "gvMx1remark";
this.gvMx1remark.Tag = "edit";
this.gvMx1remark.Visible = true;
this.gvMx1remark.VisibleIndex = 10;
- this.gvMx1remark.Width = 94;
+ this.gvMx1remark.Width = 82;
//
// gvMx1orderNo
//
this.gvMx1orderNo.AppearanceCell.Options.UseFont = true;
this.gvMx1orderNo.Caption = "搴忓彿";
this.gvMx1orderNo.FieldName = "orderNo";
- this.gvMx1orderNo.MinWidth = 50;
+ this.gvMx1orderNo.MinWidth = 44;
this.gvMx1orderNo.Name = "gvMx1orderNo";
this.gvMx1orderNo.Tag = "query_a.ORDER_NO";
this.gvMx1orderNo.Visible = true;
this.gvMx1orderNo.VisibleIndex = 0;
- this.gvMx1orderNo.Width = 94;
+ this.gvMx1orderNo.Width = 82;
//
// gvMx1eid
//
this.gvMx1eid.AppearanceCell.Options.UseFont = true;
this.gvMx1eid.Caption = "閲囪喘璁㈠崟ID";
this.gvMx1eid.FieldName = "eid";
- this.gvMx1eid.MinWidth = 50;
+ this.gvMx1eid.MinWidth = 44;
this.gvMx1eid.Name = "gvMx1eid";
this.gvMx1eid.Tag = "query_a.EID";
- this.gvMx1eid.Width = 94;
+ this.gvMx1eid.Width = 82;
//
// gvMx1erpid
//
this.gvMx1erpid.AppearanceCell.Options.UseFont = true;
this.gvMx1erpid.Caption = "閲囪喘璁㈠崟琛孖D";
this.gvMx1erpid.FieldName = "erpid";
- this.gvMx1erpid.MinWidth = 50;
+ this.gvMx1erpid.MinWidth = 44;
this.gvMx1erpid.Name = "gvMx1erpid";
this.gvMx1erpid.Tag = "query_a.ERPID";
- this.gvMx1erpid.Width = 94;
+ this.gvMx1erpid.Width = 82;
//
// gvMx1invWorkLine
//
this.gvMx1invWorkLine.AppearanceCell.Options.UseFont = true;
this.gvMx1invWorkLine.Caption = "鍏ュ簱鍗曡鍙�";
this.gvMx1invWorkLine.FieldName = "invWorkLine";
- this.gvMx1invWorkLine.MinWidth = 50;
+ this.gvMx1invWorkLine.MinWidth = 44;
this.gvMx1invWorkLine.Name = "gvMx1invWorkLine";
this.gvMx1invWorkLine.Tag = "query_a.INV_WORK_LINE";
- this.gvMx1invWorkLine.Width = 94;
+ this.gvMx1invWorkLine.Width = 82;
//
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.MinWidth = 22;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
this.gvMxDel.VisibleIndex = 13;
- this.gvMxDel.Width = 94;
+ this.gvMxDel.Width = 82;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1221,21 +1261,31 @@
//
this.gridColumn6.Caption = "鍏ュ簱鏁伴噺";
this.gridColumn6.FieldName = "rksl";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 22;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 7;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 82;
//
// gridColumn8
//
this.gridColumn8.Caption = "褰撳墠搴撳瓨";
this.gridColumn8.FieldName = "kcQty";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 22;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 12;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.Width = 82;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "浠撳簱ID";
+ this.gridColumn10.FieldName = "depotId";
+ this.gridColumn10.MinWidth = 22;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 14;
+ this.gridColumn10.Width = 82;
//
// gridColumn9
//
@@ -1246,50 +1296,42 @@
this.gridColumn9.Caption = "閫夋嫨浠撳簱";
this.gridColumn9.ColumnEdit = this.rptCk;
this.gridColumn9.FieldName = "depotName";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 22;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 9;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 82;
//
// rptCk
//
this.rptCk.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptCk.Name = "rptCk";
this.rptCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptCk_ButtonClick);
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(965, 64);
+ this.picCheckBox.Location = new System.Drawing.Point(844, 50);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(88, 39);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 8;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn10
- //
- this.gridColumn10.Caption = "浠撳簱ID";
- this.gridColumn10.FieldName = "depotId";
- this.gridColumn10.MinWidth = 25;
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 14;
- this.gridColumn10.Width = 94;
- //
// Frm_MesCgthSq
//
- 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.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "Frm_MesCgthSq";
this.Text = "閲囪喘閫�璐х敵璇�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index ffdbd65..4de8d0c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -326,12 +326,14 @@
string _FupAllow = row["FupAllow"].ToString();
string _FdownAllow = row["FdownAllow"].ToString();
string _isRzxxTxt = row["isRzxx"].ToString();
+ decimal _ycsl = 0;
bool _isRzxx = false;
if (_isRzxxTxt == "1" || _isRzxxTxt.ToUpper() == "true".ToUpper())
_isRzxx = true;
//鍋囧涓変釜閮戒负绌洪�氳繃
if (string.IsNullOrEmpty(_Fstand) && string.IsNullOrEmpty(_FupAllow) && string.IsNullOrEmpty(_FdownAllow))
{
+
}
else
{
@@ -340,7 +342,7 @@
decimal _Fstand_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_Fstand);
decimal _FupAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FupAllow);
decimal _FdownAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FdownAllow);
- if (_Fstand_f >= _FdownAllow_f && _Fstand_f <= _FupAllow_f) { }
+ if (_Fstand_f >= _FdownAllow_f && _Fstand_f <= _FupAllow_f) { _ycsl = 5; }
else
{
MsgHelper.ShowError("鏍囧噯鍊煎繀椤诲湪涓婇檺鍜屼笅闄愪箣闂达紒");
@@ -367,7 +369,8 @@
Memo = row["memo"].ToString(),
FupAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FupAllow"].ToString()),
FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
- ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
+ //ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
+ ypsl = _ycsl,
stationName = row["stationName"].ToString(),
FcheckType = row["FcheckType"].ToString(),
isRzxx = _isRzxx,
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
index 50b4232..e25a35c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
@@ -403,10 +403,10 @@
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(567, 58);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(570, 60);
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(151, 20);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(149, 20);
this.txt_psnQty_1.StyleController = this.layoutMx1;
this.txt_psnQty_1.TabIndex = 273;
this.txt_psnQty_1.Tag = "readOnly-1";
@@ -415,7 +415,7 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(484, 80);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(485, 82);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
@@ -424,21 +424,20 @@
//
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(567, 34);
+ this.txt_iCount_1.Location = new System.Drawing.Point(570, 36);
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(151, 20);
- this.txt_iCount_1.StyleController = this.layoutMx1;
+ this.txt_iCount_1.Size = new System.Drawing.Size(149, 20);
this.txt_iCount_1.TabIndex = 272;
this.txt_iCount_1.Tag = "readOnly-1";
//
// txt_fSubsidiary
//
- this.txt_fSubsidiary.Location = new System.Drawing.Point(93, 10);
+ this.txt_fSubsidiary.Location = new System.Drawing.Point(96, 12);
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(151, 20);
+ this.txt_fSubsidiary.Size = new System.Drawing.Size(149, 20);
this.txt_fSubsidiary.StyleController = this.layoutMx1;
this.txt_fSubsidiary.TabIndex = 270;
this.txt_fSubsidiary.Tag = "";
@@ -446,85 +445,85 @@
// txt_suppNo_1
//
this.txt_suppNo_1.IsReadly = false;
- this.txt_suppNo_1.Location = new System.Drawing.Point(567, 10);
+ this.txt_suppNo_1.Location = new System.Drawing.Point(570, 12);
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(151, 20);
+ this.txt_suppNo_1.Size = new System.Drawing.Size(149, 20);
this.txt_suppNo_1.TabIndex = 264;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(93, 34);
+ this.txt_itemNo.Location = new System.Drawing.Point(96, 36);
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(151, 20);
+ this.txt_itemNo.Size = new System.Drawing.Size(149, 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(93, 58);
+ this.txt_itemName.Location = new System.Drawing.Point(96, 60);
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(151, 20);
+ this.txt_itemName.Size = new System.Drawing.Size(149, 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(93, 82);
+ this.txt_itemModel.Location = new System.Drawing.Point(96, 84);
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(388, 20);
+ this.txt_itemModel.Size = new System.Drawing.Size(386, 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(330, 10);
+ this.txt_suppId.Location = new System.Drawing.Point(333, 12);
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(151, 20);
+ this.txt_suppId.Size = new System.Drawing.Size(149, 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(330, 34);
+ this.txt_createDate1.Location = new System.Drawing.Point(333, 36);
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(151, 20);
+ this.txt_createDate1.Size = new System.Drawing.Size(149, 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(330, 58);
+ this.txt_itemUnit.Location = new System.Drawing.Point(333, 60);
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(151, 20);
+ this.txt_itemUnit.Size = new System.Drawing.Size(149, 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(722, 10);
+ this.txt_tc_1.Location = new System.Drawing.Point(723, 12);
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(235, 20);
+ this.txt_tc_1.Size = new System.Drawing.Size(233, 20);
this.txt_tc_1.StyleController = this.layoutMx1;
this.txt_tc_1.TabIndex = 276;
//
@@ -585,7 +584,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(968, 112);
+ this.Root.Size = new System.Drawing.Size(968, 116);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -713,7 +712,7 @@
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(239, 24);
+ this.txt_tc_1123.Size = new System.Drawing.Size(237, 24);
this.txt_tc_1123.Text = "鐗归噰鏍囪瘑";
this.txt_tc_1123.TextSize = new System.Drawing.Size(0, 0);
this.txt_tc_1123.TextVisible = false;
--
Gitblit v1.9.3