From 4285bc523e002a33cb6c98fe71278cba01abd460 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期二, 11 十一月 2025 08:57:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs | 392 +++++++++-------
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 424 ++++++++--------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs | 218 +++++----
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | 400 +++++++++-------
5 files changed, 768 insertions(+), 670 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 8cf35bf..432ab84 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -37,8 +37,8 @@
<appSettings>
<!--<add key="webapiurl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index bfbc006..887488c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -127,7 +127,7 @@
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
this.txt_itemId = new DevExpress.XtraEditors.TextEdit();
- this.txt_fcheckBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fcheckByName = new DevExpress.XtraEditors.TextEdit();
this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
this.txt_fsubmitDate = new DevExpress.XtraEditors.TextEdit();
this.txt_fsubmitBy = new DevExpress.XtraEditors.TextEdit();
@@ -276,7 +276,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckByName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).BeginInit();
@@ -379,7 +379,7 @@
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(5, 5, 5, 5);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(1796, 98);
@@ -391,7 +391,7 @@
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
this.xtraTabControl1.Size = new System.Drawing.Size(1796, 880);
@@ -403,7 +403,7 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1794, 842);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
@@ -414,7 +414,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(4, 4, 4, 4);
+ this.split1.Margin = new System.Windows.Forms.Padding(4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -434,10 +434,10 @@
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
this.gcMain1.Size = new System.Drawing.Size(1794, 781);
this.gcMain1.TabIndex = 2;
@@ -831,7 +831,7 @@
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.Size = new System.Drawing.Size(1794, 842);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
@@ -841,7 +841,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(4, 4, 4, 4);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -875,7 +875,7 @@
this.layoutMx1.Controls.Add(this.txt_itemNo);
this.layoutMx1.Controls.Add(this.txt_itemModel);
this.layoutMx1.Controls.Add(this.txt_itemId);
- this.layoutMx1.Controls.Add(this.txt_fcheckBy);
+ this.layoutMx1.Controls.Add(this.txt_fcheckByName);
this.layoutMx1.Controls.Add(this.txt_fbatchQty);
this.layoutMx1.Controls.Add(this.txt_fsubmitDate);
this.layoutMx1.Controls.Add(this.txt_fsubmitBy);
@@ -895,7 +895,7 @@
this.layoutControlItem21,
this.layoutControlItem23});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(381, 412, 812, 500);
this.layoutMx1.Root = this.Root;
@@ -906,10 +906,10 @@
// txt_xblb
//
this.txt_xblb.BtnTxt = "閫夊埆绫诲埆";
- this.txt_xblb.Location = new System.Drawing.Point(1340, 242);
- this.txt_xblb.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txt_xblb.Location = new System.Drawing.Point(1341, 244);
+ this.txt_xblb.Margin = new System.Windows.Forms.Padding(5);
this.txt_xblb.Name = "txt_xblb";
- this.txt_xblb.Size = new System.Drawing.Size(440, 74);
+ this.txt_xblb.Size = new System.Drawing.Size(441, 74);
this.txt_xblb.TabIndex = 820;
this.txt_xblb.TextTxt = "";
this.txt_xblb.WhereTxt = " a.s_type=\'OA閫夊埆绫诲埆\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -925,54 +925,54 @@
this.layWeight.Controls.Add(this.txtWCurrent);
this.layWeight.Controls.Add(this.txt_weight5);
this.layWeight.Controls.Add(this.btnClean);
- this.layWeight.Location = new System.Drawing.Point(12, 278);
+ this.layWeight.Location = new System.Drawing.Point(10, 281);
this.layWeight.Margin = new System.Windows.Forms.Padding(0);
this.layWeight.Name = "layWeight";
this.layWeight.Root = this.layoutControlGroup2;
- this.layWeight.Size = new System.Drawing.Size(1326, 40);
+ this.layWeight.Size = new System.Drawing.Size(1329, 39);
this.layWeight.TabIndex = 818;
this.layWeight.Text = "layoutControl1";
//
// txt_weight1
//
- this.txt_weight1.Location = new System.Drawing.Point(63, 2);
- this.txt_weight1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_weight1.Location = new System.Drawing.Point(60, 2);
+ this.txt_weight1.Margin = new System.Windows.Forms.Padding(4);
this.txt_weight1.Name = "txt_weight1";
this.txt_weight1.Properties.ReadOnly = true;
- this.txt_weight1.Size = new System.Drawing.Size(99, 28);
+ this.txt_weight1.Size = new System.Drawing.Size(104, 28);
this.txt_weight1.StyleController = this.layWeight;
this.txt_weight1.TabIndex = 4;
this.txt_weight1.Tag = "readonly";
//
// txt_weight2
//
- this.txt_weight2.Location = new System.Drawing.Point(227, 2);
- this.txt_weight2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_weight2.Location = new System.Drawing.Point(226, 2);
+ this.txt_weight2.Margin = new System.Windows.Forms.Padding(4);
this.txt_weight2.Name = "txt_weight2";
this.txt_weight2.Properties.ReadOnly = true;
- this.txt_weight2.Size = new System.Drawing.Size(101, 28);
+ this.txt_weight2.Size = new System.Drawing.Size(104, 28);
this.txt_weight2.StyleController = this.layWeight;
this.txt_weight2.TabIndex = 5;
this.txt_weight2.Tag = "readonly";
//
// txt_weight3
//
- this.txt_weight3.Location = new System.Drawing.Point(393, 2);
- this.txt_weight3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_weight3.Location = new System.Drawing.Point(392, 2);
+ this.txt_weight3.Margin = new System.Windows.Forms.Padding(4);
this.txt_weight3.Name = "txt_weight3";
this.txt_weight3.Properties.ReadOnly = true;
- this.txt_weight3.Size = new System.Drawing.Size(101, 28);
+ this.txt_weight3.Size = new System.Drawing.Size(104, 28);
this.txt_weight3.StyleController = this.layWeight;
this.txt_weight3.TabIndex = 6;
this.txt_weight3.Tag = "readonly";
//
// txt_weight4
//
- this.txt_weight4.Location = new System.Drawing.Point(559, 2);
- this.txt_weight4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_weight4.Location = new System.Drawing.Point(558, 2);
+ this.txt_weight4.Margin = new System.Windows.Forms.Padding(4);
this.txt_weight4.Name = "txt_weight4";
this.txt_weight4.Properties.ReadOnly = true;
- this.txt_weight4.Size = new System.Drawing.Size(101, 28);
+ this.txt_weight4.Size = new System.Drawing.Size(104, 28);
this.txt_weight4.StyleController = this.layWeight;
this.txt_weight4.TabIndex = 7;
this.txt_weight4.Tag = "readonly";
@@ -983,8 +983,8 @@
this.btnW.Appearance.ForeColor = System.Drawing.Color.White;
this.btnW.Appearance.Options.UseBackColor = true;
this.btnW.Appearance.Options.UseForeColor = true;
- this.btnW.Location = new System.Drawing.Point(996, 2);
- this.btnW.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnW.Location = new System.Drawing.Point(998, 2);
+ this.btnW.Margin = new System.Windows.Forms.Padding(4);
this.btnW.Name = "btnW";
this.btnW.Size = new System.Drawing.Size(162, 32);
this.btnW.StyleController = this.layWeight;
@@ -993,8 +993,8 @@
//
// txtWCurrent
//
- this.txtWCurrent.Location = new System.Drawing.Point(830, 2);
- this.txtWCurrent.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtWCurrent.Location = new System.Drawing.Point(832, 2);
+ this.txtWCurrent.Margin = new System.Windows.Forms.Padding(4);
this.txtWCurrent.Name = "txtWCurrent";
this.txtWCurrent.Properties.Appearance.BackColor = System.Drawing.Color.DeepSkyBlue;
this.txtWCurrent.Properties.Appearance.ForeColor = System.Drawing.Color.Black;
@@ -1007,11 +1007,11 @@
//
// txt_weight5
//
- this.txt_weight5.Location = new System.Drawing.Point(725, 2);
- this.txt_weight5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_weight5.Location = new System.Drawing.Point(724, 2);
+ this.txt_weight5.Margin = new System.Windows.Forms.Padding(4);
this.txt_weight5.Name = "txt_weight5";
this.txt_weight5.Properties.ReadOnly = true;
- this.txt_weight5.Size = new System.Drawing.Size(101, 28);
+ this.txt_weight5.Size = new System.Drawing.Size(104, 28);
this.txt_weight5.StyleController = this.layWeight;
this.txt_weight5.TabIndex = 11;
this.txt_weight5.Tag = "readonly";
@@ -1020,10 +1020,10 @@
//
this.btnClean.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
this.btnClean.Appearance.Options.UseBackColor = true;
- this.btnClean.Location = new System.Drawing.Point(1162, 2);
- this.btnClean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnClean.Location = new System.Drawing.Point(1164, 2);
+ this.btnClean.Margin = new System.Windows.Forms.Padding(4);
this.btnClean.Name = "btnClean";
- this.btnClean.Size = new System.Drawing.Size(162, 32);
+ this.btnClean.Size = new System.Drawing.Size(163, 32);
this.btnClean.StyleController = this.layWeight;
this.btnClean.TabIndex = 12;
this.btnClean.Text = "娓呯┖";
@@ -1073,7 +1073,7 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(1326, 40);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(1329, 39);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem31
@@ -1081,47 +1081,47 @@
this.layoutControlItem31.Control = this.txt_weight1;
this.layoutControlItem31.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
- this.layoutControlItem31.Size = new System.Drawing.Size(164, 40);
+ this.layoutControlItem31.Size = new System.Drawing.Size(166, 39);
this.layoutControlItem31.Text = "閲嶉噺1";
this.layoutControlItem31.TextSize = new System.Drawing.Size(46, 22);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_weight2;
- this.layoutControlItem32.Location = new System.Drawing.Point(164, 0);
+ this.layoutControlItem32.Location = new System.Drawing.Point(166, 0);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem32.Size = new System.Drawing.Size(166, 40);
+ this.layoutControlItem32.Size = new System.Drawing.Size(166, 39);
this.layoutControlItem32.Text = "閲嶉噺2";
this.layoutControlItem32.TextSize = new System.Drawing.Size(46, 22);
//
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_weight3;
- this.layoutControlItem33.Location = new System.Drawing.Point(330, 0);
+ this.layoutControlItem33.Location = new System.Drawing.Point(332, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem33.Size = new System.Drawing.Size(166, 40);
+ this.layoutControlItem33.Size = new System.Drawing.Size(166, 39);
this.layoutControlItem33.Text = "閲嶉噺3";
this.layoutControlItem33.TextSize = new System.Drawing.Size(46, 22);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_weight4;
- this.layoutControlItem34.Location = new System.Drawing.Point(496, 0);
+ this.layoutControlItem34.Location = new System.Drawing.Point(498, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem34.Size = new System.Drawing.Size(166, 40);
+ this.layoutControlItem34.Size = new System.Drawing.Size(166, 39);
this.layoutControlItem34.Text = "閲嶉噺4";
this.layoutControlItem34.TextSize = new System.Drawing.Size(46, 22);
//
// layoutControlItem36
//
this.layoutControlItem36.Control = this.btnW;
- this.layoutControlItem36.Location = new System.Drawing.Point(994, 0);
+ this.layoutControlItem36.Location = new System.Drawing.Point(996, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 6;
- this.layoutControlItem36.Size = new System.Drawing.Size(166, 40);
+ this.layoutControlItem36.Size = new System.Drawing.Size(166, 39);
this.layoutControlItem36.Text = "鑾峰彇";
this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem36.TextVisible = false;
@@ -1129,10 +1129,10 @@
// layoutControlItem37
//
this.layoutControlItem37.Control = this.txtWCurrent;
- this.layoutControlItem37.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem37.Location = new System.Drawing.Point(830, 0);
this.layoutControlItem37.Name = "layoutControlItem37";
this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 5;
- this.layoutControlItem37.Size = new System.Drawing.Size(166, 40);
+ this.layoutControlItem37.Size = new System.Drawing.Size(166, 39);
this.layoutControlItem37.Text = "瀹炴椂閲嶉噺";
this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem37.TextVisible = false;
@@ -1140,20 +1140,20 @@
// layoutControlItem35
//
this.layoutControlItem35.Control = this.txt_weight5;
- this.layoutControlItem35.Location = new System.Drawing.Point(662, 0);
+ this.layoutControlItem35.Location = new System.Drawing.Point(664, 0);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem35.Size = new System.Drawing.Size(166, 40);
+ this.layoutControlItem35.Size = new System.Drawing.Size(166, 39);
this.layoutControlItem35.Text = "绉伴噸5";
this.layoutControlItem35.TextSize = new System.Drawing.Size(46, 22);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.btnClean;
- this.layoutControlItem38.Location = new System.Drawing.Point(1160, 0);
+ this.layoutControlItem38.Location = new System.Drawing.Point(1162, 0);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 7;
- this.layoutControlItem38.Size = new System.Drawing.Size(166, 40);
+ this.layoutControlItem38.Size = new System.Drawing.Size(167, 39);
this.layoutControlItem38.Text = "娓呯┖";
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
@@ -1161,10 +1161,10 @@
// txt_fngDesc
//
this.txt_fngDesc.BtnTxt = "寮傚父鎻忚堪";
- this.txt_fngDesc.Location = new System.Drawing.Point(14, 204);
- this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txt_fngDesc.Location = new System.Drawing.Point(12, 205);
+ this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(5);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(880, 72);
+ this.txt_fngDesc.Size = new System.Drawing.Size(882, 74);
this.txt_fngDesc.TabIndex = 815;
this.txt_fngDesc.TextTxt = "";
this.txt_fngDesc.WhereTxt = " a.s_type=\'QC寮傚父鎻忚堪\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -1172,8 +1172,8 @@
// btnYcReport
//
this.btnYcReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttopdf_16x16;
- this.btnYcReport.Location = new System.Drawing.Point(898, 242);
- this.btnYcReport.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnYcReport.Location = new System.Drawing.Point(898, 244);
+ this.btnYcReport.Margin = new System.Windows.Forms.Padding(4);
this.btnYcReport.Name = "btnYcReport";
this.btnYcReport.Size = new System.Drawing.Size(146, 34);
this.btnYcReport.StyleController = this.layoutMx1;
@@ -1193,98 +1193,98 @@
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(543, 128);
- this.txt_suppName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_suppName.Location = new System.Drawing.Point(539, 127);
+ this.txt_suppName.Margin = new System.Windows.Forms.Padding(4);
this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Size = new System.Drawing.Size(351, 28);
+ this.txt_suppName.Size = new System.Drawing.Size(355, 28);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 801;
this.txt_suppName.Tag = "readonly";
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(985, 204);
- this.txt_remarks.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_remarks.Location = new System.Drawing.Point(982, 205);
+ this.txt_remarks.Margin = new System.Windows.Forms.Padding(4);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(795, 28);
+ this.txt_remarks.Size = new System.Drawing.Size(800, 28);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 797;
this.txt_remarks.Tag = "readonly";
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(985, 128);
- this.txt_fcheckResu.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(982, 127);
+ this.txt_fcheckResu.Margin = new System.Windows.Forms.Padding(4);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fcheckResu.Size = new System.Drawing.Size(351, 28);
+ this.txt_fcheckResu.Size = new System.Drawing.Size(355, 28);
this.txt_fcheckResu.StyleController = this.layoutMx1;
this.txt_fcheckResu.TabIndex = 798;
this.txt_fcheckResu.Tag = "readonly";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(101, 52);
- this.txt_itemName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_itemName.Location = new System.Drawing.Point(96, 50);
+ this.txt_itemName.Margin = new System.Windows.Forms.Padding(4);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(351, 28);
+ this.txt_itemName.Size = new System.Drawing.Size(355, 28);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 800;
this.txt_itemName.Tag = "readonly";
//
// txt_releaseNo
//
- this.txt_releaseNo.Location = new System.Drawing.Point(101, 14);
- this.txt_releaseNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_releaseNo.Location = new System.Drawing.Point(96, 12);
+ this.txt_releaseNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(351, 28);
+ this.txt_releaseNo.Size = new System.Drawing.Size(355, 28);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
this.txt_releaseNo.Tag = "readonly";
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Location = new System.Drawing.Point(985, 14);
- this.txt_fcheckDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(982, 12);
+ this.txt_fcheckDate.Margin = new System.Windows.Forms.Padding(4);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(351, 28);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(355, 28);
this.txt_fcheckDate.StyleController = this.layoutMx1;
this.txt_fcheckDate.TabIndex = 216;
this.txt_fcheckDate.Tag = "readonly";
//
// txt_lotNo
//
- this.txt_lotNo.Location = new System.Drawing.Point(543, 14);
- this.txt_lotNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_lotNo.Location = new System.Drawing.Point(539, 12);
+ this.txt_lotNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_lotNo.Name = "txt_lotNo";
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo.Size = new System.Drawing.Size(351, 28);
+ this.txt_lotNo.Size = new System.Drawing.Size(355, 28);
this.txt_lotNo.StyleController = this.layoutMx1;
this.txt_lotNo.TabIndex = 262;
this.txt_lotNo.Tag = "readonly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(101, 90);
- this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_itemNo.Location = new System.Drawing.Point(96, 88);
+ this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(351, 28);
+ this.txt_itemNo.Size = new System.Drawing.Size(355, 28);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 789;
this.txt_itemNo.Tag = "readonly";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(101, 128);
- this.txt_itemModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_itemModel.Location = new System.Drawing.Point(96, 127);
+ this.txt_itemModel.Margin = new System.Windows.Forms.Padding(4);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(351, 28);
+ this.txt_itemModel.Size = new System.Drawing.Size(355, 28);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 801;
this.txt_itemModel.Tag = "readonly";
@@ -1292,72 +1292,72 @@
// txt_itemId
//
this.txt_itemId.Location = new System.Drawing.Point(105, 171);
- this.txt_itemId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_itemId.Margin = new System.Windows.Forms.Padding(4);
this.txt_itemId.Name = "txt_itemId";
this.txt_itemId.Size = new System.Drawing.Size(311, 28);
this.txt_itemId.StyleController = this.layoutMx1;
this.txt_itemId.TabIndex = 802;
this.txt_itemId.Tag = "readonly";
//
- // txt_fcheckBy
+ // txt_fcheckByName
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(985, 52);
- this.txt_fcheckBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_fcheckBy.Name = "txt_fcheckBy";
- this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckBy.Size = new System.Drawing.Size(351, 28);
- this.txt_fcheckBy.StyleController = this.layoutMx1;
- this.txt_fcheckBy.TabIndex = 217;
- this.txt_fcheckBy.Tag = "readonly";
+ this.txt_fcheckByName.Location = new System.Drawing.Point(982, 50);
+ this.txt_fcheckByName.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fcheckByName.Name = "txt_fcheckByName";
+ this.txt_fcheckByName.Properties.Appearance.Options.UseFont = true;
+ this.txt_fcheckByName.Size = new System.Drawing.Size(355, 28);
+ this.txt_fcheckByName.StyleController = this.layoutMx1;
+ this.txt_fcheckByName.TabIndex = 217;
+ this.txt_fcheckByName.Tag = "readonly";
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(543, 90);
- this.txt_fbatchQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(539, 88);
+ this.txt_fbatchQty.Margin = new System.Windows.Forms.Padding(4);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
- this.txt_fbatchQty.Size = new System.Drawing.Size(351, 28);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(355, 28);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.TabIndex = 222;
this.txt_fbatchQty.Tag = "readonly";
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1427, 52);
- this.txt_fsubmitDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1425, 50);
+ this.txt_fsubmitDate.Margin = new System.Windows.Forms.Padding(4);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
- this.txt_fsubmitDate.Size = new System.Drawing.Size(353, 28);
+ this.txt_fsubmitDate.Size = new System.Drawing.Size(357, 28);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
this.txt_fsubmitDate.TabIndex = 804;
this.txt_fsubmitDate.Tag = "readonly";
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1427, 90);
- this.txt_fsubmitBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1425, 88);
+ this.txt_fsubmitBy.Margin = new System.Windows.Forms.Padding(4);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
- this.txt_fsubmitBy.Size = new System.Drawing.Size(353, 28);
+ this.txt_fsubmitBy.Size = new System.Drawing.Size(357, 28);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
this.txt_fsubmitBy.TabIndex = 805;
this.txt_fsubmitBy.Tag = "readonly";
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(1340, 14);
- this.txt_fsubmit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fsubmit.Location = new System.Drawing.Point(1341, 12);
+ this.txt_fsubmit.Margin = new System.Windows.Forms.Padding(4);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fsubmit.Size = new System.Drawing.Size(440, 27);
+ this.txt_fsubmit.Size = new System.Drawing.Size(441, 27);
this.txt_fsubmit.StyleController = this.layoutMx1;
this.txt_fsubmit.TabIndex = 806;
this.txt_fsubmit.Tag = "readonly";
//
// txt_slOrg
//
- this.txt_slOrg.Location = new System.Drawing.Point(985, 166);
- this.txt_slOrg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_slOrg.Location = new System.Drawing.Point(982, 166);
+ this.txt_slOrg.Margin = new System.Windows.Forms.Padding(4);
this.txt_slOrg.Name = "txt_slOrg";
- this.txt_slOrg.Size = new System.Drawing.Size(351, 28);
+ this.txt_slOrg.Size = new System.Drawing.Size(355, 28);
this.txt_slOrg.StyleController = this.layoutMx1;
this.txt_slOrg.TabIndex = 807;
this.txt_slOrg.Tag = "readonly";
@@ -1365,7 +1365,7 @@
// txt_guid
//
this.txt_guid.Location = new System.Drawing.Point(1331, 132);
- this.txt_guid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_guid.Margin = new System.Windows.Forms.Padding(4);
this.txt_guid.Name = "txt_guid";
this.txt_guid.Size = new System.Drawing.Size(305, 28);
this.txt_guid.StyleController = this.layoutMx1;
@@ -1374,12 +1374,12 @@
//
// txt_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(985, 90);
- this.txt_checkStates.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_checkStates.Location = new System.Drawing.Point(982, 88);
+ this.txt_checkStates.Margin = new System.Windows.Forms.Padding(4);
this.txt_checkStates.Name = "txt_checkStates";
this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
- this.txt_checkStates.Size = new System.Drawing.Size(351, 28);
+ this.txt_checkStates.Size = new System.Drawing.Size(355, 28);
this.txt_checkStates.StyleController = this.layoutMx1;
this.txt_checkStates.TabIndex = 809;
this.txt_checkStates.Tag = "readonly";
@@ -1387,7 +1387,7 @@
// txt_freceQty
//
this.txt_freceQty.Location = new System.Drawing.Point(1342, 125);
- this.txt_freceQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_freceQty.Margin = new System.Windows.Forms.Padding(4);
this.txt_freceQty.Name = "txt_freceQty";
this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true;
@@ -1398,42 +1398,42 @@
//
// txt_cgdNo
//
- this.txt_cgdNo.Location = new System.Drawing.Point(543, 52);
- this.txt_cgdNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_cgdNo.Location = new System.Drawing.Point(539, 50);
+ this.txt_cgdNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_cgdNo.Name = "txt_cgdNo";
- this.txt_cgdNo.Size = new System.Drawing.Size(351, 28);
+ this.txt_cgdNo.Size = new System.Drawing.Size(355, 28);
this.txt_cgdNo.StyleController = this.layoutMx1;
this.txt_cgdNo.TabIndex = 811;
this.txt_cgdNo.Tag = "readonly";
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(1427, 128);
- this.txt_fngHandle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fngHandle.Location = new System.Drawing.Point(1425, 127);
+ this.txt_fngHandle.Margin = new System.Windows.Forms.Padding(4);
this.txt_fngHandle.Name = "txt_fngHandle";
this.txt_fngHandle.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fngHandle.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fngHandle.Size = new System.Drawing.Size(353, 28);
+ this.txt_fngHandle.Size = new System.Drawing.Size(357, 28);
this.txt_fngHandle.StyleController = this.layoutMx1;
this.txt_fngHandle.TabIndex = 812;
this.txt_fngHandle.Tag = "readonly";
//
// txt_xbsl
//
- this.txt_xbsl.Location = new System.Drawing.Point(1427, 166);
- this.txt_xbsl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_xbsl.Location = new System.Drawing.Point(1425, 166);
+ this.txt_xbsl.Margin = new System.Windows.Forms.Padding(4);
this.txt_xbsl.Name = "txt_xbsl";
- this.txt_xbsl.Size = new System.Drawing.Size(353, 28);
+ this.txt_xbsl.Size = new System.Drawing.Size(357, 28);
this.txt_xbsl.StyleController = this.layoutMx1;
this.txt_xbsl.TabIndex = 817;
this.txt_xbsl.Tag = "readonly";
//
// txt_iqcRemark
//
- this.txt_iqcRemark.Location = new System.Drawing.Point(101, 166);
- this.txt_iqcRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_iqcRemark.Location = new System.Drawing.Point(96, 166);
+ this.txt_iqcRemark.Margin = new System.Windows.Forms.Padding(4);
this.txt_iqcRemark.Name = "txt_iqcRemark";
- this.txt_iqcRemark.Size = new System.Drawing.Size(351, 28);
+ this.txt_iqcRemark.Size = new System.Drawing.Size(355, 28);
this.txt_iqcRemark.StyleController = this.layoutMx1;
this.txt_iqcRemark.TabIndex = 819;
//
@@ -1558,7 +1558,7 @@
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(442, 38);
+ this.layoutControlItem1.Size = new System.Drawing.Size(443, 38);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
@@ -1568,7 +1568,7 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 38);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(442, 38);
+ this.layoutControlItem4.Size = new System.Drawing.Size(443, 38);
this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
//
@@ -1578,49 +1578,49 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 76);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(442, 38);
+ this.layoutControlItem5.Size = new System.Drawing.Size(443, 39);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 114);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 115);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(442, 38);
+ this.layoutControlItem6.Size = new System.Drawing.Size(443, 39);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(1326, 38);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1329, 38);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(444, 38);
+ this.layoutControlItem15.Size = new System.Drawing.Size(445, 38);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitBy;
- this.layoutControlItem16.Location = new System.Drawing.Point(1326, 76);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1329, 76);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(444, 38);
+ this.layoutControlItem16.Size = new System.Drawing.Size(445, 39);
this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(1326, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1329, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(444, 38);
+ this.layoutControlItem14.Size = new System.Drawing.Size(445, 38);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1628,109 +1628,109 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(884, 114);
+ this.layoutControlItem10.Location = new System.Drawing.Point(886, 115);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(442, 38);
+ this.layoutControlItem10.Size = new System.Drawing.Size(443, 39);
this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_suppName;
- this.layoutControlItem13.Location = new System.Drawing.Point(442, 114);
+ this.layoutControlItem13.Location = new System.Drawing.Point(443, 115);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(442, 38);
+ this.layoutControlItem13.Size = new System.Drawing.Size(443, 39);
this.layoutControlItem13.Text = "渚涘簲鍟�";
this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_checkStates;
- this.layoutControlItem22.Location = new System.Drawing.Point(884, 76);
+ this.layoutControlItem22.Location = new System.Drawing.Point(886, 76);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(442, 38);
+ this.layoutControlItem22.Size = new System.Drawing.Size(443, 39);
this.layoutControlItem22.Text = "妫�楠岀姸鎬�";
this.layoutControlItem22.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(442, 76);
+ this.layoutControlItem9.Location = new System.Drawing.Point(443, 76);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(442, 38);
+ this.layoutControlItem9.Size = new System.Drawing.Size(443, 39);
this.layoutControlItem9.Text = "鏀惰揣鏁伴噺";
this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem8
//
- this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(884, 38);
+ this.layoutControlItem8.Control = this.txt_fcheckByName;
+ this.layoutControlItem8.Location = new System.Drawing.Point(886, 38);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(442, 38);
+ this.layoutControlItem8.Size = new System.Drawing.Size(443, 38);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(884, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(886, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(442, 38);
+ this.layoutControlItem2.Size = new System.Drawing.Size(443, 38);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_lotNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(442, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(443, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(442, 38);
+ this.layoutControlItem3.Size = new System.Drawing.Size(443, 38);
this.layoutControlItem3.Text = "閫佹鎵瑰彿";
this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_cgdNo;
- this.layoutControlItem24.Location = new System.Drawing.Point(442, 38);
+ this.layoutControlItem24.Location = new System.Drawing.Point(443, 38);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem24.Size = new System.Drawing.Size(442, 38);
+ this.layoutControlItem24.Size = new System.Drawing.Size(443, 38);
this.layoutControlItem24.Text = "閲囪喘鍗曞彿";
this.layoutControlItem24.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_slOrg;
- this.layoutControlItem18.Location = new System.Drawing.Point(884, 152);
+ this.layoutControlItem18.Location = new System.Drawing.Point(886, 154);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(442, 38);
+ this.layoutControlItem18.Size = new System.Drawing.Size(443, 39);
this.layoutControlItem18.Text = "鏀舵枡缁勭粐";
this.layoutControlItem18.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_fngDesc;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 190);
+ this.layoutControlItem28.Location = new System.Drawing.Point(0, 193);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
this.layoutControlItem28.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem28.Size = new System.Drawing.Size(884, 76);
+ this.layoutControlItem28.Size = new System.Drawing.Size(886, 78);
this.layoutControlItem28.Text = "寮傚父澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem28.TextVisible = false;
@@ -1738,34 +1738,34 @@
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_fngHandle;
- this.layoutControlItem25.Location = new System.Drawing.Point(1326, 114);
+ this.layoutControlItem25.Location = new System.Drawing.Point(1329, 115);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem25.Size = new System.Drawing.Size(444, 38);
+ this.layoutControlItem25.Size = new System.Drawing.Size(445, 39);
this.layoutControlItem25.Text = "澶勭悊鎰忚";
this.layoutControlItem25.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem29
//
this.layoutControlItem29.Control = this.txt_xbsl;
- this.layoutControlItem29.Location = new System.Drawing.Point(1326, 152);
+ this.layoutControlItem29.Location = new System.Drawing.Point(1329, 154);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem29.Size = new System.Drawing.Size(444, 38);
+ this.layoutControlItem29.Size = new System.Drawing.Size(445, 39);
this.layoutControlItem29.Text = "鎸戦�夋暟閲�";
this.layoutControlItem29.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.layWeight;
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 266);
+ this.layoutControlItem30.Location = new System.Drawing.Point(0, 271);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnSpan = 3;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 7;
this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem30.Size = new System.Drawing.Size(1326, 40);
+ this.layoutControlItem30.Size = new System.Drawing.Size(1329, 39);
this.layoutControlItem30.Text = "绉伴噸";
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem30.TextVisible = false;
@@ -1773,35 +1773,35 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(884, 190);
+ this.layoutControlItem12.Location = new System.Drawing.Point(886, 193);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem12.Size = new System.Drawing.Size(886, 38);
+ this.layoutControlItem12.Size = new System.Drawing.Size(888, 39);
this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem39
//
this.layoutControlItem39.Control = this.txt_iqcRemark;
- this.layoutControlItem39.Location = new System.Drawing.Point(0, 152);
+ this.layoutControlItem39.Location = new System.Drawing.Point(0, 154);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem39.Size = new System.Drawing.Size(442, 38);
+ this.layoutControlItem39.Size = new System.Drawing.Size(443, 39);
this.layoutControlItem39.Text = "妫�楠屽娉�";
this.layoutControlItem39.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.btnYcReport;
- this.layoutControlItem27.Location = new System.Drawing.Point(884, 228);
+ this.layoutControlItem27.Location = new System.Drawing.Point(886, 232);
this.layoutControlItem27.MaxSize = new System.Drawing.Size(150, 38);
this.layoutControlItem27.MinSize = new System.Drawing.Size(150, 38);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem27.Size = new System.Drawing.Size(442, 38);
+ this.layoutControlItem27.Size = new System.Drawing.Size(443, 39);
this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
@@ -1810,12 +1810,12 @@
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_xblb;
- this.layoutControlItem26.Location = new System.Drawing.Point(1326, 228);
+ this.layoutControlItem26.Location = new System.Drawing.Point(1329, 232);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
this.layoutControlItem26.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem26.Size = new System.Drawing.Size(444, 78);
+ this.layoutControlItem26.Size = new System.Drawing.Size(445, 78);
this.layoutControlItem26.Text = "閫夊埆绫诲埆";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem26.TextVisible = false;
@@ -1824,7 +1824,7 @@
//
this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
- this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
this.xtraTabControl2.Size = new System.Drawing.Size(1794, 497);
@@ -1837,7 +1837,7 @@
//
this.tabMxPage1.Controls.Add(this.splitMx2);
this.tabMxPage1.Controls.Add(this.panMsg);
- this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1792, 459);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
@@ -1847,7 +1847,7 @@
this.splitMx2.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx2.Horizontal = false;
this.splitMx2.Location = new System.Drawing.Point(0, 57);
- this.splitMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.splitMx2.Margin = new System.Windows.Forms.Padding(4);
this.splitMx2.Name = "splitMx2";
//
// splitMx2.Panel1
@@ -1860,18 +1860,18 @@
this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
this.splitMx2.Panel2.Text = "Panel2";
this.splitMx2.Size = new System.Drawing.Size(1792, 402);
- this.splitMx2.SplitterPosition = 351;
+ this.splitMx2.SplitterPosition = 387;
this.splitMx2.TabIndex = 3;
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1792, 351);
+ this.gcMx1.Size = new System.Drawing.Size(1792, 387);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -2122,7 +2122,7 @@
//
this.splitYangLi.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitYangLi.Location = new System.Drawing.Point(0, 0);
- this.splitYangLi.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.splitYangLi.Margin = new System.Windows.Forms.Padding(4);
this.splitYangLi.Name = "splitYangLi";
//
// splitYangLi.Panel1
@@ -2134,7 +2134,7 @@
//
this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
this.splitYangLi.Panel2.Text = "Panel2";
- this.splitYangLi.Size = new System.Drawing.Size(1792, 36);
+ this.splitYangLi.Size = new System.Drawing.Size(0, 0);
this.splitYangLi.SplitterPosition = 845;
this.splitYangLi.TabIndex = 4;
//
@@ -2143,21 +2143,21 @@
this.groupControl1.Controls.Add(this.gcMx2);
this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl1.Location = new System.Drawing.Point(0, 0);
- this.groupControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupControl1.Margin = new System.Windows.Forms.Padding(4);
this.groupControl1.Name = "groupControl1";
- this.groupControl1.Size = new System.Drawing.Size(845, 36);
+ this.groupControl1.Size = new System.Drawing.Size(0, 0);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "妫�娴嬬粨鏋�";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.gcMx2.Location = new System.Drawing.Point(2, 34);
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+ this.gcMx2.Location = new System.Drawing.Point(0, 33);
this.gcMx2.MainView = this.gvMx2;
- this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(4);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(841, 0);
+ this.gcMx2.Size = new System.Drawing.Size(0, 0);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2221,7 +2221,7 @@
// gridColumn21
//
this.gridColumn21.Caption = "鎿嶄綔浜�";
- this.gridColumn21.FieldName = "createBy";
+ this.gridColumn21.FieldName = "createByName";
this.gridColumn21.MinWidth = 31;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.OptionsColumn.ReadOnly = true;
@@ -2245,21 +2245,21 @@
this.groupControl2.Controls.Add(this.gcMx3);
this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl2.Location = new System.Drawing.Point(0, 0);
- this.groupControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupControl2.Margin = new System.Windows.Forms.Padding(4);
this.groupControl2.Name = "groupControl2";
- this.groupControl2.Size = new System.Drawing.Size(932, 36);
+ this.groupControl2.Size = new System.Drawing.Size(0, 0);
this.groupControl2.TabIndex = 4;
this.groupControl2.Text = "鏍锋湰缁撴灉";
//
// gcMx3
//
this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.gcMx3.Location = new System.Drawing.Point(2, 34);
+ this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+ this.gcMx3.Location = new System.Drawing.Point(0, 33);
this.gcMx3.MainView = this.gvMx3;
- this.gcMx3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMx3.Margin = new System.Windows.Forms.Padding(4);
this.gcMx3.Name = "gcMx3";
- this.gcMx3.Size = new System.Drawing.Size(928, 0);
+ this.gcMx3.Size = new System.Drawing.Size(0, 0);
this.gcMx3.TabIndex = 0;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -2360,7 +2360,7 @@
this.panMsg.Controls.Add(this.layoutMxMsg);
this.panMsg.Dock = System.Windows.Forms.DockStyle.Top;
this.panMsg.Location = new System.Drawing.Point(0, 0);
- this.panMsg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panMsg.Margin = new System.Windows.Forms.Padding(4);
this.panMsg.Name = "panMsg";
this.panMsg.Size = new System.Drawing.Size(1792, 57);
this.panMsg.TabIndex = 1;
@@ -2372,7 +2372,7 @@
this.layoutMxMsg.Controls.Add(this.txtJianYan);
this.layoutMxMsg.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMxMsg.Location = new System.Drawing.Point(2, 2);
- this.layoutMxMsg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.layoutMxMsg.Margin = new System.Windows.Forms.Padding(4);
this.layoutMxMsg.Name = "layoutMxMsg";
this.layoutMxMsg.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(348, 385, 812, 500);
this.layoutMxMsg.Root = this.layoutControlGroup1;
@@ -2384,7 +2384,7 @@
//
this.btnIpt.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.calculatenow_32x32;
this.btnIpt.Location = new System.Drawing.Point(1653, 2);
- this.btnIpt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnIpt.Margin = new System.Windows.Forms.Padding(4);
this.btnIpt.Name = "btnIpt";
this.btnIpt.Size = new System.Drawing.Size(133, 45);
this.btnIpt.StyleController = this.layoutMxMsg;
@@ -2395,7 +2395,7 @@
//
this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.refresh_32x321;
this.btnLoad.Location = new System.Drawing.Point(1446, 2);
- this.btnLoad.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnLoad.Margin = new System.Windows.Forms.Padding(4);
this.btnLoad.Name = "btnLoad";
this.btnLoad.Size = new System.Drawing.Size(203, 45);
this.btnLoad.StyleController = this.layoutMxMsg;
@@ -2404,12 +2404,12 @@
//
// txtJianYan
//
- this.txtJianYan.Location = new System.Drawing.Point(268, 2);
- this.txtJianYan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtJianYan.Location = new System.Drawing.Point(265, 2);
+ this.txtJianYan.Margin = new System.Windows.Forms.Padding(4);
this.txtJianYan.Name = "txtJianYan";
this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
this.txtJianYan.Properties.Appearance.Options.UseFont = true;
- this.txtJianYan.Size = new System.Drawing.Size(830, 42);
+ this.txtJianYan.Size = new System.Drawing.Size(833, 42);
this.txtJianYan.StyleController = this.layoutMxMsg;
this.txtJianYan.TabIndex = 2;
//
@@ -2488,20 +2488,20 @@
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.ucUpFileList1);
- this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1792, 455);
+ this.tabMxPage2.Size = new System.Drawing.Size(1792, 459);
this.tabMxPage2.Text = "闄勪欢淇℃伅";
//
// ucUpFileList1
//
this.ucUpFileList1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ucUpFileList1.Location = new System.Drawing.Point(0, 0);
- this.ucUpFileList1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.ucUpFileList1.Margin = new System.Windows.Forms.Padding(5);
this.ucUpFileList1.Name = "ucUpFileList1";
this.ucUpFileList1.parentGroup = null;
this.ucUpFileList1.pGuid = null;
- this.ucUpFileList1.Size = new System.Drawing.Size(1792, 455);
+ this.ucUpFileList1.Size = new System.Drawing.Size(1792, 459);
this.ucUpFileList1.TabIndex = 0;
//
// repositoryItemComboBox2
@@ -2518,7 +2518,7 @@
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
this.picCheckBox.Location = new System.Drawing.Point(1151, 51);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
this.picCheckBox.Name = "picCheckBox";
this.picCheckBox.Size = new System.Drawing.Size(125, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2546,7 +2546,7 @@
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Frm_MesQaItemsDetect01";
this.Text = "鏉ユ枡妫�楠岀敵璇�";
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
@@ -2596,7 +2596,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckByName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).EndInit();
@@ -2723,7 +2723,7 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_lotNo;
private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
- private DevExpress.XtraEditors.TextEdit txt_fcheckBy;
+ private DevExpress.XtraEditors.TextEdit txt_fcheckByName;
private DevExpress.XtraEditors.TextEdit txt_fcheckDate;
private DevExpress.XtraEditors.TextEdit txt_releaseNo;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
index 2e9ad1e..a8a858b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
@@ -135,9 +135,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(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1169, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1461, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -145,10 +146,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, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1169, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1461, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -157,8 +159,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1167, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1459, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -167,6 +170,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(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -179,17 +183,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1167, 570);
+ this.split1.Size = new System.Drawing.Size(1459, 698);
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(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1167, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1459, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -212,8 +218,9 @@
this.gv_checkUser,
this.gv_checkDate,
this.gridColumn4});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -223,194 +230,195 @@
//
this.gridColumn1.Caption = "浣跨敤缁勭粐";
this.gridColumn1.FieldName = "fSubsidiary";
- this.gridColumn1.MinWidth = 250;
+ this.gridColumn1.MinWidth = 312;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Tag = "org.fnamber";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 6;
- this.gridColumn1.Width = 250;
+ this.gridColumn1.Width = 312;
//
// gv_status
//
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "瀹℃牳鏍囪瘑";
this.gv_status.FieldName = "status";
- this.gv_status.MinWidth = 50;
+ this.gv_status.MinWidth = 62;
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.STATUS";
this.gv_status.UnboundDataType = typeof(bool);
this.gv_status.Visible = true;
this.gv_status.VisibleIndex = 0;
- this.gv_status.Width = 94;
+ this.gv_status.Width = 117;
//
// gv_itemId
//
this.gv_itemId.AppearanceCell.Options.UseFont = true;
this.gv_itemId.Caption = "鐗╂枡ID";
this.gv_itemId.FieldName = "itemId";
- this.gv_itemId.MinWidth = 50;
+ this.gv_itemId.MinWidth = 62;
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.ITEM_ID";
this.gv_itemId.Visible = true;
this.gv_itemId.VisibleIndex = 1;
- this.gv_itemId.Width = 94;
+ this.gv_itemId.Width = 117;
//
// gv_itemNo
//
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
this.gv_itemNo.FieldName = "itemNo";
- this.gv_itemNo.MinWidth = 50;
+ this.gv_itemNo.MinWidth = 62;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.ITEM_NO";
this.gv_itemNo.Visible = true;
this.gv_itemNo.VisibleIndex = 3;
- this.gv_itemNo.Width = 94;
+ this.gv_itemNo.Width = 117;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
this.gridColumn2.FieldName = "itemName";
- this.gridColumn2.MinWidth = 125;
+ this.gridColumn2.MinWidth = 156;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Tag = "query_b.item_name";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 2;
- this.gridColumn2.Width = 125;
+ this.gridColumn2.Width = 156;
//
// gv_suppNo
//
this.gv_suppNo.AppearanceCell.Options.UseFont = true;
this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
this.gv_suppNo.FieldName = "suppNo";
- this.gv_suppNo.MinWidth = 50;
+ this.gv_suppNo.MinWidth = 62;
this.gv_suppNo.Name = "gv_suppNo";
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.SUPP_NO";
this.gv_suppNo.Visible = true;
this.gv_suppNo.VisibleIndex = 4;
- this.gv_suppNo.Width = 94;
+ this.gv_suppNo.Width = 117;
//
// gridColumn3
//
this.gridColumn3.Caption = "渚涘簲鍟嗗悕绉�";
this.gridColumn3.FieldName = "gysName";
- this.gridColumn3.MinWidth = 125;
+ this.gridColumn3.MinWidth = 156;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Tag = "d.supp_name";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 5;
- this.gridColumn3.Width = 125;
+ this.gridColumn3.Width = 156;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 50;
+ this.gv_createBy.FieldName = "createByName";
+ this.gv_createBy.MinWidth = 62;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.CREATE_BY";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 7;
- this.gv_createBy.Width = 94;
+ this.gv_createBy.Width = 117;
//
// gv_createDate
//
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 180;
+ this.gv_createDate.MinWidth = 225;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
this.gv_createDate.VisibleIndex = 8;
- this.gv_createDate.Width = 180;
+ this.gv_createDate.Width = 225;
//
// gv_lastupdateBy
//
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 50;
+ this.gv_lastupdateBy.FieldName = "lastupdateByName";
+ this.gv_lastupdateBy.MinWidth = 62;
this.gv_lastupdateBy.Name = "gv_lastupdateBy";
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
this.gv_lastupdateBy.Visible = true;
this.gv_lastupdateBy.VisibleIndex = 9;
- this.gv_lastupdateBy.Width = 94;
+ this.gv_lastupdateBy.Width = 117;
//
// gv_lastupdateDate
//
this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂�";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 180;
+ this.gv_lastupdateDate.MinWidth = 225;
this.gv_lastupdateDate.Name = "gv_lastupdateDate";
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
this.gv_lastupdateDate.Visible = true;
this.gv_lastupdateDate.VisibleIndex = 10;
- this.gv_lastupdateDate.Width = 180;
+ this.gv_lastupdateDate.Width = 225;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜�";
- this.gv_checkUser.FieldName = "checkUser";
- this.gv_checkUser.MinWidth = 50;
+ this.gv_checkUser.FieldName = "checkUserName";
+ this.gv_checkUser.MinWidth = 62;
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 = 11;
- this.gv_checkUser.Width = 94;
+ this.gv_checkUser.Width = 117;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 120;
+ this.gv_checkDate.MinWidth = 150;
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 = 12;
- this.gv_checkDate.Width = 120;
+ this.gv_checkDate.Width = 150;
//
// gridColumn4
//
this.gridColumn4.Caption = "涓婚敭Guid";
this.gridColumn4.FieldName = "guid";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 117;
//
// 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, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1167, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1459, 48);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1167, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1459, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -418,6 +426,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(4, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -429,8 +438,8 @@
//
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1167, 570);
- this.splitMx1.SplitterPosition = 112;
+ this.splitMx1.Size = new System.Drawing.Size(1459, 698);
+ this.splitMx1.SplitterPosition = 137;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -451,35 +460,39 @@
this.layoutControlItem11,
this.layoutControlItem5});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1167, 112);
+ this.layoutMx1.Size = new System.Drawing.Size(1459, 137);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(608, 73);
+ this.lbGuid.Location = new System.Drawing.Point(760, 89);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(294, 27);
+ this.lbGuid.Size = new System.Drawing.Size(368, 33);
this.lbGuid.TabIndex = 244;
this.lbGuid.Text = "lbGuid";
//
// txt_fSubsidiary
//
this.txt_fSubsidiary.IsReadly = false;
- this.txt_fSubsidiary.Location = new System.Drawing.Point(84, 12);
+ this.txt_fSubsidiary.Location = new System.Drawing.Point(101, 14);
+ this.txt_fSubsidiary.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_fSubsidiary.Name = "txt_fSubsidiary";
- this.txt_fSubsidiary.Size = new System.Drawing.Size(210, 24);
+ this.txt_fSubsidiary.Size = new System.Drawing.Size(267, 28);
this.txt_fSubsidiary.TabIndex = 242;
//
// txt_suppNo
//
- this.txt_suppNo.Location = new System.Drawing.Point(99, 73);
+ this.txt_suppNo.Location = new System.Drawing.Point(124, 89);
+ this.txt_suppNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_suppNo.Name = "txt_suppNo";
this.txt_suppNo.Properties.Appearance.Options.UseFont = true;
- this.txt_suppNo.Size = new System.Drawing.Size(207, 24);
+ this.txt_suppNo.Size = new System.Drawing.Size(259, 28);
this.txt_suppNo.StyleController = this.layoutMx1;
this.txt_suppNo.TabIndex = 240;
this.txt_suppNo.Tag = "readOnly";
@@ -487,18 +500,19 @@
// txt_suppId
//
this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(370, 12);
+ this.txt_suppId.Location = new System.Drawing.Point(459, 14);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(211, 24);
+ this.txt_suppId.Size = new System.Drawing.Size(268, 28);
this.txt_suppId.TabIndex = 238;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(944, 42);
+ this.txt_checkDate.Location = new System.Drawing.Point(1177, 51);
+ this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(211, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(268, 28);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 226;
this.txt_checkDate.Tag = "readOnly";
@@ -506,58 +520,64 @@
// txt_itemId
//
this.txt_itemId.IsReadly = false;
- this.txt_itemId.Location = new System.Drawing.Point(84, 42);
+ this.txt_itemId.Location = new System.Drawing.Point(101, 51);
+ this.txt_itemId.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(210, 24);
+ this.txt_itemId.Size = new System.Drawing.Size(267, 28);
this.txt_itemId.TabIndex = 237;
this.txt_itemId.Tag = "no";
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(944, 12);
+ this.txt_checkUser.Location = new System.Drawing.Point(1177, 14);
+ this.txt_checkUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(211, 24);
+ this.txt_checkUser.Size = new System.Drawing.Size(268, 28);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 222;
this.txt_checkUser.Tag = "readOnly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(370, 42);
+ this.txt_itemNo.Location = new System.Drawing.Point(459, 51);
+ this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(211, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(268, 28);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 211;
this.txt_itemNo.Tag = "readOnly";
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(657, 42);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(818, 51);
+ this.txt_lastupdateDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateDate.Size = new System.Drawing.Size(211, 24);
+ this.txt_lastupdateDate.Size = new System.Drawing.Size(268, 28);
this.txt_lastupdateDate.StyleController = this.layoutMx1;
this.txt_lastupdateDate.TabIndex = 219;
this.txt_lastupdateDate.Tag = "readOnly";
//
// txt_lastupdateBy
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(657, 12);
+ this.txt_lastupdateBy.Location = new System.Drawing.Point(818, 14);
+ this.txt_lastupdateBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateBy.Size = new System.Drawing.Size(211, 24);
+ this.txt_lastupdateBy.Size = new System.Drawing.Size(268, 28);
this.txt_lastupdateBy.StyleController = this.layoutMx1;
this.txt_lastupdateBy.TabIndex = 217;
this.txt_lastupdateBy.Tag = "readOnly";
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(872, 73);
+ this.txt_status.Location = new System.Drawing.Point(1090, 89);
+ this.txt_status.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_status.Size = new System.Drawing.Size(283, 24);
+ this.txt_status.Size = new System.Drawing.Size(355, 27);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 243;
//
@@ -581,7 +601,7 @@
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem5.Size = new System.Drawing.Size(298, 31);
this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(50, 20);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(62, 24);
//
// Root
//
@@ -622,7 +642,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1167, 112);
+ this.Root.Size = new System.Drawing.Size(1459, 137);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -630,91 +650,91 @@
this.layoutControlItem1.Control = this.txt_fSubsidiary;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(286, 30);
+ this.layoutControlItem1.Size = new System.Drawing.Size(358, 37);
this.layoutControlItem1.Text = "閫夋嫨缁勭粐";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_itemId;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 30);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 37);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(286, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(358, 38);
this.layoutControlItem2.Text = "閫夋嫨鐗╂枡";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_itemNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(286, 30);
+ this.layoutControlItem3.Location = new System.Drawing.Point(358, 37);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(287, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(359, 38);
this.layoutControlItem3.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_suppId;
- this.layoutControlItem4.Location = new System.Drawing.Point(286, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(358, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(287, 30);
+ this.layoutControlItem4.Size = new System.Drawing.Size(359, 37);
this.layoutControlItem4.Text = "閫変緵搴斿晢";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_lastupdateBy;
- this.layoutControlItem6.Location = new System.Drawing.Point(573, 0);
+ this.layoutControlItem6.Location = new System.Drawing.Point(717, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(287, 30);
+ this.layoutControlItem6.Size = new System.Drawing.Size(359, 37);
this.layoutControlItem6.Text = "鏇存柊浜哄憳";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_lastupdateDate;
- this.layoutControlItem7.Location = new System.Drawing.Point(573, 30);
+ this.layoutControlItem7.Location = new System.Drawing.Point(717, 37);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(287, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(359, 38);
this.layoutControlItem7.Text = "鏇存柊鏃堕棿";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_checkUser;
- this.layoutControlItem8.Location = new System.Drawing.Point(860, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(1076, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(287, 30);
+ this.layoutControlItem8.Size = new System.Drawing.Size(359, 37);
this.layoutControlItem8.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_checkDate;
- this.layoutControlItem9.Location = new System.Drawing.Point(860, 30);
+ this.layoutControlItem9.Location = new System.Drawing.Point(1076, 37);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(287, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(359, 38);
this.layoutControlItem9.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_status;
- this.layoutControlItem10.Location = new System.Drawing.Point(860, 61);
+ this.layoutControlItem10.Location = new System.Drawing.Point(1076, 75);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(287, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(359, 38);
this.layoutControlItem10.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
@@ -722,9 +742,10 @@
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(957, 65);
+ this.picCheckBox.Location = new System.Drawing.Point(1196, 79);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(125, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 7;
this.picCheckBox.TabStop = false;
@@ -732,12 +753,13 @@
//
// Frm_MesQaMj
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1169, 682);
+ this.ClientSize = new System.Drawing.Size(1461, 834);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_MesQaMj";
this.Text = "鍏嶆缁存姢";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
index 687f828..995898c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -29,18 +29,18 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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.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.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -199,9 +199,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(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1129, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1411, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -209,10 +210,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, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1129, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1411, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -221,8 +223,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1127, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1409, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -231,6 +234,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(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -243,17 +247,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1127, 570);
+ this.split1.Size = new System.Drawing.Size(1409, 698);
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(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1127, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1409, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -263,7 +269,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 = 61;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_isenabled,
this.gv_foneChecked,
@@ -279,8 +285,9 @@
this.gridColumn16,
this.gridColumn8,
this.gridColumn18});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -291,187 +298,188 @@
this.gv_isenabled.AppearanceCell.Options.UseFont = true;
this.gv_isenabled.Caption = "鏄惁鍙敤";
this.gv_isenabled.FieldName = "isenabled";
- this.gv_isenabled.MaxWidth = 50;
- this.gv_isenabled.MinWidth = 50;
+ this.gv_isenabled.MaxWidth = 62;
+ this.gv_isenabled.MinWidth = 62;
this.gv_isenabled.Name = "gv_isenabled";
this.gv_isenabled.OptionsColumn.AllowEdit = false;
this.gv_isenabled.Tag = "query_a.ISENABLED";
this.gv_isenabled.UnboundDataType = typeof(bool);
- this.gv_isenabled.Width = 50;
+ this.gv_isenabled.Width = 62;
//
// gv_foneChecked
//
this.gv_foneChecked.AppearanceCell.Options.UseFont = true;
this.gv_foneChecked.Caption = "瀹℃牳鏍囪";
this.gv_foneChecked.FieldName = "foneChecked";
- this.gv_foneChecked.MaxWidth = 50;
- this.gv_foneChecked.MinWidth = 50;
+ this.gv_foneChecked.MaxWidth = 62;
+ this.gv_foneChecked.MinWidth = 62;
this.gv_foneChecked.Name = "gv_foneChecked";
this.gv_foneChecked.OptionsColumn.AllowEdit = false;
this.gv_foneChecked.Tag = "query_a.FONE_CHECKED";
this.gv_foneChecked.UnboundDataType = typeof(bool);
this.gv_foneChecked.Visible = true;
this.gv_foneChecked.VisibleIndex = 0;
- this.gv_foneChecked.Width = 50;
+ this.gv_foneChecked.Width = 62;
//
// gridColumn7
//
this.gridColumn7.Caption = "鐗╂枡ID";
this.gridColumn7.FieldName = "itemId";
- this.gridColumn7.MinWidth = 50;
+ this.gridColumn7.MinWidth = 62;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.AllowEdit = false;
this.gridColumn7.Tag = "query_a.ITEM_ID";
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
//
// gv_itemNo
//
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
this.gv_itemNo.FieldName = "itemNo";
- this.gv_itemNo.MinWidth = 50;
+ this.gv_itemNo.MinWidth = 62;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_b.item_no";
this.gv_itemNo.Visible = true;
this.gv_itemNo.VisibleIndex = 1;
- this.gv_itemNo.Width = 150;
+ this.gv_itemNo.Width = 187;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
this.gridColumn3.FieldName = "mc";
- this.gridColumn3.MinWidth = 50;
+ this.gridColumn3.MinWidth = 62;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Tag = "query_b.item_name";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
- this.gridColumn3.Width = 250;
+ this.gridColumn3.Width = 312;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡瑙勬牸";
this.gridColumn2.FieldName = "gg";
- this.gridColumn2.MaxWidth = 300;
- this.gridColumn2.MinWidth = 50;
+ this.gridColumn2.MaxWidth = 375;
+ this.gridColumn2.MinWidth = 62;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Tag = "query_b.item_model";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 3;
- this.gridColumn2.Width = 100;
+ this.gridColumn2.Width = 125;
//
// gv_foneCheckor
//
this.gv_foneCheckor.AppearanceCell.Options.UseFont = true;
this.gv_foneCheckor.Caption = "瀹℃牳浜�";
this.gv_foneCheckor.FieldName = "foneCheckor";
- this.gv_foneCheckor.MinWidth = 50;
+ this.gv_foneCheckor.MinWidth = 62;
this.gv_foneCheckor.Name = "gv_foneCheckor";
this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
this.gv_foneCheckor.Visible = true;
this.gv_foneCheckor.VisibleIndex = 4;
- this.gv_foneCheckor.Width = 94;
+ this.gv_foneCheckor.Width = 117;
//
// gv_foneCheckdate
//
this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true;
this.gv_foneCheckdate.Caption = "瀹℃牳鏃堕棿";
this.gv_foneCheckdate.FieldName = "foneCheckdate";
- this.gv_foneCheckdate.MinWidth = 50;
+ this.gv_foneCheckdate.MinWidth = 62;
this.gv_foneCheckdate.Name = "gv_foneCheckdate";
this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
this.gv_foneCheckdate.Visible = true;
this.gv_foneCheckdate.VisibleIndex = 5;
- this.gv_foneCheckdate.Width = 120;
+ this.gv_foneCheckdate.Width = 150;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍒朵綔浜�";
this.gridColumn1.FieldName = "createBy";
- this.gridColumn1.MinWidth = 50;
+ this.gridColumn1.MinWidth = 62;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Tag = "query_a.CREATE_BY";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 6;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// gridColumn4
//
this.gridColumn4.Caption = "鍒朵綔鏃堕棿";
this.gridColumn4.FieldName = "createDate";
- this.gridColumn4.MinWidth = 50;
+ this.gridColumn4.MinWidth = 62;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.Tag = "query_a.CREATE_DATE";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 7;
- this.gridColumn4.Width = 180;
+ this.gridColumn4.Width = 225;
//
// gv_memo
//
this.gv_memo.AppearanceCell.Options.UseFont = true;
this.gv_memo.Caption = "澶囨敞";
this.gv_memo.FieldName = "memo";
- this.gv_memo.MinWidth = 50;
+ this.gv_memo.MinWidth = 62;
this.gv_memo.Name = "gv_memo";
this.gv_memo.OptionsColumn.AllowEdit = false;
this.gv_memo.Tag = "query_a.MEMO";
this.gv_memo.Visible = true;
this.gv_memo.VisibleIndex = 8;
- this.gv_memo.Width = 150;
+ this.gv_memo.Width = 187;
//
// gridColumn16
//
this.gridColumn16.Caption = "涓婚敭GUID";
this.gridColumn16.FieldName = "guid";
- this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.MinWidth = 31;
this.gridColumn16.Name = "gridColumn16";
- this.gridColumn16.Width = 94;
+ this.gridColumn16.Width = 117;
//
// gridColumn8
//
this.gridColumn8.Caption = "浣跨敤缁勭粐";
this.gridColumn8.FieldName = "fSubsidiary";
- this.gridColumn8.MinWidth = 50;
+ this.gridColumn8.MinWidth = 62;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.OptionsColumn.AllowEdit = false;
this.gridColumn8.Tag = "org.fnumber";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 9;
- this.gridColumn8.Width = 250;
+ this.gridColumn8.Width = 312;
//
// gridColumn18
//
this.gridColumn18.Caption = "绫诲埆";
this.gridColumn18.FieldName = "ftype";
- this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.MinWidth = 31;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 10;
- this.gridColumn18.Width = 94;
+ this.gridColumn18.Width = 117;
//
// 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, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1127, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1409, 48);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1127, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1409, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -479,6 +487,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(4, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -491,8 +500,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(1127, 570);
- this.splitMx1.SplitterPosition = 113;
+ this.splitMx1.Size = new System.Drawing.Size(1409, 698);
+ this.splitMx1.SplitterPosition = 138;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -514,19 +523,21 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem13});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(599, 447, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1127, 113);
+ this.layoutMx1.Size = new System.Drawing.Size(1409, 138);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "dataLayoutControl1";
//
// btnCopy
//
this.btnCopy.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.chartswitchrowcolumn_16x16;
- this.btnCopy.Location = new System.Drawing.Point(565, 74);
+ this.btnCopy.Location = new System.Drawing.Point(706, 90);
+ this.btnCopy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnCopy.Name = "btnCopy";
- this.btnCopy.Size = new System.Drawing.Size(131, 27);
+ this.btnCopy.Size = new System.Drawing.Size(165, 34);
this.btnCopy.StyleController = this.layoutMx1;
this.btnCopy.TabIndex = 388;
this.btnCopy.Tag = "gvBtnAlawys";
@@ -534,114 +545,126 @@
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(825, 102);
+ this.lbGuid.Location = new System.Drawing.Point(1031, 125);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(269, 28);
+ this.lbGuid.Size = new System.Drawing.Size(336, 34);
this.lbGuid.TabIndex = 387;
this.lbGuid.Text = "label1";
//
// txt_foneCheckdate
//
- this.txt_foneCheckdate.Location = new System.Drawing.Point(914, 43);
+ this.txt_foneCheckdate.Location = new System.Drawing.Point(1139, 52);
+ this.txt_foneCheckdate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_foneCheckdate.Name = "txt_foneCheckdate";
this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_foneCheckdate.Size = new System.Drawing.Size(201, 24);
+ this.txt_foneCheckdate.Size = new System.Drawing.Size(256, 28);
this.txt_foneCheckdate.StyleController = this.layoutMx1;
this.txt_foneCheckdate.TabIndex = 267;
this.txt_foneCheckdate.Tag = "readOnly";
//
// txt_foneCheckor
//
- this.txt_foneCheckor.Location = new System.Drawing.Point(914, 12);
+ this.txt_foneCheckor.Location = new System.Drawing.Point(1139, 14);
+ this.txt_foneCheckor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_foneCheckor.Name = "txt_foneCheckor";
this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
- this.txt_foneCheckor.Size = new System.Drawing.Size(201, 24);
+ this.txt_foneCheckor.Size = new System.Drawing.Size(256, 28);
this.txt_foneCheckor.StyleController = this.layoutMx1;
this.txt_foneCheckor.TabIndex = 262;
this.txt_foneCheckor.Tag = "readOnly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(360, 12);
+ this.txt_itemNo.Location = new System.Drawing.Point(447, 14);
+ this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(201, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(255, 28);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 370;
this.txt_itemNo.Tag = "readOnly";
//
// txt_memo
//
- this.txt_memo.Location = new System.Drawing.Point(360, 74);
+ this.txt_memo.Location = new System.Drawing.Point(447, 90);
+ this.txt_memo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_memo.Name = "txt_memo";
this.txt_memo.Properties.Appearance.Options.UseFont = true;
- this.txt_memo.Size = new System.Drawing.Size(201, 24);
+ this.txt_memo.Size = new System.Drawing.Size(255, 28);
this.txt_memo.StyleController = this.layoutMx1;
this.txt_memo.TabIndex = 219;
//
// txt_gg
//
- this.txt_gg.Location = new System.Drawing.Point(360, 43);
+ this.txt_gg.Location = new System.Drawing.Point(447, 52);
+ this.txt_gg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_gg.Name = "txt_gg";
- this.txt_gg.Size = new System.Drawing.Size(201, 24);
+ this.txt_gg.Size = new System.Drawing.Size(255, 28);
this.txt_gg.StyleController = this.layoutMx1;
this.txt_gg.TabIndex = 384;
this.txt_gg.Tag = "readOnly";
//
// txt_foneChecked
//
- this.txt_foneChecked.Location = new System.Drawing.Point(842, 74);
+ this.txt_foneChecked.Location = new System.Drawing.Point(1052, 90);
+ this.txt_foneChecked.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_foneChecked.Name = "txt_foneChecked";
this.txt_foneChecked.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_foneChecked.Size = new System.Drawing.Size(273, 24);
+ this.txt_foneChecked.Size = new System.Drawing.Size(343, 27);
this.txt_foneChecked.StyleController = this.layoutMx1;
this.txt_foneChecked.TabIndex = 386;
this.txt_foneChecked.Tag = "readOnly";
//
// txt_ftype
//
- this.txt_ftype.Location = new System.Drawing.Point(637, 12);
+ this.txt_ftype.Location = new System.Drawing.Point(793, 14);
+ this.txt_ftype.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_ftype.Name = "txt_ftype";
- this.txt_ftype.Size = new System.Drawing.Size(201, 24);
+ this.txt_ftype.Size = new System.Drawing.Size(255, 28);
this.txt_ftype.StyleController = this.layoutMx1;
this.txt_ftype.TabIndex = 389;
this.txt_ftype.Tag = "readOnly";
//
// txt_isenabled
//
- this.txt_isenabled.Location = new System.Drawing.Point(565, 43);
+ this.txt_isenabled.Location = new System.Drawing.Point(706, 52);
+ this.txt_isenabled.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_isenabled.Name = "txt_isenabled";
this.txt_isenabled.Properties.Caption = "鍙敤鏍囪瘑";
- this.txt_isenabled.Size = new System.Drawing.Size(273, 24);
+ this.txt_isenabled.Size = new System.Drawing.Size(342, 27);
this.txt_isenabled.StyleController = this.layoutMx1;
this.txt_isenabled.TabIndex = 390;
this.txt_isenabled.Tag = "readOnly";
//
// txt_itemId
//
- this.txt_itemId.Location = new System.Drawing.Point(84, 12);
+ this.txt_itemId.Location = new System.Drawing.Point(101, 14);
+ this.txt_itemId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemId.Name = "txt_itemId";
this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()});
this.txt_itemId.Properties.ReadOnly = true;
- this.txt_itemId.Size = new System.Drawing.Size(200, 24);
+ this.txt_itemId.Size = new System.Drawing.Size(255, 28);
this.txt_itemId.StyleController = this.layoutMx1;
this.txt_itemId.TabIndex = 391;
//
// txt_mc
//
- this.txt_mc.Location = new System.Drawing.Point(84, 43);
+ this.txt_mc.Location = new System.Drawing.Point(101, 52);
+ this.txt_mc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_mc.Name = "txt_mc";
- this.txt_mc.Size = new System.Drawing.Size(200, 24);
+ this.txt_mc.Size = new System.Drawing.Size(255, 28);
this.txt_mc.StyleController = this.layoutMx1;
this.txt_mc.TabIndex = 392;
this.txt_mc.Tag = "readOnly";
//
// txt_fSubsidiary
//
- this.txt_fSubsidiary.Location = new System.Drawing.Point(84, 74);
+ this.txt_fSubsidiary.Location = new System.Drawing.Point(101, 90);
+ this.txt_fSubsidiary.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fSubsidiary.Name = "txt_fSubsidiary";
- this.txt_fSubsidiary.Size = new System.Drawing.Size(200, 24);
+ this.txt_fSubsidiary.Size = new System.Drawing.Size(255, 28);
this.txt_fSubsidiary.StyleController = this.layoutMx1;
this.txt_fSubsidiary.TabIndex = 393;
this.txt_fSubsidiary.Tag = "readOnly";
@@ -677,61 +700,61 @@
this.layoutControlItem6});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- 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;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- 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;
+ columnDefinition9,
+ columnDefinition10,
+ columnDefinition11,
+ columnDefinition12});
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1127, 113);
+ rowDefinition7,
+ rowDefinition8,
+ rowDefinition9});
+ this.Root.Size = new System.Drawing.Size(1409, 138);
this.Root.TextVisible = false;
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_foneCheckor;
- this.layoutControlItem10.Location = new System.Drawing.Point(830, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(1038, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem10.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_foneCheckdate;
- this.layoutControlItem11.Location = new System.Drawing.Point(830, 31);
+ this.layoutControlItem11.Location = new System.Drawing.Point(1038, 38);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem11.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_foneChecked;
- this.layoutControlItem12.Location = new System.Drawing.Point(830, 62);
+ this.layoutControlItem12.Location = new System.Drawing.Point(1038, 76);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem12.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
@@ -739,13 +762,13 @@
// layoutControlItem14
//
this.layoutControlItem14.Control = this.btnCopy;
- this.layoutControlItem14.Location = new System.Drawing.Point(553, 62);
- this.layoutControlItem14.MaxSize = new System.Drawing.Size(135, 31);
- this.layoutControlItem14.MinSize = new System.Drawing.Size(135, 31);
+ this.layoutControlItem14.Location = new System.Drawing.Point(692, 76);
+ this.layoutControlItem14.MaxSize = new System.Drawing.Size(169, 38);
+ this.layoutControlItem14.MinSize = new System.Drawing.Size(169, 38);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(346, 38);
this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem14.Text = "澶嶅埗";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
@@ -754,31 +777,31 @@
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_ftype;
- this.layoutControlItem3.Location = new System.Drawing.Point(553, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(692, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(346, 38);
this.layoutControlItem3.Text = "椤圭洰鍒嗙被";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_itemNo;
- this.layoutControlItem7.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(346, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(346, 38);
this.layoutControlItem7.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_isenabled;
- this.layoutControlItem5.Location = new System.Drawing.Point(553, 31);
+ this.layoutControlItem5.Location = new System.Drawing.Point(692, 38);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(346, 38);
this.layoutControlItem5.Text = "鍙敤鏍囪瘑";
this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem5.TextVisible = false;
@@ -788,59 +811,60 @@
this.layoutControlItem1.Control = this.txt_itemId;
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(346, 38);
this.layoutControlItem1.Text = "閫夋嫨鐗╂枡";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_gg;
- this.layoutControlItem8.Location = new System.Drawing.Point(276, 31);
+ this.layoutControlItem8.Location = new System.Drawing.Point(346, 38);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(346, 38);
this.layoutControlItem8.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_memo;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 62);
+ this.layoutControlItem2.Location = new System.Drawing.Point(346, 76);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(346, 38);
this.layoutControlItem2.Text = "澶囨敞";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_mc;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 38);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(346, 38);
this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_fSubsidiary;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 76);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(346, 38);
this.layoutControlItem6.Text = "浣跨敤缁勭粐";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
//
// tabMx
//
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(4, 4, 4, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1127, 445);
+ this.tabMx.Size = new System.Drawing.Size(1409, 545);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -848,15 +872,18 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1125, 413);
+ this.tabMxPage1.Size = new System.Drawing.Size(1407, 507);
this.tabMxPage1.Text = "妫�楠岄」鐩槑缁�";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.rptJYXM,
@@ -869,7 +896,7 @@
this.rptStation,
this.repositoryItemCheckEdit1,
this.rptGroup});
- this.gcMx1.Size = new System.Drawing.Size(1125, 413);
+ this.gcMx1.Size = new System.Drawing.Size(1407, 507);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -897,6 +924,7 @@
this.gridColumn6,
this.gridColumn9,
this.gridColumn10});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -909,20 +937,22 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "瀛愯〃涓婚敭GUID";
this.gvMx1guid.FieldName = "guid";
+ this.gvMx1guid.MinWidth = 25;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
+ this.gvMx1guid.Width = 117;
//
// gvMx1pid
//
this.gvMx1pid.AppearanceCell.Options.UseFont = true;
this.gvMx1pid.Caption = "涓昏〃涓婚敭GUID";
this.gvMx1pid.FieldName = "pid";
+ this.gvMx1pid.MinWidth = 25;
this.gvMx1pid.Name = "gvMx1pid";
this.gvMx1pid.OptionsColumn.ReadOnly = true;
this.gvMx1pid.Tag = "query_a.pid";
- this.gvMx1pid.Width = 94;
+ this.gvMx1pid.Width = 117;
//
// gvMx1fcheckItem
//
@@ -930,11 +960,12 @@
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
this.gvMx1fcheckItem.ColumnEdit = this.rptJYXM;
this.gvMx1fcheckItem.FieldName = "fcheckItem";
+ this.gvMx1fcheckItem.MinWidth = 25;
this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
this.gvMx1fcheckItem.Tag = "edit";
this.gvMx1fcheckItem.Visible = true;
this.gvMx1fcheckItem.VisibleIndex = 1;
- this.gvMx1fcheckItem.Width = 150;
+ this.gvMx1fcheckItem.Width = 187;
//
// rptJYXM
//
@@ -949,11 +980,12 @@
this.gvMx1forder.Caption = "椤哄簭";
this.gvMx1forder.ColumnEdit = this.rptShunXui;
this.gvMx1forder.FieldName = "forder";
+ this.gvMx1forder.MinWidth = 25;
this.gvMx1forder.Name = "gvMx1forder";
this.gvMx1forder.Tag = "yz_quantity_0_edit";
this.gvMx1forder.Visible = true;
this.gvMx1forder.VisibleIndex = 0;
- this.gvMx1forder.Width = 50;
+ this.gvMx1forder.Width = 62;
//
// rptShunXui
//
@@ -982,20 +1014,22 @@
//
this.gridColumn5.Caption = "瑙勬牸瑕佹眰";
this.gridColumn5.FieldName = "fspecRequ";
+ this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "edit";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 2;
- this.gridColumn5.Width = 150;
+ this.gridColumn5.Width = 187;
//
// gvMx1memo
//
this.gvMx1memo.AppearanceCell.Options.UseFont = true;
this.gvMx1memo.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1memo.FieldName = "memo";
+ this.gvMx1memo.MinWidth = 25;
this.gvMx1memo.Name = "gvMx1memo";
this.gvMx1memo.Tag = "edit";
- this.gvMx1memo.Width = 150;
+ this.gvMx1memo.Width = 187;
//
// gvMx1fcheckTool
//
@@ -1003,11 +1037,12 @@
this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
this.gvMx1fcheckTool.ColumnEdit = this.rptJYGJ;
this.gvMx1fcheckTool.FieldName = "fcheckTool";
+ this.gvMx1fcheckTool.MinWidth = 25;
this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
this.gvMx1fcheckTool.Tag = "edit";
this.gvMx1fcheckTool.Visible = true;
this.gvMx1fcheckTool.VisibleIndex = 3;
- this.gvMx1fcheckTool.Width = 150;
+ this.gvMx1fcheckTool.Width = 187;
//
// rptJYGJ
//
@@ -1022,11 +1057,12 @@
this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗗悕绉�";
this.gvMx1sampleSizeNo.ColumnEdit = this.rptJYBZ;
this.gvMx1sampleSizeNo.FieldName = "sampleSizeName";
+ this.gvMx1sampleSizeNo.MinWidth = 25;
this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
this.gvMx1sampleSizeNo.Tag = "edit";
this.gvMx1sampleSizeNo.Visible = true;
this.gvMx1sampleSizeNo.VisibleIndex = 4;
- this.gvMx1sampleSizeNo.Width = 150;
+ this.gvMx1sampleSizeNo.Width = 187;
//
// rptJYBZ
//
@@ -1041,10 +1077,11 @@
//
this.sampleSizeName.Caption = "妫�楠屾爣鍑嗙紪鐮�";
this.sampleSizeName.FieldName = "sampleSizeNo";
+ this.sampleSizeName.MinWidth = 25;
this.sampleSizeName.Name = "sampleSizeName";
this.sampleSizeName.OptionsColumn.ReadOnly = true;
this.sampleSizeName.Tag = "edit";
- this.sampleSizeName.Width = 150;
+ this.sampleSizeName.Width = 187;
//
// gvMx1fcheckLevel
//
@@ -1052,11 +1089,12 @@
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
this.gvMx1fcheckLevel.ColumnEdit = this.rptJYSP;
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
+ this.gvMx1fcheckLevel.MinWidth = 25;
this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
this.gvMx1fcheckLevel.Tag = "edit";
this.gvMx1fcheckLevel.Visible = true;
this.gvMx1fcheckLevel.VisibleIndex = 5;
- this.gvMx1fcheckLevel.Width = 200;
+ this.gvMx1fcheckLevel.Width = 250;
//
// rptJYSP
//
@@ -1072,11 +1110,12 @@
this.gvMx1facLevel.Caption = "鎺ユ敹姘村钩";
this.gvMx1facLevel.ColumnEdit = this.rptJSSP;
this.gvMx1facLevel.FieldName = "facLevel";
+ this.gvMx1facLevel.MinWidth = 25;
this.gvMx1facLevel.Name = "gvMx1facLevel";
this.gvMx1facLevel.Tag = "edit";
this.gvMx1facLevel.Visible = true;
this.gvMx1facLevel.VisibleIndex = 6;
- this.gvMx1facLevel.Width = 150;
+ this.gvMx1facLevel.Width = 187;
//
// rptJSSP
//
@@ -1091,61 +1130,62 @@
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
+ this.gvMx1fupAllow.MinWidth = 25;
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
this.gvMx1fupAllow.Tag = "yz_quantity_0_edit";
this.gvMx1fupAllow.Visible = true;
this.gvMx1fupAllow.VisibleIndex = 7;
- this.gvMx1fupAllow.Width = 60;
//
// gvMx1fstand
//
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
+ this.gvMx1fstand.MinWidth = 25;
this.gvMx1fstand.Name = "gvMx1fstand";
this.gvMx1fstand.Tag = "yz_quantity_0_edit";
this.gvMx1fstand.Visible = true;
this.gvMx1fstand.VisibleIndex = 8;
- this.gvMx1fstand.Width = 60;
//
// gvMx1fdownAllow
//
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
+ this.gvMx1fdownAllow.MinWidth = 25;
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit";
this.gvMx1fdownAllow.Visible = true;
this.gvMx1fdownAllow.VisibleIndex = 9;
- this.gvMx1fdownAllow.Width = 60;
//
// gridColumn19
//
this.gridColumn19.Caption = "鏍峰搧鍩烘暟";
this.gridColumn19.FieldName = "ypsl";
+ this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Tag = "edit";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 10;
- this.gridColumn19.Width = 94;
+ this.gridColumn19.Width = 117;
//
// gvMxDel
//
this.gvMxDel.Caption = "绉婚櫎";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 50;
+ this.gvMxDel.MinWidth = 62;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
this.gvMxDel.VisibleIndex = 13;
- this.gvMxDel.Width = 100;
+ this.gvMxDel.Width = 125;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1154,22 +1194,22 @@
//
this.gridColumn11.Caption = "鍗曚綅";
this.gridColumn11.FieldName = "funit";
- this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.MinWidth = 31;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Tag = "edit";
- this.gridColumn11.Width = 94;
+ this.gridColumn11.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "宸ヤ綅";
this.gridColumn6.ColumnEdit = this.rptStation;
this.gridColumn6.FieldName = "stationName";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Tag = "edit";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 11;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// rptStation
//
@@ -1184,11 +1224,11 @@
this.gridColumn9.Caption = "鏄惁棣栨璁よ瘉";
this.gridColumn9.ColumnEdit = this.repositoryItemCheckEdit1;
this.gridColumn9.FieldName = "isRzxx";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 31;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Tag = "edit";
this.gridColumn9.UnboundDataType = typeof(bool);
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 117;
//
// repositoryItemCheckEdit1
//
@@ -1200,12 +1240,12 @@
this.gridColumn10.Caption = "鎵�灞炲ぇ绫�";
this.gridColumn10.ColumnEdit = this.rptGroup;
this.gridColumn10.FieldName = "fcheckType";
- this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.MinWidth = 31;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Tag = "edit";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 12;
- this.gridColumn10.Width = 94;
+ this.gridColumn10.Width = 117;
//
// rptGroup
//
@@ -1217,9 +1257,10 @@
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(945, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(1181, 67);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(125, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
@@ -1227,13 +1268,14 @@
//
// Jyxm
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Jyxm";
- this.Size = new System.Drawing.Size(1129, 682);
+ this.Size = new System.Drawing.Size(1411, 834);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
index 4797229..c7ea30a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -29,20 +29,20 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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.XtraLayout.RowDefinition rowDefinition5 = 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.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 rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ 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();
@@ -192,9 +192,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(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -202,10 +203,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, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
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(1410, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -214,8 +216,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -224,6 +227,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(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -236,17 +240,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(1408, 698);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 4;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1408, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -256,7 +262,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 = 61;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_fstatus,
this.gridColumn4,
@@ -276,8 +282,9 @@
this.gridColumn18,
this.gridColumn19,
this.gridColumn20});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -288,204 +295,210 @@
this.gv_fstatus.AppearanceCell.Options.UseFont = true;
this.gv_fstatus.Caption = "瀹℃牳";
this.gv_fstatus.FieldName = "chkStatus";
- this.gv_fstatus.MaxWidth = 50;
- this.gv_fstatus.MinWidth = 50;
+ this.gv_fstatus.MaxWidth = 62;
+ this.gv_fstatus.MinWidth = 62;
this.gv_fstatus.Name = "gv_fstatus";
this.gv_fstatus.OptionsColumn.AllowEdit = false;
this.gv_fstatus.Tag = "query_a.fstatus";
this.gv_fstatus.Visible = true;
this.gv_fstatus.VisibleIndex = 0;
- this.gv_fstatus.Width = 50;
+ this.gv_fstatus.Width = 62;
//
// gridColumn4
//
this.gridColumn4.Caption = "涓婚敭GUID";
this.gridColumn4.FieldName = "guid";
+ this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Tag = "org.fnamber";
- this.gridColumn4.Width = 250;
+ this.gridColumn4.Width = 312;
//
// gridColumn1
//
this.gridColumn1.Caption = "绫诲埆";
this.gridColumn1.FieldName = "fType";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 14;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// gridColumn2
//
this.gridColumn2.Caption = "寤虹珛鑰�";
- this.gridColumn2.FieldName = "createBy";
+ this.gridColumn2.FieldName = "createByName";
+ this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 10;
- this.gridColumn2.Width = 150;
+ this.gridColumn2.Width = 187;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "寤虹珛鏃堕棿";
this.gv_checkUser.FieldName = "createDate";
+ this.gv_checkUser.MinWidth = 25;
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 = 11;
- this.gv_checkUser.Width = 94;
+ this.gv_checkUser.Width = 117;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鑰�";
- this.gv_checkDate.FieldName = "checkBy";
+ this.gv_checkDate.FieldName = "checkUserName";
+ this.gv_checkDate.MinWidth = 25;
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 = 12;
- this.gv_checkDate.Width = 180;
+ this.gv_checkDate.Width = 225;
//
// gv_pba005
//
this.gv_pba005.AppearanceCell.Options.UseFont = true;
this.gv_pba005.Caption = "瀹℃牳鏃堕棿";
this.gv_pba005.FieldName = "checkDate";
+ this.gv_pba005.MinWidth = 25;
this.gv_pba005.Name = "gv_pba005";
this.gv_pba005.OptionsColumn.AllowEdit = false;
this.gv_pba005.Tag = "query_a.pba005";
this.gv_pba005.Visible = true;
this.gv_pba005.VisibleIndex = 13;
- this.gv_pba005.Width = 94;
+ this.gv_pba005.Width = 117;
//
// gridColumn8
//
this.gridColumn8.Caption = "鐗╂枡缂栫爜";
this.gridColumn8.FieldName = "itemNo";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 31;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 5;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.Width = 117;
//
// gridColumn9
//
this.gridColumn9.Caption = "鐗╂枡鍚嶇О";
this.gridColumn9.FieldName = "itemName";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 31;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 6;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 117;
//
// gridColumn10
//
this.gridColumn10.Caption = "鐗╂枡瑙勬牸";
this.gridColumn10.FieldName = "itemModel";
- this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.MinWidth = 31;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 7;
- this.gridColumn10.Width = 94;
+ this.gridColumn10.Width = 117;
//
// gridColumn11
//
this.gridColumn11.Caption = "渚涘簲鍟�";
this.gridColumn11.FieldName = "gysName";
- this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.MinWidth = 31;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 8;
- this.gridColumn11.Width = 94;
+ this.gridColumn11.Width = 117;
//
// gridColumn12
//
this.gridColumn12.Caption = "鍒拌揣鏃ユ湡";
this.gridColumn12.FieldName = "dhdDate";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 31;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 4;
- this.gridColumn12.Width = 94;
+ this.gridColumn12.Width = 117;
//
// gridColumn13
//
this.gridColumn13.Caption = "鍒拌揣鍗曞彿";
this.gridColumn13.FieldName = "dhdNo";
- this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.MinWidth = 31;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 3;
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 117;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡ID";
this.gridColumn3.FieldName = "itemId";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gridColumn17
//
this.gridColumn17.Caption = "寮傚父鍗曞彿";
this.gridColumn17.FieldName = "fBillNo";
- this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.MinWidth = 31;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 1;
- this.gridColumn17.Width = 94;
+ this.gridColumn17.Width = 117;
//
// gridColumn18
//
this.gridColumn18.Caption = "OA澶勭悊鐘舵��";
this.gridColumn18.FieldName = "txtColor";
- this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.MinWidth = 31;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 2;
- this.gridColumn18.Width = 94;
+ this.gridColumn18.Width = 117;
//
// gridColumn19
//
this.gridColumn19.Caption = "OA澶勭悊鏃堕棿";
this.gridColumn19.FieldName = "oaCheckDate";
- this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.MinWidth = 31;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 9;
- this.gridColumn19.Width = 94;
+ this.gridColumn19.Width = 117;
//
// gridColumn20
//
this.gridColumn20.Caption = "鏀舵枡缁勭粐";
this.gridColumn20.FieldName = "fSubsidiary";
- this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.MinWidth = 31;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 15;
- this.gridColumn20.Width = 94;
+ this.gridColumn20.Width = 117;
//
// 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, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1408, 48);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -493,6 +506,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(4, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -505,8 +519,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 = 163;
+ this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+ this.splitMx1.SplitterPosition = 199;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -528,107 +542,120 @@
this.layoutControlItem9,
this.layoutControlItem24});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(598, 453, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 163);
+ this.layoutMx1.Size = new System.Drawing.Size(1408, 199);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(840, 99);
+ this.lbGuid.Location = new System.Drawing.Point(1050, 121);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(274, 40);
+ this.lbGuid.Size = new System.Drawing.Size(342, 49);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(927, 12);
+ this.txt_fType.Location = new System.Drawing.Point(1157, 14);
+ this.txt_fType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fType.Name = "txt_fType";
- this.txt_fType.Size = new System.Drawing.Size(187, 24);
+ this.txt_fType.Size = new System.Drawing.Size(237, 28);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 462;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(99, 40);
+ this.txt_itemNo.Location = new System.Drawing.Point(119, 49);
+ this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(185, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(237, 28);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 464;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(375, 40);
+ this.txt_itemName.Location = new System.Drawing.Point(465, 49);
+ this.txt_itemName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(185, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(237, 28);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 465;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(651, 40);
+ this.txt_itemModel.Location = new System.Drawing.Point(811, 49);
+ this.txt_itemModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(463, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(583, 28);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 466;
//
// txt_dhdNo
//
- this.txt_dhdNo.Location = new System.Drawing.Point(375, 12);
+ this.txt_dhdNo.Location = new System.Drawing.Point(465, 14);
+ this.txt_dhdNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_dhdNo.Name = "txt_dhdNo";
- this.txt_dhdNo.Size = new System.Drawing.Size(185, 24);
+ this.txt_dhdNo.Size = new System.Drawing.Size(237, 28);
this.txt_dhdNo.StyleController = this.layoutMx1;
this.txt_dhdNo.TabIndex = 467;
//
// txt_gysNo
//
- this.txt_gysNo.Location = new System.Drawing.Point(99, 68);
+ this.txt_gysNo.Location = new System.Drawing.Point(119, 84);
+ this.txt_gysNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_gysNo.Name = "txt_gysNo";
- this.txt_gysNo.Size = new System.Drawing.Size(185, 24);
+ this.txt_gysNo.Size = new System.Drawing.Size(237, 28);
this.txt_gysNo.StyleController = this.layoutMx1;
this.txt_gysNo.TabIndex = 468;
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(375, 68);
+ this.txt_gysName.Location = new System.Drawing.Point(465, 84);
+ this.txt_gysName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_gysName.Name = "txt_gysName";
- this.txt_gysName.Size = new System.Drawing.Size(461, 24);
+ this.txt_gysName.Size = new System.Drawing.Size(583, 28);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 469;
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(927, 180);
+ this.txt_guid.Location = new System.Drawing.Point(1159, 220);
+ this.txt_guid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(187, 24);
+ this.txt_guid.Size = new System.Drawing.Size(234, 28);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 477;
//
// txt_fBillNo
//
- this.txt_fBillNo.Location = new System.Drawing.Point(99, 12);
+ this.txt_fBillNo.Location = new System.Drawing.Point(119, 14);
+ this.txt_fBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fBillNo.Name = "txt_fBillNo";
- this.txt_fBillNo.Size = new System.Drawing.Size(185, 24);
+ this.txt_fBillNo.Size = new System.Drawing.Size(237, 28);
this.txt_fBillNo.StyleController = this.layoutMx1;
this.txt_fBillNo.TabIndex = 478;
//
// txt_dhdDate
//
- this.txt_dhdDate.Location = new System.Drawing.Point(651, 12);
+ this.txt_dhdDate.Location = new System.Drawing.Point(811, 14);
+ this.txt_dhdDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_dhdDate.Name = "txt_dhdDate";
- this.txt_dhdDate.Size = new System.Drawing.Size(185, 24);
+ this.txt_dhdDate.Size = new System.Drawing.Size(237, 28);
this.txt_dhdDate.StyleController = this.layoutMx1;
this.txt_dhdDate.TabIndex = 481;
//
// txt_fngDesc
//
- this.txt_fngDesc.Location = new System.Drawing.Point(99, 97);
+ this.txt_fngDesc.Location = new System.Drawing.Point(119, 119);
+ this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(1015, 54);
+ this.txt_fngDesc.Size = new System.Drawing.Size(1275, 66);
this.txt_fngDesc.StyleController = this.layoutMx1;
this.txt_fngDesc.TabIndex = 485;
//
@@ -653,7 +680,7 @@
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;
this.layoutControlItem24.Size = new System.Drawing.Size(278, 34);
this.layoutControlItem24.Text = "涓婚敭Guid";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(50, 20);
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(62, 24);
//
// Root
//
@@ -672,36 +699,36 @@
this.layoutControlItem3});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- 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;
+ 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;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- 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;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ 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;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1126, 163);
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8,
+ rowDefinition9,
+ rowDefinition10});
+ this.Root.Size = new System.Drawing.Size(1408, 199);
this.Root.TextVisible = false;
//
// layoutControlItem2
@@ -709,114 +736,115 @@
this.layoutControlItem2.Control = this.txt_fBillNo;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(346, 35);
this.layoutControlItem2.Text = "寮傚父缂栧彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_dhdNo;
- this.layoutControlItem14.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(346, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(346, 35);
this.layoutControlItem14.Text = "鍒拌揣鍗曞彿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_dhdDate;
- this.layoutControlItem4.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(692, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(346, 35);
this.layoutControlItem4.Text = "鍒拌揣鍗曟棩鏈�";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemNo;
- this.layoutControlItem11.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem11.Location = new System.Drawing.Point(0, 35);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(346, 35);
this.layoutControlItem11.Text = "鐗╂枡缂栧彿";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_fType;
- this.layoutControlItem1.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem1.Location = new System.Drawing.Point(1038, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem1.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(346, 35);
this.layoutControlItem1.Text = "寮傚父绫诲瀷";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_itemName;
- this.layoutControlItem12.Location = new System.Drawing.Point(276, 28);
+ this.layoutControlItem12.Location = new System.Drawing.Point(346, 35);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(346, 35);
this.layoutControlItem12.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_itemModel;
- this.layoutControlItem13.Location = new System.Drawing.Point(552, 28);
+ this.layoutControlItem13.Location = new System.Drawing.Point(692, 35);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(554, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(692, 35);
this.layoutControlItem13.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_gysNo;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 70);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem15.Size = new System.Drawing.Size(346, 35);
this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_gysName;
- this.layoutControlItem16.Location = new System.Drawing.Point(276, 56);
+ this.layoutControlItem16.Location = new System.Drawing.Point(346, 70);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(552, 29);
+ this.layoutControlItem16.Size = new System.Drawing.Size(692, 35);
this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_fngDesc;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 85);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 105);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnSpan = 4;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem3.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(1106, 58);
+ this.layoutControlItem3.Size = new System.Drawing.Size(1384, 70);
this.layoutControlItem3.Text = "寮傚父鎻忚堪";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 22);
//
// tabMx
//
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(4, 4, 4, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 395);
+ this.tabMx.Size = new System.Drawing.Size(1408, 484);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -824,15 +852,18 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 363);
+ this.tabMxPage1.Size = new System.Drawing.Size(1406, 446);
this.tabMxPage1.Text = "寮傚父鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemDateEdit1,
@@ -840,7 +871,7 @@
this.repositoryItemButtonEdit1,
this.rptJYBZ,
this.repositoryItemDateEdit3});
- this.gcMx1.Size = new System.Drawing.Size(1124, 363);
+ this.gcMx1.Size = new System.Drawing.Size(1406, 446);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -849,7 +880,7 @@
//
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx1.ColumnPanelRowHeight = 50;
+ this.gvMx1.ColumnPanelRowHeight = 61;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.caaGuid,
@@ -864,6 +895,7 @@
this.gridColumn14,
this.gridColumn15,
this.gridColumn16});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -875,115 +907,115 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
+ this.gvMx1guid.MinWidth = 62;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
+ this.gvMx1guid.Width = 117;
//
// caaGuid
//
this.caaGuid.Caption = "鐖朵翰GUID";
this.caaGuid.FieldName = "pGuid";
- this.caaGuid.MinWidth = 25;
+ this.caaGuid.MinWidth = 31;
this.caaGuid.Name = "caaGuid";
this.caaGuid.OptionsColumn.ReadOnly = true;
- this.caaGuid.Width = 94;
+ this.caaGuid.Width = 117;
//
// gvMx1daa002
//
this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
this.gvMx1daa002.Caption = "搴忓彿";
this.gvMx1daa002.FieldName = "fSeq";
- this.gvMx1daa002.MinWidth = 50;
+ this.gvMx1daa002.MinWidth = 62;
this.gvMx1daa002.Name = "gvMx1daa002";
this.gvMx1daa002.OptionsColumn.ReadOnly = true;
this.gvMx1daa002.Tag = "query_a.daa002";
this.gvMx1daa002.Visible = true;
this.gvMx1daa002.VisibleIndex = 0;
- this.gvMx1daa002.Width = 50;
+ this.gvMx1daa002.Width = 62;
//
// gridColumn5
//
this.gridColumn5.Caption = "妫�楠屽崟鍙�";
this.gridColumn5.FieldName = "releaseNo";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 1;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "妫�楠屾棩鏈�";
this.gridColumn6.FieldName = "jyDate";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 4;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// gvMx1daa005
//
this.gvMx1daa005.AppearanceCell.Options.UseFont = true;
this.gvMx1daa005.Caption = "鎵规鏁伴噺";
this.gvMx1daa005.FieldName = "batchQty";
- this.gvMx1daa005.MinWidth = 50;
+ this.gvMx1daa005.MinWidth = 62;
this.gvMx1daa005.Name = "gvMx1daa005";
this.gvMx1daa005.OptionsColumn.ReadOnly = true;
this.gvMx1daa005.Tag = "query_a.daa005";
this.gvMx1daa005.Visible = true;
this.gvMx1daa005.VisibleIndex = 2;
- this.gvMx1daa005.Width = 50;
+ this.gvMx1daa005.Width = 62;
//
// gridColumn7
//
this.gridColumn7.Caption = "鎶芥牱鏁�";
this.gridColumn7.FieldName = "chouQty";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 3;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
//
// gvMx1daa004
//
this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
this.gvMx1daa004.Caption = "涓嶈壇鏁�";
this.gvMx1daa004.FieldName = "badQty";
- this.gvMx1daa004.MinWidth = 50;
+ this.gvMx1daa004.MinWidth = 62;
this.gvMx1daa004.Name = "gvMx1daa004";
this.gvMx1daa004.OptionsColumn.ReadOnly = true;
this.gvMx1daa004.Tag = "query_a.daa004";
this.gvMx1daa004.Visible = true;
this.gvMx1daa004.VisibleIndex = 5;
- this.gvMx1daa004.Width = 50;
+ this.gvMx1daa004.Width = 62;
//
// gvMx1daa008
//
this.gvMx1daa008.AppearanceCell.Options.UseFont = true;
this.gvMx1daa008.Caption = "涓嶈壇鐜�";
this.gvMx1daa008.FieldName = "badProb";
- this.gvMx1daa008.MaxWidth = 50;
- this.gvMx1daa008.MinWidth = 50;
+ this.gvMx1daa008.MaxWidth = 62;
+ this.gvMx1daa008.MinWidth = 62;
this.gvMx1daa008.Name = "gvMx1daa008";
this.gvMx1daa008.OptionsColumn.ReadOnly = true;
this.gvMx1daa008.Tag = "query_a.daa008";
this.gvMx1daa008.Visible = true;
this.gvMx1daa008.VisibleIndex = 6;
- this.gvMx1daa008.Width = 50;
+ this.gvMx1daa008.Width = 62;
//
// gvMx1reporttime
//
this.gvMx1reporttime.AppearanceCell.Options.UseFont = true;
this.gvMx1reporttime.Caption = "閫夊埆绫诲瀷";
this.gvMx1reporttime.FieldName = "chooseType";
- this.gvMx1reporttime.MinWidth = 50;
+ this.gvMx1reporttime.MinWidth = 62;
this.gvMx1reporttime.Name = "gvMx1reporttime";
this.gvMx1reporttime.Tag = "edit";
this.gvMx1reporttime.Visible = true;
this.gvMx1reporttime.VisibleIndex = 7;
- this.gvMx1reporttime.Width = 102;
+ this.gvMx1reporttime.Width = 127;
//
// gridColumn14
//
@@ -993,31 +1025,31 @@
this.gridColumn14.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn14.Caption = "澶勭疆鎰忚";
this.gridColumn14.FieldName = "handResult";
- this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.MinWidth = 31;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 8;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.Width = 117;
//
// gridColumn15
//
this.gridColumn15.Caption = "閫夊埆鏁伴噺";
this.gridColumn15.FieldName = "chooseQty";
- this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.MinWidth = 31;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 9;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.Width = 117;
//
// gridColumn16
//
this.gridColumn16.Caption = "涓嶅悎鏍兼弿杩�";
this.gridColumn16.FieldName = "fngDesc";
- this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.MinWidth = 31;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 10;
- this.gridColumn16.Width = 94;
+ this.gridColumn16.Width = 117;
//
// repositoryItemDateEdit1
//
@@ -1040,10 +1072,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", 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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
@@ -1067,9 +1099,10 @@
//
// picCheckBox
//
- this.picCheckBox.Location = new System.Drawing.Point(1024, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(1280, 67);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(125, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 7;
this.picCheckBox.TabStop = false;
@@ -1091,12 +1124,13 @@
//
// MesQcExceptional
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(1410, 834);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "MesQcExceptional";
this.Text = "IQC寮傚父鎶ュ憡";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
--
Gitblit v1.9.3