From 9cc9ae240fd351976e6807f252dfcbaf3bfe5241 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期二, 18 十一月 2025 14:25:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LB_MesClient
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 136 ----
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.resx | 3
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 94 ++-
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs | 701 ++++++++++++-----------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 779 ++++++++++++++------------
5 files changed, 868 insertions(+), 845 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 3bbecb8..d7b50b5 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -167,6 +167,7 @@
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -230,7 +231,6 @@
this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
txt_salesOrderId = new DevExpress.XtraEditors.TextEdit();
((System.ComponentModel.ISupportInitialize)(txt_salesOrderId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
@@ -366,9 +366,10 @@
//
// txt_salesOrderId
//
- txt_salesOrderId.Location = new System.Drawing.Point(388, 38);
+ txt_salesOrderId.Location = new System.Drawing.Point(455, 49);
+ txt_salesOrderId.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
txt_salesOrderId.Name = "txt_salesOrderId";
- txt_salesOrderId.Size = new System.Drawing.Size(228, 20);
+ txt_salesOrderId.Size = new System.Drawing.Size(260, 24);
txt_salesOrderId.StyleController = this.layoutMx1;
txt_salesOrderId.TabIndex = 811;
txt_salesOrderId.Tag = "readonly";
@@ -410,10 +411,11 @@
this.layoutControlItem21,
this.layoutControlItem23});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(488, 620, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1255, 210);
+ this.layoutMx1.Size = new System.Drawing.Size(1435, 270);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -428,47 +430,51 @@
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(10, 192);
+ this.layWeight.Location = new System.Drawing.Point(11, 244);
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(912, 26);
+ this.layWeight.Size = new System.Drawing.Size(1059, 33);
this.layWeight.TabIndex = 818;
this.layWeight.Text = "layoutControl1";
//
// txt_weight1
//
- this.txt_weight1.Location = new System.Drawing.Point(45, 2);
+ this.txt_weight1.Location = new System.Drawing.Point(54, 3);
+ this.txt_weight1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_weight1.Name = "txt_weight1";
this.txt_weight1.Properties.ReadOnly = true;
- this.txt_weight1.Size = new System.Drawing.Size(67, 20);
+ this.txt_weight1.Size = new System.Drawing.Size(76, 24);
this.txt_weight1.StyleController = this.layWeight;
this.txt_weight1.TabIndex = 4;
//
// txt_weight2
//
- this.txt_weight2.Location = new System.Drawing.Point(159, 2);
+ this.txt_weight2.Location = new System.Drawing.Point(186, 3);
+ this.txt_weight2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_weight2.Name = "txt_weight2";
this.txt_weight2.Properties.ReadOnly = true;
- this.txt_weight2.Size = new System.Drawing.Size(67, 20);
+ this.txt_weight2.Size = new System.Drawing.Size(76, 24);
this.txt_weight2.StyleController = this.layWeight;
this.txt_weight2.TabIndex = 5;
//
// txt_weight3
//
- this.txt_weight3.Location = new System.Drawing.Point(273, 2);
+ this.txt_weight3.Location = new System.Drawing.Point(318, 3);
+ this.txt_weight3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_weight3.Name = "txt_weight3";
this.txt_weight3.Properties.ReadOnly = true;
- this.txt_weight3.Size = new System.Drawing.Size(67, 20);
+ this.txt_weight3.Size = new System.Drawing.Size(76, 24);
this.txt_weight3.StyleController = this.layWeight;
this.txt_weight3.TabIndex = 6;
//
// txt_weight4
//
- this.txt_weight4.Location = new System.Drawing.Point(387, 2);
+ this.txt_weight4.Location = new System.Drawing.Point(450, 3);
+ this.txt_weight4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_weight4.Name = "txt_weight4";
this.txt_weight4.Properties.ReadOnly = true;
- this.txt_weight4.Size = new System.Drawing.Size(67, 20);
+ this.txt_weight4.Size = new System.Drawing.Size(76, 24);
this.txt_weight4.StyleController = this.layWeight;
this.txt_weight4.TabIndex = 7;
//
@@ -478,32 +484,35 @@
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(686, 2);
+ this.btnW.Location = new System.Drawing.Point(794, 3);
+ this.btnW.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnW.Name = "btnW";
- this.btnW.Size = new System.Drawing.Size(110, 22);
+ this.btnW.Size = new System.Drawing.Size(128, 27);
this.btnW.StyleController = this.layWeight;
this.btnW.TabIndex = 9;
this.btnW.Text = "鑾峰彇";
//
// txtWCurrent
//
- this.txtWCurrent.Location = new System.Drawing.Point(572, 2);
+ this.txtWCurrent.Location = new System.Drawing.Point(662, 3);
+ this.txtWCurrent.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txtWCurrent.Name = "txtWCurrent";
this.txtWCurrent.Properties.Appearance.BackColor = System.Drawing.Color.DeepSkyBlue;
this.txtWCurrent.Properties.Appearance.ForeColor = System.Drawing.Color.Black;
this.txtWCurrent.Properties.Appearance.Options.UseBackColor = true;
this.txtWCurrent.Properties.Appearance.Options.UseForeColor = true;
this.txtWCurrent.Properties.ReadOnly = true;
- this.txtWCurrent.Size = new System.Drawing.Size(110, 20);
+ this.txtWCurrent.Size = new System.Drawing.Size(128, 24);
this.txtWCurrent.StyleController = this.layWeight;
this.txtWCurrent.TabIndex = 10;
//
// txt_weight5
//
- this.txt_weight5.Location = new System.Drawing.Point(501, 2);
+ this.txt_weight5.Location = new System.Drawing.Point(582, 3);
+ this.txt_weight5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_weight5.Name = "txt_weight5";
this.txt_weight5.Properties.ReadOnly = true;
- this.txt_weight5.Size = new System.Drawing.Size(67, 20);
+ this.txt_weight5.Size = new System.Drawing.Size(76, 24);
this.txt_weight5.StyleController = this.layWeight;
this.txt_weight5.TabIndex = 11;
//
@@ -511,9 +520,10 @@
//
this.btnClean.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
this.btnClean.Appearance.Options.UseBackColor = true;
- this.btnClean.Location = new System.Drawing.Point(800, 2);
+ this.btnClean.Location = new System.Drawing.Point(926, 3);
+ this.btnClean.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnClean.Name = "btnClean";
- this.btnClean.Size = new System.Drawing.Size(110, 22);
+ this.btnClean.Size = new System.Drawing.Size(131, 27);
this.btnClean.StyleController = this.layWeight;
this.btnClean.TabIndex = 12;
this.btnClean.Text = "娓呯┖";
@@ -563,7 +573,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(912, 26);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(1059, 33);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem31
@@ -571,47 +581,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(114, 26);
+ this.layoutControlItem31.Size = new System.Drawing.Size(132, 33);
this.layoutControlItem31.Text = "閲嶉噺1";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(31, 14);
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(38, 18);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_weight2;
- this.layoutControlItem32.Location = new System.Drawing.Point(114, 0);
+ this.layoutControlItem32.Location = new System.Drawing.Point(132, 0);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem32.Size = new System.Drawing.Size(114, 26);
+ this.layoutControlItem32.Size = new System.Drawing.Size(132, 33);
this.layoutControlItem32.Text = "閲嶉噺2";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(31, 14);
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(38, 18);
//
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_weight3;
- this.layoutControlItem33.Location = new System.Drawing.Point(228, 0);
+ this.layoutControlItem33.Location = new System.Drawing.Point(264, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem33.Size = new System.Drawing.Size(114, 26);
+ this.layoutControlItem33.Size = new System.Drawing.Size(132, 33);
this.layoutControlItem33.Text = "閲嶉噺3";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(31, 14);
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(38, 18);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_weight4;
- this.layoutControlItem34.Location = new System.Drawing.Point(342, 0);
+ this.layoutControlItem34.Location = new System.Drawing.Point(396, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem34.Size = new System.Drawing.Size(114, 26);
+ this.layoutControlItem34.Size = new System.Drawing.Size(132, 33);
this.layoutControlItem34.Text = "閲嶉噺4";
- this.layoutControlItem34.TextSize = new System.Drawing.Size(31, 14);
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(38, 18);
//
// layoutControlItem36
//
this.layoutControlItem36.Control = this.btnW;
- this.layoutControlItem36.Location = new System.Drawing.Point(684, 0);
+ this.layoutControlItem36.Location = new System.Drawing.Point(792, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 6;
- this.layoutControlItem36.Size = new System.Drawing.Size(114, 26);
+ this.layoutControlItem36.Size = new System.Drawing.Size(132, 33);
this.layoutControlItem36.Text = "鑾峰彇";
this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem36.TextVisible = false;
@@ -619,10 +629,10 @@
// layoutControlItem37
//
this.layoutControlItem37.Control = this.txtWCurrent;
- this.layoutControlItem37.Location = new System.Drawing.Point(570, 0);
+ this.layoutControlItem37.Location = new System.Drawing.Point(660, 0);
this.layoutControlItem37.Name = "layoutControlItem37";
this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 5;
- this.layoutControlItem37.Size = new System.Drawing.Size(114, 26);
+ this.layoutControlItem37.Size = new System.Drawing.Size(132, 33);
this.layoutControlItem37.Text = "瀹炴椂閲嶉噺";
this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem37.TextVisible = false;
@@ -630,20 +640,20 @@
// layoutControlItem35
//
this.layoutControlItem35.Control = this.txt_weight5;
- this.layoutControlItem35.Location = new System.Drawing.Point(456, 0);
+ this.layoutControlItem35.Location = new System.Drawing.Point(528, 0);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem35.Size = new System.Drawing.Size(114, 26);
+ this.layoutControlItem35.Size = new System.Drawing.Size(132, 33);
this.layoutControlItem35.Text = "绉伴噸5";
- this.layoutControlItem35.TextSize = new System.Drawing.Size(31, 14);
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(38, 18);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.btnClean;
- this.layoutControlItem38.Location = new System.Drawing.Point(798, 0);
+ this.layoutControlItem38.Location = new System.Drawing.Point(924, 0);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 7;
- this.layoutControlItem38.Size = new System.Drawing.Size(114, 26);
+ this.layoutControlItem38.Size = new System.Drawing.Size(135, 33);
this.layoutControlItem38.Text = "娓呯┖";
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
@@ -651,10 +661,10 @@
// txt_fngDesc
//
this.txt_fngDesc.BtnTxt = "寮傚父鎻忚堪";
- this.txt_fngDesc.Location = new System.Drawing.Point(12, 142);
- this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.txt_fngDesc.Location = new System.Drawing.Point(13, 181);
+ this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(604, 48);
+ this.txt_fngDesc.Size = new System.Drawing.Size(702, 60);
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\'";
@@ -662,9 +672,10 @@
// btnYcReport
//
this.btnYcReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttopdf_16x16;
- this.btnYcReport.Location = new System.Drawing.Point(620, 168);
+ this.btnYcReport.Location = new System.Drawing.Point(719, 214);
+ this.btnYcReport.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnYcReport.Name = "btnYcReport";
- this.btnYcReport.Size = new System.Drawing.Size(101, 20);
+ this.btnYcReport.Size = new System.Drawing.Size(116, 25);
this.btnYcReport.StyleController = this.layoutMx1;
this.btnYcReport.TabIndex = 814;
this.btnYcReport.Tag = "gvBtnAlawys";
@@ -672,233 +683,256 @@
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(864, 84);
+ this.lbGuid.Location = new System.Drawing.Point(987, 108);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(281, 22);
+ this.lbGuid.Size = new System.Drawing.Size(321, 28);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(388, 90);
+ this.txt_suppName.Location = new System.Drawing.Point(455, 115);
+ this.txt_suppName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Size = new System.Drawing.Size(228, 20);
+ this.txt_suppName.Size = new System.Drawing.Size(260, 24);
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(692, 142);
+ this.txt_remarks.Location = new System.Drawing.Point(808, 181);
+ this.txt_remarks.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(534, 20);
+ this.txt_remarks.Size = new System.Drawing.Size(614, 24);
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(692, 90);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(808, 115);
+ this.txt_fcheckResu.Margin = new System.Windows.Forms.Padding(3, 4, 3, 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(228, 20);
+ this.txt_fcheckResu.Size = new System.Drawing.Size(260, 24);
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(84, 38);
+ this.txt_itemName.Location = new System.Drawing.Point(102, 49);
+ this.txt_itemName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(228, 20);
+ this.txt_itemName.Size = new System.Drawing.Size(260, 24);
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(84, 12);
+ this.txt_releaseNo.Location = new System.Drawing.Point(102, 16);
+ this.txt_releaseNo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(228, 20);
+ this.txt_releaseNo.Size = new System.Drawing.Size(260, 24);
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(692, 12);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(808, 16);
+ this.txt_fcheckDate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(228, 20);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(260, 24);
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(388, 12);
+ this.txt_lotNo.Location = new System.Drawing.Point(455, 16);
+ this.txt_lotNo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_lotNo.Name = "txt_lotNo";
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo.Size = new System.Drawing.Size(228, 20);
+ this.txt_lotNo.Size = new System.Drawing.Size(260, 24);
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(84, 64);
+ this.txt_itemNo.Location = new System.Drawing.Point(102, 82);
+ this.txt_itemNo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(228, 20);
+ this.txt_itemNo.Size = new System.Drawing.Size(260, 24);
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(84, 90);
+ this.txt_itemModel.Location = new System.Drawing.Point(102, 115);
+ this.txt_itemModel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(228, 20);
+ this.txt_itemModel.Size = new System.Drawing.Size(260, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 801;
this.txt_itemModel.Tag = "readonly";
//
// txt_itemId
//
- this.txt_itemId.Location = new System.Drawing.Point(74, 109);
+ this.txt_itemId.Location = new System.Drawing.Point(85, 140);
+ this.txt_itemId.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(218, 20);
+ this.txt_itemId.Size = new System.Drawing.Size(249, 24);
this.txt_itemId.StyleController = this.layoutMx1;
this.txt_itemId.TabIndex = 802;
this.txt_itemId.Tag = "readonly";
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(692, 38);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(808, 49);
+ this.txt_fcheckBy.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckBy.Size = new System.Drawing.Size(228, 20);
+ this.txt_fcheckBy.Size = new System.Drawing.Size(260, 24);
this.txt_fcheckBy.StyleController = this.layoutMx1;
this.txt_fcheckBy.TabIndex = 217;
this.txt_fcheckBy.Tag = "readonly";
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(388, 64);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(455, 82);
+ this.txt_fbatchQty.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
- this.txt_fbatchQty.Size = new System.Drawing.Size(228, 20);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(260, 24);
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(996, 38);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1161, 49);
+ this.txt_fsubmitDate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
- this.txt_fsubmitDate.Size = new System.Drawing.Size(230, 20);
+ this.txt_fsubmitDate.Size = new System.Drawing.Size(261, 24);
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(996, 64);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1161, 82);
+ this.txt_fsubmitBy.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
- this.txt_fsubmitBy.Size = new System.Drawing.Size(230, 20);
+ this.txt_fsubmitBy.Size = new System.Drawing.Size(261, 24);
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(924, 12);
+ this.txt_fsubmit.Location = new System.Drawing.Point(1072, 16);
+ this.txt_fsubmit.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fsubmit.Size = new System.Drawing.Size(302, 20);
+ this.txt_fsubmit.Size = new System.Drawing.Size(350, 24);
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(692, 116);
+ this.txt_slOrg.Location = new System.Drawing.Point(808, 148);
+ this.txt_slOrg.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_slOrg.Name = "txt_slOrg";
- this.txt_slOrg.Size = new System.Drawing.Size(228, 20);
+ this.txt_slOrg.Size = new System.Drawing.Size(260, 24);
this.txt_slOrg.StyleController = this.layoutMx1;
this.txt_slOrg.TabIndex = 807;
this.txt_slOrg.Tag = "readonly";
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(932, 84);
+ this.txt_guid.Location = new System.Drawing.Point(1065, 108);
+ this.txt_guid.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(214, 20);
+ this.txt_guid.Size = new System.Drawing.Size(245, 24);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 808;
this.txt_guid.Tag = "readonly";
//
// txt_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(692, 64);
+ this.txt_checkStates.Location = new System.Drawing.Point(808, 82);
+ this.txt_checkStates.Margin = new System.Windows.Forms.Padding(3, 4, 3, 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(228, 20);
+ this.txt_checkStates.Size = new System.Drawing.Size(260, 24);
this.txt_checkStates.StyleController = this.layoutMx1;
this.txt_checkStates.TabIndex = 809;
this.txt_checkStates.Tag = "readonly";
//
// txt_freceQty
//
- this.txt_freceQty.Location = new System.Drawing.Point(939, 80);
+ this.txt_freceQty.Location = new System.Drawing.Point(1073, 103);
+ this.txt_freceQty.Margin = new System.Windows.Forms.Padding(3, 4, 3, 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;
- this.txt_freceQty.Size = new System.Drawing.Size(224, 20);
+ this.txt_freceQty.Size = new System.Drawing.Size(256, 24);
this.txt_freceQty.StyleController = this.layoutMx1;
this.txt_freceQty.TabIndex = 810;
this.txt_freceQty.Tag = "readonly";
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(996, 90);
+ this.txt_fngHandle.Location = new System.Drawing.Point(1161, 115);
+ this.txt_fngHandle.Margin = new System.Windows.Forms.Padding(3, 4, 3, 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(230, 20);
+ this.txt_fngHandle.Size = new System.Drawing.Size(261, 24);
this.txt_fngHandle.StyleController = this.layoutMx1;
this.txt_fngHandle.TabIndex = 812;
this.txt_fngHandle.Tag = "readonly";
//
// txt_xblb
//
- this.txt_xblb.Location = new System.Drawing.Point(996, 142);
+ this.txt_xblb.Location = new System.Drawing.Point(1161, 181);
+ this.txt_xblb.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_xblb.Name = "txt_xblb";
- this.txt_xblb.Size = new System.Drawing.Size(230, 48);
+ this.txt_xblb.Size = new System.Drawing.Size(261, 60);
this.txt_xblb.StyleController = this.layoutMx1;
this.txt_xblb.TabIndex = 816;
this.txt_xblb.Tag = "readonly";
//
// txt_xbsl
//
- this.txt_xbsl.Location = new System.Drawing.Point(996, 116);
+ this.txt_xbsl.Location = new System.Drawing.Point(1161, 148);
+ this.txt_xbsl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_xbsl.Name = "txt_xbsl";
- this.txt_xbsl.Size = new System.Drawing.Size(230, 20);
+ this.txt_xbsl.Size = new System.Drawing.Size(261, 24);
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(84, 116);
+ this.txt_iqcRemark.Location = new System.Drawing.Point(102, 148);
+ this.txt_iqcRemark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_iqcRemark.Name = "txt_iqcRemark";
- this.txt_iqcRemark.Size = new System.Drawing.Size(228, 20);
+ this.txt_iqcRemark.Size = new System.Drawing.Size(260, 24);
this.txt_iqcRemark.StyleController = this.layoutMx1;
this.txt_iqcRemark.TabIndex = 819;
//
@@ -922,7 +956,7 @@
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem7.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem7.Text = "鐗╂枡ID";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(52, 14);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(59, 18);
//
// layoutControlItem21
//
@@ -933,7 +967,7 @@
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem21.Size = new System.Drawing.Size(326, 32);
this.layoutControlItem21.Text = "涓婚敭GUID";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(43, 15);
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(49, 19);
//
// layoutControlItem23
//
@@ -944,7 +978,7 @@
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem23.Size = new System.Drawing.Size(332, 30);
this.layoutControlItem23.Text = "鍒ゅ畾缁撴灉";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(52, 14);
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(59, 18);
//
// Root
//
@@ -1015,7 +1049,7 @@
rowDefinition7,
rowDefinition8,
rowDefinition9});
- this.Root.Size = new System.Drawing.Size(1238, 228);
+ this.Root.Size = new System.Drawing.Size(1435, 290);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1023,69 +1057,69 @@
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(304, 26);
+ this.layoutControlItem1.Size = new System.Drawing.Size(353, 33);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_itemName;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 26);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 33);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(304, 26);
+ this.layoutControlItem4.Size = new System.Drawing.Size(353, 33);
this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 52);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 66);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(304, 26);
+ this.layoutControlItem5.Size = new System.Drawing.Size(353, 33);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 78);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 99);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(304, 26);
+ this.layoutControlItem6.Size = new System.Drawing.Size(353, 33);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(912, 26);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1059, 33);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(306, 26);
+ this.layoutControlItem15.Size = new System.Drawing.Size(354, 33);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitBy;
- this.layoutControlItem16.Location = new System.Drawing.Point(912, 52);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1059, 66);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(306, 26);
+ this.layoutControlItem16.Size = new System.Drawing.Size(354, 33);
this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(912, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1059, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(306, 26);
+ this.layoutControlItem14.Size = new System.Drawing.Size(354, 33);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1093,110 +1127,110 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(608, 78);
+ this.layoutControlItem10.Location = new System.Drawing.Point(706, 99);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(304, 26);
+ this.layoutControlItem10.Size = new System.Drawing.Size(353, 33);
this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_suppName;
- this.layoutControlItem13.Location = new System.Drawing.Point(304, 78);
+ this.layoutControlItem13.Location = new System.Drawing.Point(353, 99);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(304, 26);
+ this.layoutControlItem13.Size = new System.Drawing.Size(353, 33);
this.layoutControlItem13.Text = "渚涘簲鍟�";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_checkStates;
- this.layoutControlItem22.Location = new System.Drawing.Point(608, 52);
+ this.layoutControlItem22.Location = new System.Drawing.Point(706, 66);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(304, 26);
+ this.layoutControlItem22.Size = new System.Drawing.Size(353, 33);
this.layoutControlItem22.Text = "妫�楠岀姸鎬�";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(304, 52);
+ this.layoutControlItem9.Location = new System.Drawing.Point(353, 66);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(304, 26);
+ this.layoutControlItem9.Size = new System.Drawing.Size(353, 33);
this.layoutControlItem9.Text = "鏀惰揣鏁伴噺";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(608, 26);
+ this.layoutControlItem8.Location = new System.Drawing.Point(706, 33);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(304, 26);
+ this.layoutControlItem8.Size = new System.Drawing.Size(353, 33);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(608, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(706, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(304, 26);
+ this.layoutControlItem2.Size = new System.Drawing.Size(353, 33);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_lotNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(304, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(353, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(304, 26);
+ this.layoutControlItem3.Size = new System.Drawing.Size(353, 33);
this.layoutControlItem3.Text = "閫佹鎵瑰彿";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = txt_salesOrderId;
this.layoutControlItem24.CustomizationFormText = "闇�姹傝窡韪彿";
- this.layoutControlItem24.Location = new System.Drawing.Point(304, 26);
+ this.layoutControlItem24.Location = new System.Drawing.Point(353, 33);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem24.Size = new System.Drawing.Size(304, 26);
+ this.layoutControlItem24.Size = new System.Drawing.Size(353, 33);
this.layoutControlItem24.Text = "闇�姹傝窡韪彿";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_slOrg;
- this.layoutControlItem18.Location = new System.Drawing.Point(608, 104);
+ this.layoutControlItem18.Location = new System.Drawing.Point(706, 132);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(304, 26);
+ this.layoutControlItem18.Size = new System.Drawing.Size(353, 33);
this.layoutControlItem18.Text = "鏀舵枡缁勭粐";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_fngDesc;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 130);
+ this.layoutControlItem28.Location = new System.Drawing.Point(0, 165);
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(608, 52);
+ this.layoutControlItem28.Size = new System.Drawing.Size(706, 66);
this.layoutControlItem28.Text = "寮傚父澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem28.TextVisible = false;
@@ -1204,46 +1238,46 @@
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_fngHandle;
- this.layoutControlItem25.Location = new System.Drawing.Point(912, 78);
+ this.layoutControlItem25.Location = new System.Drawing.Point(1059, 99);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem25.Size = new System.Drawing.Size(306, 26);
+ this.layoutControlItem25.Size = new System.Drawing.Size(354, 33);
this.layoutControlItem25.Text = "澶勭悊鎰忚";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_xblb;
- this.layoutControlItem26.Location = new System.Drawing.Point(912, 130);
+ this.layoutControlItem26.Location = new System.Drawing.Point(1059, 165);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
this.layoutControlItem26.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem26.Size = new System.Drawing.Size(306, 52);
+ this.layoutControlItem26.Size = new System.Drawing.Size(354, 66);
this.layoutControlItem26.Text = "閫夊埆绫诲埆";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem29
//
this.layoutControlItem29.Control = this.txt_xbsl;
- this.layoutControlItem29.Location = new System.Drawing.Point(912, 104);
+ this.layoutControlItem29.Location = new System.Drawing.Point(1059, 132);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem29.Size = new System.Drawing.Size(306, 26);
+ this.layoutControlItem29.Size = new System.Drawing.Size(354, 33);
this.layoutControlItem29.Text = "鎸戦�夋暟閲�";
- this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.layWeight;
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 182);
+ this.layoutControlItem30.Location = new System.Drawing.Point(0, 231);
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(912, 26);
+ this.layoutControlItem30.Size = new System.Drawing.Size(1059, 33);
this.layoutControlItem30.Text = "绉伴噸";
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem30.TextVisible = false;
@@ -1251,35 +1285,35 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(608, 130);
+ this.layoutControlItem12.Location = new System.Drawing.Point(706, 165);
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(610, 26);
+ this.layoutControlItem12.Size = new System.Drawing.Size(707, 33);
this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem39
//
this.layoutControlItem39.Control = this.txt_iqcRemark;
- this.layoutControlItem39.Location = new System.Drawing.Point(0, 104);
+ this.layoutControlItem39.Location = new System.Drawing.Point(0, 132);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem39.Size = new System.Drawing.Size(304, 26);
+ this.layoutControlItem39.Size = new System.Drawing.Size(353, 33);
this.layoutControlItem39.Text = "妫�楠屽娉�";
- this.layoutControlItem39.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.btnYcReport;
- this.layoutControlItem27.Location = new System.Drawing.Point(608, 156);
- this.layoutControlItem27.MaxSize = new System.Drawing.Size(105, 24);
- this.layoutControlItem27.MinSize = new System.Drawing.Size(105, 24);
+ this.layoutControlItem27.Location = new System.Drawing.Point(706, 198);
+ this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem27.Size = new System.Drawing.Size(304, 26);
+ this.layoutControlItem27.Size = new System.Drawing.Size(353, 33);
this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
@@ -1304,10 +1338,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(4, 3, 4, 3);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1257, 62);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1437, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -1315,10 +1349,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1257, 560);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1437, 720);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -1327,8 +1362,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1255, 534);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1435, 688);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -1337,6 +1373,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -1349,17 +1386,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1255, 534);
+ this.split1.Size = new System.Drawing.Size(1435, 688);
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(3, 4, 3, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1255, 495);
+ this.gcMain1.Size = new System.Drawing.Size(1435, 639);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -1402,9 +1441,8 @@
this.gridColumn5,
this.gridColumn6,
this.gridColumn8});
- this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 43;
+ this.gridView1.IndicatorWidth = 49;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -1414,359 +1452,370 @@
//
this.gridColumn13.Caption = "鎬ユ枡鏍囪瘑";
this.gridColumn13.FieldName = "urgentLagTxt";
- this.gridColumn13.MinWidth = 26;
+ this.gridColumn13.MinWidth = 30;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.OptionsColumn.ReadOnly = true;
this.gridColumn13.Tag = "query_a.fsubmit";
this.gridColumn13.UnboundDataType = typeof(bool);
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 43;
+ this.gridColumn13.Width = 49;
//
// gv_fsubmit
//
this.gv_fsubmit.AppearanceCell.Options.UseFont = true;
this.gv_fsubmit.Caption = "瀹℃牳鏍囪瘑";
this.gv_fsubmit.FieldName = "fsubmitTxt";
- this.gv_fsubmit.MinWidth = 26;
+ this.gv_fsubmit.MinWidth = 30;
this.gv_fsubmit.Name = "gv_fsubmit";
this.gv_fsubmit.OptionsColumn.AllowEdit = false;
this.gv_fsubmit.Tag = "query_a.fsubmit";
this.gv_fsubmit.UnboundDataType = typeof(bool);
this.gv_fsubmit.Visible = true;
this.gv_fsubmit.VisibleIndex = 1;
- this.gv_fsubmit.Width = 43;
+ this.gv_fsubmit.Width = 49;
//
// gv_lotNo
//
this.gv_lotNo.AppearanceCell.Options.UseFont = true;
this.gv_lotNo.Caption = "閫佹鎵规";
this.gv_lotNo.FieldName = "lotNo";
- this.gv_lotNo.MinWidth = 26;
+ this.gv_lotNo.MinWidth = 30;
this.gv_lotNo.Name = "gv_lotNo";
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
this.gv_lotNo.VisibleIndex = 3;
- this.gv_lotNo.Width = 105;
+ this.gv_lotNo.Width = 120;
//
// gv_lifnr
//
this.gv_lifnr.AppearanceCell.Options.UseFont = true;
this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
this.gv_lifnr.FieldName = "suppName";
- this.gv_lifnr.MinWidth = 26;
+ this.gv_lifnr.MinWidth = 30;
this.gv_lifnr.Name = "gv_lifnr";
this.gv_lifnr.OptionsColumn.AllowEdit = false;
this.gv_lifnr.Tag = "query_a.lifnr";
this.gv_lifnr.Visible = true;
this.gv_lifnr.VisibleIndex = 7;
- this.gv_lifnr.Width = 175;
+ this.gv_lifnr.Width = 200;
//
// gv_releaseNo
//
this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
this.gv_releaseNo.FieldName = "releaseNo";
- this.gv_releaseNo.MinWidth = 26;
+ this.gv_releaseNo.MinWidth = 30;
this.gv_releaseNo.Name = "gv_releaseNo";
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
this.gv_releaseNo.Visible = true;
this.gv_releaseNo.VisibleIndex = 2;
- this.gv_releaseNo.Width = 87;
+ this.gv_releaseNo.Width = 99;
//
// gv_itemId
//
this.gv_itemId.AppearanceCell.Options.UseFont = true;
this.gv_itemId.Caption = "鐗╂枡ID";
this.gv_itemId.FieldName = "itemId";
- this.gv_itemId.MinWidth = 26;
+ this.gv_itemId.MinWidth = 30;
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.item_id";
- this.gv_itemId.Width = 26;
+ this.gv_itemId.Width = 30;
//
// gv_itemNo
//
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
this.gv_itemNo.FieldName = "itemNo";
- this.gv_itemNo.MinWidth = 26;
+ this.gv_itemNo.MinWidth = 30;
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 = 8;
- this.gv_itemNo.Width = 119;
+ this.gv_itemNo.Width = 136;
//
// gv_boardStyle
//
this.gv_boardStyle.AppearanceCell.Options.UseFont = true;
this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О";
this.gv_boardStyle.FieldName = "itemName";
- this.gv_boardStyle.MinWidth = 26;
+ this.gv_boardStyle.MinWidth = 30;
this.gv_boardStyle.Name = "gv_boardStyle";
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
this.gv_boardStyle.VisibleIndex = 9;
- this.gv_boardStyle.Width = 143;
+ this.gv_boardStyle.Width = 163;
//
// gridColumn14
//
this.gridColumn14.Caption = "鐗╂枡瑙勬牸";
this.gridColumn14.FieldName = "itemModel";
- this.gridColumn14.MinWidth = 26;
+ this.gridColumn14.MinWidth = 30;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 10;
- this.gridColumn14.Width = 175;
+ this.gridColumn14.Width = 200;
//
// gv_fbatchQty
//
this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
this.gv_fbatchQty.Caption = "鏀惰揣鏁伴噺";
this.gv_fbatchQty.FieldName = "fbatchQty";
- this.gv_fbatchQty.MinWidth = 26;
+ this.gv_fbatchQty.MinWidth = 30;
this.gv_fbatchQty.Name = "gv_fbatchQty";
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
this.gv_fbatchQty.Visible = true;
this.gv_fbatchQty.VisibleIndex = 11;
- this.gv_fbatchQty.Width = 70;
+ this.gv_fbatchQty.Width = 80;
//
// gv_fcheckResu
//
this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gv_fcheckResu.FieldName = "fcheckResu";
- this.gv_fcheckResu.MinWidth = 26;
+ this.gv_fcheckResu.MinWidth = 30;
this.gv_fcheckResu.Name = "gv_fcheckResu";
this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
this.gv_fcheckResu.VisibleIndex = 5;
- this.gv_fcheckResu.Width = 43;
+ this.gv_fcheckResu.Width = 49;
//
// gv_fcovertQty
//
this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
this.gv_fcovertQty.Caption = "杞崲鏁伴噺";
this.gv_fcovertQty.FieldName = "fcovertQty";
- this.gv_fcovertQty.MinWidth = 26;
+ this.gv_fcovertQty.MinWidth = 30;
this.gv_fcovertQty.Name = "gv_fcovertQty";
this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
- this.gv_fcovertQty.Width = 52;
+ this.gv_fcovertQty.Width = 59;
//
// gv_remarks
//
this.gv_remarks.AppearanceCell.Options.UseFont = true;
this.gv_remarks.Caption = "澶囨敞璇存槑";
this.gv_remarks.FieldName = "remarks";
- this.gv_remarks.MinWidth = 26;
+ this.gv_remarks.MinWidth = 30;
this.gv_remarks.Name = "gv_remarks";
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
this.gv_remarks.VisibleIndex = 12;
- this.gv_remarks.Width = 87;
+ this.gv_remarks.Width = 99;
//
// gv_fcheckBy
//
this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
this.gv_fcheckBy.FieldName = "fcheckBy";
- this.gv_fcheckBy.MinWidth = 26;
+ this.gv_fcheckBy.MinWidth = 30;
this.gv_fcheckBy.Name = "gv_fcheckBy";
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
this.gv_fcheckBy.VisibleIndex = 13;
- this.gv_fcheckBy.Width = 103;
+ this.gv_fcheckBy.Width = 118;
//
// gv_fcheckDate
//
this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
this.gv_fcheckDate.FieldName = "fcheckDate";
- this.gv_fcheckDate.MinWidth = 26;
+ this.gv_fcheckDate.MinWidth = 30;
this.gv_fcheckDate.Name = "gv_fcheckDate";
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
this.gv_fcheckDate.VisibleIndex = 15;
- this.gv_fcheckDate.Width = 159;
+ this.gv_fcheckDate.Width = 182;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 26;
+ this.gv_createBy.MinWidth = 30;
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 = 14;
- this.gv_createBy.Width = 59;
+ this.gv_createBy.Width = 67;
//
// gridColumn15
//
this.gridColumn15.Caption = "鍒涘缓鏃ユ湡";
this.gridColumn15.FieldName = "createDate";
- this.gridColumn15.MinWidth = 22;
+ this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 16;
- this.gridColumn15.Width = 82;
+ this.gridColumn15.Width = 94;
//
// gv_lastupdateBy
//
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉";
this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 26;
+ this.gv_lastupdateBy.MinWidth = 30;
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 = 17;
- this.gv_lastupdateBy.Width = 52;
+ this.gv_lastupdateBy.Width = 59;
//
// gv_lastupdateDate
//
this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版棩鏈�";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 26;
+ this.gv_lastupdateDate.MinWidth = 30;
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 = 18;
- this.gv_lastupdateDate.Width = 105;
+ this.gv_lastupdateDate.Width = 120;
//
// gv_fngHandle
//
this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
this.gv_fngHandle.Caption = "澶勭悊鎰忚";
this.gv_fngHandle.FieldName = "fngHandle";
- this.gv_fngHandle.MinWidth = 26;
+ this.gv_fngHandle.MinWidth = 30;
this.gv_fngHandle.Name = "gv_fngHandle";
this.gv_fngHandle.OptionsColumn.AllowEdit = false;
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
this.gv_fngHandle.VisibleIndex = 6;
- this.gv_fngHandle.Width = 87;
+ this.gv_fngHandle.Width = 99;
//
// bandedGridColumn1
//
this.bandedGridColumn1.Caption = "鏀舵枡缁勭粐";
this.bandedGridColumn1.FieldName = "receivingOrg";
- this.bandedGridColumn1.MinWidth = 43;
+ this.bandedGridColumn1.MinWidth = 49;
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Tag = "org.fnamber";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.VisibleIndex = 19;
- this.bandedGridColumn1.Width = 218;
+ this.bandedGridColumn1.Width = 249;
//
// gridColumn18
//
this.gridColumn18.Caption = "瀹℃牳浜�";
this.gridColumn18.FieldName = "fsubmitBy";
- this.gridColumn18.MinWidth = 22;
+ this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 20;
- this.gridColumn18.Width = 82;
+ this.gridColumn18.Width = 94;
//
// gridColumn19
//
this.gridColumn19.Caption = "瀹℃牳鏃ユ湡";
this.gridColumn19.FieldName = "fsubmitDate";
- this.gridColumn19.MinWidth = 22;
+ this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 21;
- this.gridColumn19.Width = 82;
+ this.gridColumn19.Width = 94;
//
// gridColumn17
//
this.gridColumn17.Caption = "涓婚敭Guid";
this.gridColumn17.FieldName = "guid";
- this.gridColumn17.MinWidth = 22;
+ this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.Width = 82;
+ this.gridColumn17.Width = 94;
//
// gridColumn23
//
this.gridColumn23.Caption = "閲囪喘鍗曞彿";
this.gridColumn23.FieldName = "cgdNo";
- this.gridColumn23.MinWidth = 22;
+ this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 22;
- this.gridColumn23.Width = 82;
+ this.gridColumn23.Width = 94;
//
// gridColumn_cgdCreate
//
this.gridColumn_cgdCreate.Caption = "閲囪喘璁㈠崟鍒涘缓浜�";
this.gridColumn_cgdCreate.FieldName = "cgdCreate";
- this.gridColumn_cgdCreate.MinWidth = 22;
+ this.gridColumn_cgdCreate.MinWidth = 25;
this.gridColumn_cgdCreate.Name = "gridColumn_cgdCreate";
this.gridColumn_cgdCreate.Visible = true;
this.gridColumn_cgdCreate.VisibleIndex = 23;
- this.gridColumn_cgdCreate.Width = 87;
+ this.gridColumn_cgdCreate.Width = 99;
//
// gridColumn30
//
this.gridColumn30.Caption = "绫诲瀷";
this.gridColumn30.FieldName = "orderType";
- this.gridColumn30.MinWidth = 22;
+ this.gridColumn30.MinWidth = 25;
this.gridColumn30.Name = "gridColumn30";
- this.gridColumn30.Width = 82;
+ this.gridColumn30.Width = 94;
//
// gridColumn5
//
this.gridColumn5.Caption = "妫�楠岀姸鎬�";
this.gridColumn5.FieldName = "checkStates";
- this.gridColumn5.MinWidth = 22;
+ this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 4;
- this.gridColumn5.Width = 82;
+ this.gridColumn5.Width = 94;
//
// gridColumn6
//
this.gridColumn6.Caption = "鍒ゅ畾缁撴灉";
this.gridColumn6.FieldName = "freceQty";
- this.gridColumn6.MinWidth = 22;
+ this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
- this.gridColumn6.Width = 82;
+ this.gridColumn6.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "闇�姹傝窡韪彿";
+ this.gridColumn8.FieldName = "salesOrderId";
+ this.gridColumn8.MinWidth = 23;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 24;
+ this.gridColumn8.Width = 86;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 495);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.pageBar1.Location = new System.Drawing.Point(0, 639);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1255, 29);
+ this.pageBar1.Size = new System.Drawing.Size(1435, 37);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1255, 534);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1435, 688);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -1774,6 +1823,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -1786,17 +1836,18 @@
this.splitMx1.Panel2.Controls.Add(this.xtraTabControl2);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1255, 534);
- this.splitMx1.SplitterPosition = 210;
+ this.splitMx1.Size = new System.Drawing.Size(1435, 688);
+ this.splitMx1.SplitterPosition = 270;
this.splitMx1.TabIndex = 0;
//
// xtraTabControl2
//
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(3, 4, 3, 4);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
- this.xtraTabControl2.Size = new System.Drawing.Size(1255, 314);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1435, 406);
this.xtraTabControl2.TabIndex = 3;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1806,15 +1857,17 @@
//
this.tabMxPage1.Controls.Add(this.splitMx2);
this.tabMxPage1.Controls.Add(this.panMsg);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1253, 288);
+ this.tabMxPage1.Size = new System.Drawing.Size(1433, 374);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitMx2
//
this.splitMx2.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx2.Horizontal = false;
- this.splitMx2.Location = new System.Drawing.Point(0, 36);
+ this.splitMx2.Location = new System.Drawing.Point(0, 46);
+ this.splitMx2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.splitMx2.Name = "splitMx2";
//
// splitMx2.Panel1
@@ -1826,17 +1879,19 @@
//
this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
this.splitMx2.Panel2.Text = "Panel2";
- this.splitMx2.Size = new System.Drawing.Size(1253, 252);
- this.splitMx2.SplitterPosition = 223;
+ this.splitMx2.Size = new System.Drawing.Size(1433, 328);
+ this.splitMx2.SplitterPosition = 287;
this.splitMx2.TabIndex = 3;
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1253, 223);
+ this.gcMx1.Size = new System.Drawing.Size(1433, 287);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1845,7 +1900,7 @@
//
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx1.ColumnPanelRowHeight = 39;
+ this.gvMx1.ColumnPanelRowHeight = 50;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1fcheckItem,
@@ -1865,7 +1920,6 @@
this.gvMx1fcheckLevel,
this.gvMx1facLevel,
this.gridColumn7});
- this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1877,129 +1931,129 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 43;
+ this.gvMx1guid.MinWidth = 49;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 82;
+ this.gvMx1guid.Width = 94;
//
// gvMx1fcheckItem
//
this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
this.gvMx1fcheckItem.FieldName = "fcheckItem";
- this.gvMx1fcheckItem.MinWidth = 43;
+ this.gvMx1fcheckItem.MinWidth = 49;
this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
this.gvMx1fcheckItem.Tag = "query_a.fcheck_item";
this.gvMx1fcheckItem.Visible = true;
this.gvMx1fcheckItem.VisibleIndex = 0;
- this.gvMx1fcheckItem.Width = 105;
+ this.gvMx1fcheckItem.Width = 120;
//
// gvMx1fcheckTool
//
this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
this.gvMx1fcheckTool.FieldName = "fcheckTool";
- this.gvMx1fcheckTool.MinWidth = 43;
+ this.gvMx1fcheckTool.MinWidth = 49;
this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
this.gvMx1fcheckTool.Tag = "query_a.fcheck_tool";
this.gvMx1fcheckTool.Visible = true;
this.gvMx1fcheckTool.VisibleIndex = 1;
- this.gvMx1fcheckTool.Width = 87;
+ this.gvMx1fcheckTool.Width = 99;
//
// gvMx1fcheckItemDesc
//
this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
- this.gvMx1fcheckItemDesc.MinWidth = 43;
+ this.gvMx1fcheckItemDesc.MinWidth = 49;
this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
this.gvMx1fcheckItemDesc.OptionsEditForm.Visible = DevExpress.Utils.DefaultBoolean.False;
this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
- this.gvMx1fcheckItemDesc.Width = 105;
+ this.gvMx1fcheckItemDesc.Width = 120;
//
// gvMx1fspecRequ
//
this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
this.gvMx1fspecRequ.FieldName = "fspecRequ";
- this.gvMx1fspecRequ.MinWidth = 43;
+ this.gvMx1fspecRequ.MinWidth = 49;
this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
this.gvMx1fspecRequ.Visible = true;
this.gvMx1fspecRequ.VisibleIndex = 2;
- this.gvMx1fspecRequ.Width = 105;
+ this.gvMx1fspecRequ.Width = 120;
//
// gvMx1fupAllow
//
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
- this.gvMx1fupAllow.MinWidth = 43;
+ this.gvMx1fupAllow.MinWidth = 49;
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
this.gvMx1fupAllow.Tag = "query_a.fup_allow";
this.gvMx1fupAllow.Visible = true;
this.gvMx1fupAllow.VisibleIndex = 3;
- this.gvMx1fupAllow.Width = 43;
+ this.gvMx1fupAllow.Width = 49;
//
// gvMx1fstand
//
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
- this.gvMx1fstand.MinWidth = 43;
+ this.gvMx1fstand.MinWidth = 49;
this.gvMx1fstand.Name = "gvMx1fstand";
this.gvMx1fstand.Tag = "query_a.fstand";
this.gvMx1fstand.Visible = true;
this.gvMx1fstand.VisibleIndex = 4;
- this.gvMx1fstand.Width = 61;
+ this.gvMx1fstand.Width = 70;
//
// gvMx1fdownAllow
//
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
- this.gvMx1fdownAllow.MinWidth = 43;
+ this.gvMx1fdownAllow.MinWidth = 49;
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
this.gvMx1fdownAllow.Visible = true;
this.gvMx1fdownAllow.VisibleIndex = 5;
- this.gvMx1fdownAllow.Width = 43;
+ this.gvMx1fdownAllow.Width = 49;
//
// gvMx1freQty
//
this.gvMx1freQty.AppearanceCell.Options.UseFont = true;
this.gvMx1freQty.Caption = "RE鏁伴噺";
this.gvMx1freQty.FieldName = "freQty";
- this.gvMx1freQty.MinWidth = 43;
+ this.gvMx1freQty.MinWidth = 49;
this.gvMx1freQty.Name = "gvMx1freQty";
this.gvMx1freQty.Tag = "query_a.fre_qty";
this.gvMx1freQty.Visible = true;
this.gvMx1freQty.VisibleIndex = 6;
- this.gvMx1freQty.Width = 43;
+ this.gvMx1freQty.Width = 49;
//
// gvMx1checkQyt
//
this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
this.gvMx1checkQyt.FieldName = "checkQyt";
- this.gvMx1checkQyt.MinWidth = 43;
+ this.gvMx1checkQyt.MinWidth = 49;
this.gvMx1checkQyt.Name = "gvMx1checkQyt";
this.gvMx1checkQyt.Tag = "query_a.check_qyt";
this.gvMx1checkQyt.Visible = true;
this.gvMx1checkQyt.VisibleIndex = 7;
- this.gvMx1checkQyt.Width = 52;
+ this.gvMx1checkQyt.Width = 59;
//
// gvMx1fenterQty
//
this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
this.gvMx1fenterQty.FieldName = "fenterQty";
- this.gvMx1fenterQty.MinWidth = 52;
+ this.gvMx1fenterQty.MinWidth = 59;
this.gvMx1fenterQty.Name = "gvMx1fenterQty";
this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
this.gvMx1fenterQty.Visible = true;
this.gvMx1fenterQty.VisibleIndex = 8;
- this.gvMx1fenterQty.Width = 52;
+ this.gvMx1fenterQty.Width = 59;
//
// gvMx1fcheckResu
//
@@ -2010,85 +2064,86 @@
this.gvMx1fcheckResu.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gvMx1fcheckResu.FieldName = "fcheckResu";
- this.gvMx1fcheckResu.MinWidth = 43;
+ this.gvMx1fcheckResu.MinWidth = 49;
this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
this.gvMx1fcheckResu.Visible = true;
this.gvMx1fcheckResu.VisibleIndex = 9;
- this.gvMx1fcheckResu.Width = 82;
+ this.gvMx1fcheckResu.Width = 94;
//
// gvMx1fngRate
//
this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
this.gvMx1fngRate.FieldName = "fngRateName";
- this.gvMx1fngRate.MinWidth = 43;
+ this.gvMx1fngRate.MinWidth = 49;
this.gvMx1fngRate.Name = "gvMx1fngRate";
this.gvMx1fngRate.Tag = "query_a.fng_rate";
this.gvMx1fngRate.Visible = true;
this.gvMx1fngRate.VisibleIndex = 10;
- this.gvMx1fngRate.Width = 82;
+ this.gvMx1fngRate.Width = 94;
//
// gvMx1fngQty
//
this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟";
this.gvMx1fngQty.FieldName = "fngQty";
- this.gvMx1fngQty.MinWidth = 43;
+ this.gvMx1fngQty.MinWidth = 49;
this.gvMx1fngQty.Name = "gvMx1fngQty";
this.gvMx1fngQty.Tag = "query_a.fng_qty";
this.gvMx1fngQty.Visible = true;
this.gvMx1fngQty.VisibleIndex = 11;
- this.gvMx1fngQty.Width = 43;
+ this.gvMx1fngQty.Width = 49;
//
// gvMx1sampleSizeNo
//
this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�";
this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
- this.gvMx1sampleSizeNo.MinWidth = 43;
+ this.gvMx1sampleSizeNo.MinWidth = 49;
this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
this.gvMx1sampleSizeNo.Visible = true;
this.gvMx1sampleSizeNo.VisibleIndex = 12;
- this.gvMx1sampleSizeNo.Width = 175;
+ this.gvMx1sampleSizeNo.Width = 200;
//
// gvMx1fcheckLevel
//
this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
- this.gvMx1fcheckLevel.MinWidth = 43;
+ this.gvMx1fcheckLevel.MinWidth = 49;
this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
this.gvMx1fcheckLevel.Visible = true;
this.gvMx1fcheckLevel.VisibleIndex = 13;
- this.gvMx1fcheckLevel.Width = 175;
+ this.gvMx1fcheckLevel.Width = 200;
//
// gvMx1facLevel
//
this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
this.gvMx1facLevel.FieldName = "facLevel";
- this.gvMx1facLevel.MinWidth = 43;
+ this.gvMx1facLevel.MinWidth = 49;
this.gvMx1facLevel.Name = "gvMx1facLevel";
this.gvMx1facLevel.Tag = "query_a.fac_level";
this.gvMx1facLevel.Visible = true;
this.gvMx1facLevel.VisibleIndex = 14;
- this.gvMx1facLevel.Width = 175;
+ this.gvMx1facLevel.Width = 200;
//
// gridColumn7
//
this.gridColumn7.Caption = "鏍锋湰鏁�";
this.gridColumn7.FieldName = "ybsl";
- this.gridColumn7.MinWidth = 22;
+ this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Width = 82;
+ this.gridColumn7.Width = 94;
//
// splitYangLi
//
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(3, 4, 3, 4);
this.splitYangLi.Name = "splitYangLi";
//
// splitYangLi.Panel1
@@ -2100,8 +2155,8 @@
//
this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
this.splitYangLi.Panel2.Text = "Panel2";
- this.splitYangLi.Size = new System.Drawing.Size(1253, 19);
- this.splitYangLi.SplitterPosition = 591;
+ this.splitYangLi.Size = new System.Drawing.Size(1433, 29);
+ this.splitYangLi.SplitterPosition = 675;
this.splitYangLi.TabIndex = 4;
//
// groupControl1
@@ -2109,18 +2164,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(3, 4, 3, 4);
this.groupControl1.Name = "groupControl1";
- this.groupControl1.Size = new System.Drawing.Size(591, 19);
+ this.groupControl1.Size = new System.Drawing.Size(675, 29);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "妫�娴嬬粨鏋�";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.Location = new System.Drawing.Point(2, 23);
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.gcMx2.Location = new System.Drawing.Point(2, 28);
this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(587, 0);
+ this.gcMx2.Size = new System.Drawing.Size(671, 0);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2135,7 +2193,6 @@
this.gridColumn20,
this.gridColumn21,
this.gridColumn25});
- this.gvMx2.DetailHeight = 272;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
//
@@ -2143,83 +2200,86 @@
//
this.gridColumn4.Caption = "guid涓嶈兘鍒犻櫎";
this.gridColumn4.FieldName = "guid";
- this.gridColumn4.MinWidth = 22;
+ this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
- this.gridColumn4.Width = 82;
+ this.gridColumn4.Width = 94;
//
// gridColumn3
//
this.gridColumn3.Caption = "椤圭洰";
this.gridColumn3.FieldName = "fcheckItem";
- this.gridColumn3.MaxWidth = 168;
- this.gridColumn3.MinWidth = 22;
+ this.gridColumn3.MaxWidth = 192;
+ this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 0;
- this.gridColumn3.Width = 168;
+ this.gridColumn3.Width = 192;
//
// gridColumn2
//
this.gridColumn2.Caption = "鎶芥缁撴灉";
this.gridColumn2.FieldName = "fcheckResu";
- this.gridColumn2.MaxWidth = 70;
- this.gridColumn2.MinWidth = 22;
+ this.gridColumn2.MaxWidth = 80;
+ this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.ReadOnly = true;
- this.gridColumn2.Width = 70;
+ this.gridColumn2.Width = 80;
//
// gridColumn20
//
this.gridColumn20.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn20.FieldName = "fstand";
- this.gridColumn20.MinWidth = 22;
+ this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.OptionsColumn.ReadOnly = true;
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 1;
- this.gridColumn20.Width = 82;
+ this.gridColumn20.Width = 94;
//
// gridColumn21
//
this.gridColumn21.Caption = "鎿嶄綔浜�";
this.gridColumn21.FieldName = "createBy";
- this.gridColumn21.MinWidth = 22;
+ this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.OptionsColumn.ReadOnly = true;
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 2;
- this.gridColumn21.Width = 82;
+ this.gridColumn21.Width = 94;
//
// gridColumn25
//
this.gridColumn25.Caption = "鎿嶄綔鏃堕棿";
this.gridColumn25.FieldName = "createDate";
- this.gridColumn25.MinWidth = 22;
+ this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.OptionsColumn.ReadOnly = true;
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 3;
- this.gridColumn25.Width = 82;
+ this.gridColumn25.Width = 94;
//
// groupControl2
//
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(3, 4, 3, 4);
this.groupControl2.Name = "groupControl2";
- this.groupControl2.Size = new System.Drawing.Size(652, 19);
+ this.groupControl2.Size = new System.Drawing.Size(746, 29);
this.groupControl2.TabIndex = 4;
this.groupControl2.Text = "鏍锋湰缁撴灉";
//
// gcMx3
//
this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx3.Location = new System.Drawing.Point(2, 23);
+ this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.gcMx3.Location = new System.Drawing.Point(2, 28);
this.gcMx3.MainView = this.gvMx3;
+ this.gcMx3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gcMx3.Name = "gcMx3";
- this.gcMx3.Size = new System.Drawing.Size(648, 0);
+ this.gcMx3.Size = new System.Drawing.Size(742, 0);
this.gcMx3.TabIndex = 0;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -2235,7 +2295,6 @@
this.gridColumn24,
this.gridColumn26,
this.gridColumn27});
- this.gvMx3.DetailHeight = 272;
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
//
@@ -2243,85 +2302,86 @@
//
this.gridColumn1.Caption = "guid涓嶈兘鍒犻櫎";
this.gridColumn1.FieldName = "guid";
- this.gridColumn1.MinWidth = 22;
+ this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
- this.gridColumn1.Width = 82;
+ this.gridColumn1.Width = 94;
//
// gridColumn22
//
this.gridColumn22.Caption = "椤圭洰";
this.gridColumn22.FieldName = "fcheckItemd5";
- this.gridColumn22.MaxWidth = 168;
- this.gridColumn22.MinWidth = 22;
+ this.gridColumn22.MaxWidth = 192;
+ this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.OptionsColumn.ReadOnly = true;
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 0;
- this.gridColumn22.Width = 168;
+ this.gridColumn22.Width = 192;
//
// gridColumn28
//
this.gridColumn28.Caption = "鏍锋湰搴�";
this.gridColumn28.FieldName = "fcheckItem";
- this.gridColumn28.MinWidth = 22;
+ this.gridColumn28.MinWidth = 25;
this.gridColumn28.Name = "gridColumn28";
this.gridColumn28.OptionsColumn.ReadOnly = true;
this.gridColumn28.Visible = true;
this.gridColumn28.VisibleIndex = 1;
- this.gridColumn28.Width = 82;
+ this.gridColumn28.Width = 94;
//
// gridColumn29
//
this.gridColumn29.Caption = "鏍锋湰鍊�";
this.gridColumn29.FieldName = "fcheckResu";
- this.gridColumn29.MinWidth = 22;
+ this.gridColumn29.MinWidth = 25;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.OptionsColumn.ReadOnly = true;
this.gridColumn29.Visible = true;
this.gridColumn29.VisibleIndex = 2;
- this.gridColumn29.Width = 82;
+ this.gridColumn29.Width = 94;
//
// gridColumn24
//
this.gridColumn24.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn24.FieldName = "fstand";
- this.gridColumn24.MinWidth = 22;
+ this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.OptionsColumn.ReadOnly = true;
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 3;
- this.gridColumn24.Width = 82;
+ this.gridColumn24.Width = 94;
//
// gridColumn26
//
this.gridColumn26.Caption = "鎿嶄綔浜�";
this.gridColumn26.FieldName = "createBy";
- this.gridColumn26.MinWidth = 22;
+ this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.OptionsColumn.ReadOnly = true;
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 4;
- this.gridColumn26.Width = 82;
+ this.gridColumn26.Width = 94;
//
// gridColumn27
//
this.gridColumn27.Caption = "鎿嶄綔鏃堕棿";
this.gridColumn27.FieldName = "createDate";
- this.gridColumn27.MinWidth = 22;
+ this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.OptionsColumn.ReadOnly = true;
this.gridColumn27.Visible = true;
this.gridColumn27.VisibleIndex = 5;
- this.gridColumn27.Width = 82;
+ this.gridColumn27.Width = 94;
//
// panMsg
//
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(3, 4, 3, 4);
this.panMsg.Name = "panMsg";
- this.panMsg.Size = new System.Drawing.Size(1253, 36);
+ this.panMsg.Size = new System.Drawing.Size(1433, 46);
this.panMsg.TabIndex = 1;
//
// layoutMxMsg
@@ -2331,19 +2391,21 @@
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(3, 4, 3, 4);
this.layoutMxMsg.Name = "layoutMxMsg";
this.layoutMxMsg.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(348, 385, 812, 500);
this.layoutMxMsg.Root = this.layoutControlGroup1;
- this.layoutMxMsg.Size = new System.Drawing.Size(1249, 32);
+ this.layoutMxMsg.Size = new System.Drawing.Size(1429, 42);
this.layoutMxMsg.TabIndex = 0;
this.layoutMxMsg.Text = "layoutControl1";
//
// btnIpt
//
this.btnIpt.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.calculatenow_32x32;
- this.btnIpt.Location = new System.Drawing.Point(1138, 2);
+ this.btnIpt.Location = new System.Drawing.Point(1321, 3);
+ this.btnIpt.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnIpt.Name = "btnIpt";
- this.btnIpt.Size = new System.Drawing.Size(92, 27);
+ this.btnIpt.Size = new System.Drawing.Size(106, 34);
this.btnIpt.StyleController = this.layoutMxMsg;
this.btnIpt.TabIndex = 4;
this.btnIpt.Text = "鏍锋湰绠＄悊";
@@ -2351,20 +2413,22 @@
// btnLoad
//
this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.refresh_32x321;
- this.btnLoad.Location = new System.Drawing.Point(993, 2);
+ this.btnLoad.Location = new System.Drawing.Point(1155, 3);
+ this.btnLoad.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnLoad.Name = "btnLoad";
- this.btnLoad.Size = new System.Drawing.Size(141, 27);
+ this.btnLoad.Size = new System.Drawing.Size(162, 34);
this.btnLoad.StyleController = this.layoutMxMsg;
this.btnLoad.TabIndex = 3;
this.btnLoad.Text = "閲嶆柊鍔犺浇妫�楠岄」鐩�";
//
// txtJianYan
//
- this.txtJianYan.Location = new System.Drawing.Point(182, 2);
+ this.txtJianYan.Location = new System.Drawing.Point(223, 3);
+ this.txtJianYan.Margin = new System.Windows.Forms.Padding(3, 4, 3, 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(573, 30);
+ this.txtJianYan.Size = new System.Drawing.Size(654, 36);
this.txtJianYan.StyleController = this.layoutMxMsg;
this.txtJianYan.TabIndex = 2;
//
@@ -2385,7 +2449,7 @@
columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition15.Width = 100D;
columnDefinition16.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition16.Width = 96D;
+ columnDefinition16.Width = 110D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition13,
columnDefinition14,
@@ -2396,7 +2460,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition10});
this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup1.Size = new System.Drawing.Size(1232, 34);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1429, 42);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem11
@@ -2406,20 +2470,20 @@
this.layoutControlItem11.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(757, 34);
+ this.layoutControlItem11.Size = new System.Drawing.Size(879, 42);
this.layoutControlItem11.Text = "褰曞叆妫�楠岀粨鏋滐紙OK-19,NG-19锛�";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(168, 14);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(207, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
this.layoutControlItem20.Control = this.btnIpt;
- this.layoutControlItem20.Location = new System.Drawing.Point(1136, 0);
- this.layoutControlItem20.MaxSize = new System.Drawing.Size(96, 31);
- this.layoutControlItem20.MinSize = new System.Drawing.Size(96, 31);
+ this.layoutControlItem20.Location = new System.Drawing.Point(1319, 0);
+ this.layoutControlItem20.MaxSize = new System.Drawing.Size(110, 40);
+ this.layoutControlItem20.MinSize = new System.Drawing.Size(110, 40);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(96, 34);
+ this.layoutControlItem20.Size = new System.Drawing.Size(110, 42);
this.layoutControlItem20.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem20.Text = "鏍锋湰绠＄悊";
this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
@@ -2429,12 +2493,12 @@
//
this.layoutControlItem19.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
this.layoutControlItem19.Control = this.btnLoad;
- this.layoutControlItem19.Location = new System.Drawing.Point(757, 0);
- this.layoutControlItem19.MaxSize = new System.Drawing.Size(145, 31);
- this.layoutControlItem19.MinSize = new System.Drawing.Size(145, 31);
+ this.layoutControlItem19.Location = new System.Drawing.Point(879, 0);
+ this.layoutControlItem19.MaxSize = new System.Drawing.Size(166, 40);
+ this.layoutControlItem19.MinSize = new System.Drawing.Size(166, 40);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(379, 34);
+ this.layoutControlItem19.Size = new System.Drawing.Size(440, 42);
this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem19.Text = "閲嶆柊鍔犺浇";
this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
@@ -2443,19 +2507,20 @@
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.ucUpFileList1);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1253, 288);
+ this.tabMxPage2.Size = new System.Drawing.Size(1432, 369);
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(4, 3, 4, 3);
+ this.ucUpFileList1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.ucUpFileList1.Name = "ucUpFileList1";
this.ucUpFileList1.parentGroup = null;
this.ucUpFileList1.pGuid = null;
- this.ucUpFileList1.Size = new System.Drawing.Size(1253, 288);
+ this.ucUpFileList1.Size = new System.Drawing.Size(1432, 369);
this.ucUpFileList1.TabIndex = 0;
//
// repositoryItemComboBox2
@@ -2471,9 +2536,10 @@
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(806, 32);
+ this.picCheckBox.Location = new System.Drawing.Point(921, 41);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(88, 39);
+ this.picCheckBox.Size = new System.Drawing.Size(101, 50);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
@@ -2491,22 +2557,15 @@
//
this.gridView4.Name = "gridView4";
//
- // gridColumn8
- //
- this.gridColumn8.Caption = "闇�姹傝窡韪彿";
- this.gridColumn8.FieldName = "gv_salesOrderId";
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 24;
- //
// Frm_MesQaItemsDetect01
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1257, 622);
+ this.ClientSize = new System.Drawing.Size(1437, 800);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "Frm_MesQaItemsDetect01";
this.Text = "鏉ユ枡妫�楠岀敵璇�";
((System.ComponentModel.ISupportInitialize)(txt_salesOrderId.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
index 173b690..04c56b7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
@@ -30,14 +30,14 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -65,6 +65,7 @@
this.bandedGridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
@@ -85,6 +86,7 @@
this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
this.gcMxL2 = new DevExpress.XtraGrid.GridControl();
this.gvMxL2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -158,6 +160,7 @@
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -180,8 +183,6 @@
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -260,10 +261,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(4, 3, 4, 3);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1180, 62);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1349, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -271,10 +272,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1180, 469);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1349, 603);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -283,8 +285,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1178, 443);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1347, 571);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -293,6 +296,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -304,17 +308,19 @@
//
this.split1.Panel2.Controls.Add(this.xtraTabControl2);
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1178, 443);
- this.split1.SplitterPosition = 287;
+ this.split1.Size = new System.Drawing.Size(1347, 571);
+ this.split1.SplitterPosition = 369;
this.split1.TabIndex = 4;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1178, 115);
+ this.gcMain1.Size = new System.Drawing.Size(1347, 150);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -343,10 +349,10 @@
this.gridColumn3,
this.bandedGridColumn2,
this.gv_guid,
- this.gridColumn14});
- this.gridView1.DetailHeight = 272;
+ this.gridColumn14,
+ this.gridColumn49});
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 43;
+ this.gridView1.IndicatorWidth = 49;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -356,263 +362,277 @@
//
this.colChkInt.Caption = ".";
this.colChkInt.FieldName = "chkInt";
+ this.colChkInt.MinWidth = 23;
this.colChkInt.Name = "colChkInt";
this.colChkInt.Visible = true;
this.colChkInt.VisibleIndex = 0;
- this.colChkInt.Width = 52;
+ this.colChkInt.Width = 59;
//
// gv_ischeck
//
this.gv_ischeck.AppearanceCell.Options.UseFont = true;
this.gv_ischeck.Caption = "瀹℃牳";
this.gv_ischeck.FieldName = "checkStatus";
- this.gv_ischeck.MinWidth = 17;
+ this.gv_ischeck.MinWidth = 19;
this.gv_ischeck.Name = "gv_ischeck";
this.gv_ischeck.OptionsColumn.AllowEdit = false;
this.gv_ischeck.Tag = "query_a.ISCHECK";
this.gv_ischeck.Visible = true;
this.gv_ischeck.VisibleIndex = 1;
- this.gv_ischeck.Width = 82;
+ this.gv_ischeck.Width = 94;
//
// gridColumn9
//
this.gridColumn9.Caption = "濮斿";
this.gridColumn9.FieldName = "isWw";
- this.gridColumn9.MinWidth = 22;
+ this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 2;
- this.gridColumn9.Width = 82;
+ this.gridColumn9.Width = 94;
//
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍏ュ簱鍗曞彿 ";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 17;
+ this.gv_billNo.MinWidth = 19;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 3;
- this.gv_billNo.Width = 157;
+ this.gv_billNo.Width = 179;
//
// gv_taskNo
//
this.gv_taskNo.AppearanceCell.Options.UseFont = true;
this.gv_taskNo.Caption = "鍒拌揣鍗曞彿";
this.gv_taskNo.FieldName = "taskNo";
- this.gv_taskNo.MinWidth = 17;
+ this.gv_taskNo.MinWidth = 19;
this.gv_taskNo.Name = "gv_taskNo";
this.gv_taskNo.OptionsColumn.AllowEdit = false;
this.gv_taskNo.Tag = "query_a.TASK_NO";
this.gv_taskNo.Visible = true;
this.gv_taskNo.VisibleIndex = 4;
- this.gv_taskNo.Width = 82;
+ this.gv_taskNo.Width = 94;
//
// gv_suppNo
//
this.gv_suppNo.AppearanceCell.Options.UseFont = true;
this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鍙�";
this.gv_suppNo.FieldName = "supNo";
- this.gv_suppNo.MinWidth = 17;
+ this.gv_suppNo.MinWidth = 19;
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 = 5;
- this.gv_suppNo.Width = 87;
+ this.gv_suppNo.Width = 99;
//
// gv_suppId
//
this.gv_suppId.AppearanceCell.Options.UseFont = true;
this.gv_suppId.Caption = "渚涘簲鍟嗗悕绉�";
this.gv_suppId.FieldName = "supName";
- this.gv_suppId.MinWidth = 17;
+ this.gv_suppId.MinWidth = 19;
this.gv_suppId.Name = "gv_suppId";
this.gv_suppId.OptionsColumn.AllowEdit = false;
this.gv_suppId.Tag = "query_a.SUPP_ID";
this.gv_suppId.Visible = true;
this.gv_suppId.VisibleIndex = 6;
- this.gv_suppId.Width = 131;
+ this.gv_suppId.Width = 150;
//
// gridColumn4
//
this.gridColumn4.Caption = "浠撳簱缂栧彿";
this.gridColumn4.FieldName = "depotCode";
- this.gridColumn4.MinWidth = 22;
+ this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 7;
- this.gridColumn4.Width = 82;
+ this.gridColumn4.Width = 94;
//
// gv_depotsId
//
this.gv_depotsId.AppearanceCell.Options.UseFont = true;
this.gv_depotsId.Caption = "浠撳簱鍚嶇О";
this.gv_depotsId.FieldName = "depotName";
- this.gv_depotsId.MinWidth = 17;
+ this.gv_depotsId.MinWidth = 19;
this.gv_depotsId.Name = "gv_depotsId";
this.gv_depotsId.OptionsColumn.AllowEdit = false;
this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
this.gv_depotsId.Visible = true;
this.gv_depotsId.VisibleIndex = 8;
- this.gv_depotsId.Width = 87;
+ this.gv_depotsId.Width = 99;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜� ";
this.gv_createBy.FieldName = "createUser";
- this.gv_createBy.MinWidth = 17;
+ this.gv_createBy.MinWidth = 19;
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 = 9;
- this.gv_createBy.Width = 70;
+ this.gv_createBy.Width = 80;
//
// gv_createDate
//
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 17;
+ this.gv_createDate.MinWidth = 19;
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 = 10;
- this.gv_createDate.Width = 157;
+ this.gv_createDate.Width = 179;
//
// gv_lastupdateBy
//
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 17;
+ this.gv_lastupdateBy.MinWidth = 19;
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 = 11;
- this.gv_lastupdateBy.Width = 82;
+ this.gv_lastupdateBy.Width = 94;
//
// gv_lastupdateDate
//
this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 17;
+ this.gv_lastupdateDate.MinWidth = 19;
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 = 12;
- this.gv_lastupdateDate.Width = 82;
+ this.gv_lastupdateDate.Width = 94;
//
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞璇存槑";
this.gv_remark.FieldName = "dhgRemark";
- this.gv_remark.MinWidth = 17;
+ this.gv_remark.MinWidth = 19;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.REMARK";
this.gv_remark.Visible = true;
this.gv_remark.VisibleIndex = 13;
- this.gv_remark.Width = 105;
+ this.gv_remark.Width = 120;
//
// gv_paperBillNo
//
this.gv_paperBillNo.AppearanceCell.Options.UseFont = true;
this.gv_paperBillNo.Caption = "閫佽揣鍗曞彿 ";
this.gv_paperBillNo.FieldName = "shdh";
- this.gv_paperBillNo.MinWidth = 17;
+ this.gv_paperBillNo.MinWidth = 19;
this.gv_paperBillNo.Name = "gv_paperBillNo";
this.gv_paperBillNo.OptionsColumn.AllowEdit = false;
this.gv_paperBillNo.Tag = "query_a.PAPER_BILL_NO";
this.gv_paperBillNo.Visible = true;
this.gv_paperBillNo.VisibleIndex = 14;
- this.gv_paperBillNo.Width = 105;
+ this.gv_paperBillNo.Width = 120;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
this.gv_checkUser.FieldName = "checkUserName";
- this.gv_checkUser.MinWidth = 17;
+ this.gv_checkUser.MinWidth = 19;
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 = 15;
- this.gv_checkUser.Width = 52;
+ this.gv_checkUser.Width = 59;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 17;
+ this.gv_checkDate.MinWidth = 19;
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 = 16;
- this.gv_checkDate.Width = 157;
+ this.gv_checkDate.Width = 179;
//
// gridColumn3
//
this.gridColumn3.Caption = "鍏ュ簱绫诲埆";
this.gridColumn3.FieldName = "inType";
- this.gridColumn3.MinWidth = 22;
+ this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 17;
- this.gridColumn3.Width = 82;
+ this.gridColumn3.Width = 94;
//
// bandedGridColumn2
//
this.bandedGridColumn2.Caption = "鏀舵枡缁勭粐";
this.bandedGridColumn2.FieldName = "receivingOrg";
- this.bandedGridColumn2.MinWidth = 17;
+ this.bandedGridColumn2.MinWidth = 19;
this.bandedGridColumn2.Name = "bandedGridColumn2";
this.bandedGridColumn2.Tag = "org.fnamber";
this.bandedGridColumn2.Visible = true;
this.bandedGridColumn2.VisibleIndex = 18;
- this.bandedGridColumn2.Width = 218;
+ this.bandedGridColumn2.Width = 249;
//
// gv_guid
//
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭GUID";
this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 43;
+ this.gv_guid.MinWidth = 49;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
this.gv_guid.Tag = "query_a.GUID";
- this.gv_guid.Width = 82;
+ this.gv_guid.Width = 94;
//
// gridColumn14
//
this.gridColumn14.Caption = "鎵撳嵃娆℃暟";
this.gridColumn14.FieldName = "printCount1";
- this.gridColumn14.MinWidth = 21;
+ this.gridColumn14.MinWidth = 24;
this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Tag = "a.printCount";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 19;
+ this.gridColumn14.Width = 86;
+ //
+ // gridColumn49
+ //
+ this.gridColumn49.Caption = "闇�姹傝窡韪彿";
+ this.gridColumn49.FieldName = "salesOrderId";
+ this.gridColumn49.MinWidth = 25;
+ this.gridColumn49.Name = "gridColumn49";
+ this.gridColumn49.Tag = "z.salesOrderId";
+ this.gridColumn49.Visible = true;
+ this.gridColumn49.VisibleIndex = 20;
+ this.gridColumn49.Width = 86;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 115);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.pageBar1.Location = new System.Drawing.Point(0, 150);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1178, 31);
+ this.pageBar1.Size = new System.Drawing.Size(1347, 40);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -620,10 +640,10 @@
//
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(2);
+ this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.xtraTabPage4;
- this.xtraTabControl2.Size = new System.Drawing.Size(1178, 287);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1347, 369);
this.xtraTabControl2.TabIndex = 0;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage4,
@@ -632,18 +652,20 @@
// xtraTabPage4
//
this.xtraTabPage4.Controls.Add(this.gcMxL1);
- this.xtraTabPage4.Margin = new System.Windows.Forms.Padding(2);
+ this.xtraTabPage4.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.xtraTabPage4.Name = "xtraTabPage4";
- this.xtraTabPage4.Size = new System.Drawing.Size(1176, 261);
+ this.xtraTabPage4.Size = new System.Drawing.Size(1345, 337);
this.xtraTabPage4.Text = "鐗╂枡鏄庣粏";
//
// gcMxL1
//
this.gcMxL1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMxL1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gcMxL1.Location = new System.Drawing.Point(0, 0);
this.gcMxL1.MainView = this.gvMxL1;
+ this.gcMxL1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gcMxL1.Name = "gcMxL1";
- this.gcMxL1.Size = new System.Drawing.Size(1176, 261);
+ this.gcMxL1.Size = new System.Drawing.Size(1345, 337);
this.gcMxL1.TabIndex = 1;
this.gcMxL1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMxL1});
@@ -668,7 +690,6 @@
this.gridColumn28,
this.gridColumn29,
this.gridColumn48});
- this.gvMxL1.DetailHeight = 272;
this.gvMxL1.GridControl = this.gcMxL1;
this.gvMxL1.Name = "gvMxL1";
this.gvMxL1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -680,176 +701,187 @@
this.gridColumn15.AppearanceCell.Options.UseFont = true;
this.gridColumn15.Caption = "鏄庣粏琛ㄤ富閿瓽UID";
this.gridColumn15.FieldName = "guid";
- this.gridColumn15.MinWidth = 43;
+ this.gridColumn15.MinWidth = 49;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Tag = "query_a.guid";
- this.gridColumn15.Width = 82;
+ this.gridColumn15.Width = 94;
//
// gridColumn16
//
this.gridColumn16.AppearanceCell.Options.UseFont = true;
this.gridColumn16.Caption = "鐗╂枡ID";
this.gridColumn16.FieldName = "itemId";
- this.gridColumn16.MinWidth = 17;
+ this.gridColumn16.MinWidth = 19;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Tag = "query_a.ITEM_ID";
- this.gridColumn16.Width = 82;
+ this.gridColumn16.Width = 94;
//
// gridColumn17
//
this.gridColumn17.Caption = "鐗╂枡缂栧彿";
this.gridColumn17.FieldName = "itemNo";
- this.gridColumn17.MinWidth = 17;
+ this.gridColumn17.MinWidth = 19;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 0;
- this.gridColumn17.Width = 82;
+ this.gridColumn17.Width = 94;
//
// gridColumn18
//
this.gridColumn18.AppearanceCell.Options.UseFont = true;
this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
this.gridColumn18.FieldName = "itemName";
- this.gridColumn18.MinWidth = 17;
+ this.gridColumn18.MinWidth = 19;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Tag = "query_a.ITEM_SNAME";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 1;
- this.gridColumn18.Width = 82;
+ this.gridColumn18.Width = 94;
//
// gridColumn19
//
this.gridColumn19.Caption = "鐗╂枡瑙勬牸";
this.gridColumn19.FieldName = "itemModel";
- this.gridColumn19.MinWidth = 17;
+ this.gridColumn19.MinWidth = 19;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 2;
- this.gridColumn19.Width = 82;
+ this.gridColumn19.Width = 94;
//
// gridColumn20
//
this.gridColumn20.AppearanceCell.Options.UseFont = true;
this.gridColumn20.Caption = "鏁伴噺";
this.gridColumn20.FieldName = "quantity";
- this.gridColumn20.MinWidth = 17;
+ this.gridColumn20.MinWidth = 19;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Tag = "query_a.QUANTITY";
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 3;
- this.gridColumn20.Width = 82;
+ this.gridColumn20.Width = 94;
//
// gridColumn21
//
this.gridColumn21.AppearanceCell.Options.UseFont = true;
this.gridColumn21.Caption = "搴撳瓨鍗曚綅";
this.gridColumn21.FieldName = "kcUnit";
- this.gridColumn21.MinWidth = 17;
+ this.gridColumn21.MinWidth = 19;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Tag = "query_a.UNIT";
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 4;
- this.gridColumn21.Width = 82;
+ this.gridColumn21.Width = 94;
//
// gridColumn22
//
this.gridColumn22.AppearanceCell.Options.UseFont = true;
this.gridColumn22.Caption = "閲囪喘鍗曞彿";
this.gridColumn22.FieldName = "cgdh";
- this.gridColumn22.MinWidth = 17;
+ this.gridColumn22.MinWidth = 19;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Tag = "query_a.EBELN";
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 5;
- this.gridColumn22.Width = 82;
+ this.gridColumn22.Width = 94;
//
// gridColumn23
//
this.gridColumn23.AppearanceCell.Options.UseFont = true;
this.gridColumn23.Caption = "閲囪喘璁㈠崟ID";
this.gridColumn23.FieldName = "ebelnK3id";
- this.gridColumn23.MinWidth = 17;
+ this.gridColumn23.MinWidth = 19;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Tag = "query_a.EBELN_K3ID";
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 6;
- this.gridColumn23.Width = 82;
+ this.gridColumn23.Width = 94;
//
// gridColumn24
//
this.gridColumn24.AppearanceCell.Options.UseFont = true;
this.gridColumn24.Caption = "閲囪喘璁㈠崟琛孖D";
this.gridColumn24.FieldName = "lineK3id";
- this.gridColumn24.MinWidth = 17;
+ this.gridColumn24.MinWidth = 19;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Tag = "query_a.LINE_K3ID";
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 7;
- this.gridColumn24.Width = 82;
+ this.gridColumn24.Width = 94;
//
// gridColumn25
//
this.gridColumn25.Caption = "澶囨敞";
this.gridColumn25.FieldName = "dhgRemark";
- this.gridColumn25.MinWidth = 22;
+ this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 8;
- this.gridColumn25.Width = 82;
+ this.gridColumn25.Width = 94;
//
// gridColumn26
//
this.gridColumn26.Caption = "寤虹珛鑰�";
this.gridColumn26.FieldName = "createBy";
- this.gridColumn26.MinWidth = 22;
+ this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 9;
- this.gridColumn26.Width = 82;
+ this.gridColumn26.Width = 94;
//
// gridColumn27
//
this.gridColumn27.Caption = "寤虹珛鏃堕棿";
this.gridColumn27.FieldName = "createDate";
- this.gridColumn27.MinWidth = 22;
+ this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Visible = true;
this.gridColumn27.VisibleIndex = 10;
- this.gridColumn27.Width = 82;
+ this.gridColumn27.Width = 94;
//
// gridColumn28
//
this.gridColumn28.Caption = "鍏宠仈GUID(鍒拌揣鏄庣粏琛℅uid)";
this.gridColumn28.FieldName = "itemDabid";
- this.gridColumn28.MinWidth = 22;
+ this.gridColumn28.MinWidth = 25;
this.gridColumn28.Name = "gridColumn28";
- this.gridColumn28.Width = 82;
+ this.gridColumn28.Width = 94;
//
// gridColumn29
//
this.gridColumn29.Caption = "闇�姹傝窡韪�";
this.gridColumn29.FieldName = "xqgz";
- this.gridColumn29.MinWidth = 21;
+ this.gridColumn29.MinWidth = 24;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.Visible = true;
this.gridColumn29.VisibleIndex = 11;
- this.gridColumn29.Width = 66;
+ //
+ // gridColumn48
+ //
+ this.gridColumn48.Caption = "鍏嬮噸";
+ this.gridColumn48.FieldName = "weight";
+ this.gridColumn48.MinWidth = 23;
+ this.gridColumn48.Name = "gridColumn48";
+ this.gridColumn48.Visible = true;
+ this.gridColumn48.VisibleIndex = 12;
+ this.gridColumn48.Width = 86;
//
// xtraTabPage5
//
this.xtraTabPage5.Controls.Add(this.gcMxL2);
- this.xtraTabPage5.Margin = new System.Windows.Forms.Padding(2);
+ this.xtraTabPage5.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.xtraTabPage5.Name = "xtraTabPage5";
- this.xtraTabPage5.Size = new System.Drawing.Size(1176, 261);
+ this.xtraTabPage5.Size = new System.Drawing.Size(1345, 337);
this.xtraTabPage5.Text = "鍏ュ簱鏉＄爜";
//
// gcMxL2
//
this.gcMxL2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMxL2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gcMxL2.Location = new System.Drawing.Point(0, 0);
this.gcMxL2.MainView = this.gvMxL2;
+ this.gcMxL2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gcMxL2.Name = "gcMxL2";
- this.gcMxL2.Size = new System.Drawing.Size(1176, 261);
+ this.gcMxL2.Size = new System.Drawing.Size(1345, 337);
this.gcMxL2.TabIndex = 2;
this.gcMxL2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMxL2});
@@ -875,7 +907,6 @@
this.gridColumn44,
this.gridColumn45,
this.gridColumn46});
- this.gvMxL2.DetailHeight = 272;
this.gvMxL2.GridControl = this.gcMxL2;
this.gvMxL2.Name = "gvMxL2";
this.gvMxL2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -887,193 +918,194 @@
this.gridColumn30.AppearanceCell.Options.UseFont = true;
this.gridColumn30.Caption = "guid ";
this.gridColumn30.FieldName = "guid";
- this.gridColumn30.MinWidth = 43;
+ this.gridColumn30.MinWidth = 49;
this.gridColumn30.Name = "gridColumn30";
this.gridColumn30.Tag = "query_a.guid";
- this.gridColumn30.Width = 82;
+ this.gridColumn30.Width = 94;
//
// gridColumn31
//
this.gridColumn31.AppearanceCell.Options.UseFont = true;
this.gridColumn31.Caption = "鎬ユ枡鏍囪";
this.gridColumn31.FieldName = "urgentFlag";
- this.gridColumn31.MinWidth = 43;
+ this.gridColumn31.MinWidth = 49;
this.gridColumn31.Name = "gridColumn31";
this.gridColumn31.Tag = "query_a.URGENT_FLAG";
- this.gridColumn31.Width = 82;
+ this.gridColumn31.Width = 94;
//
// gridColumn32
//
this.gridColumn32.AppearanceCell.Options.UseFont = true;
this.gridColumn32.Caption = "鐗╂枡鏉＄爜";
this.gridColumn32.FieldName = "itemBarcode";
- this.gridColumn32.MinWidth = 17;
+ this.gridColumn32.MinWidth = 19;
this.gridColumn32.Name = "gridColumn32";
this.gridColumn32.Tag = "query_a.ITEM_BARCODE";
this.gridColumn32.Visible = true;
this.gridColumn32.VisibleIndex = 0;
- this.gridColumn32.Width = 218;
+ this.gridColumn32.Width = 249;
//
// gridColumn33
//
this.gridColumn33.AppearanceCell.Options.UseFont = true;
this.gridColumn33.Caption = "閲囪喘鍗曞彿";
this.gridColumn33.FieldName = "ebeln";
- this.gridColumn33.MinWidth = 17;
+ this.gridColumn33.MinWidth = 19;
this.gridColumn33.Name = "gridColumn33";
this.gridColumn33.Tag = "query_a.WORK_NO";
this.gridColumn33.Visible = true;
this.gridColumn33.VisibleIndex = 1;
- this.gridColumn33.Width = 87;
+ this.gridColumn33.Width = 99;
//
// gridColumn34
//
this.gridColumn34.AppearanceCell.Options.UseFont = true;
this.gridColumn34.Caption = "鐗╂枡缂栫爜";
this.gridColumn34.FieldName = "itemNo";
- this.gridColumn34.MinWidth = 17;
+ this.gridColumn34.MinWidth = 19;
this.gridColumn34.Name = "gridColumn34";
this.gridColumn34.Tag = "query_a.C_ITEM_CODE";
this.gridColumn34.Visible = true;
this.gridColumn34.VisibleIndex = 2;
- this.gridColumn34.Width = 87;
+ this.gridColumn34.Width = 99;
//
// gridColumn35
//
this.gridColumn35.AppearanceCell.Options.UseFont = true;
this.gridColumn35.Caption = "鐗╂枡鍚嶇О";
this.gridColumn35.FieldName = "itemName";
- this.gridColumn35.MinWidth = 17;
+ this.gridColumn35.MinWidth = 19;
this.gridColumn35.Name = "gridColumn35";
this.gridColumn35.Tag = "query_a.ITEM_SNAME";
this.gridColumn35.Visible = true;
this.gridColumn35.VisibleIndex = 3;
- this.gridColumn35.Width = 218;
+ this.gridColumn35.Width = 249;
//
// gridColumn36
//
this.gridColumn36.AppearanceCell.Options.UseFont = true;
this.gridColumn36.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn36.FieldName = "itemModel";
- this.gridColumn36.MinWidth = 17;
+ this.gridColumn36.MinWidth = 19;
this.gridColumn36.Name = "gridColumn36";
this.gridColumn36.Tag = "query_a.ITEM_NO";
this.gridColumn36.Visible = true;
this.gridColumn36.VisibleIndex = 4;
- this.gridColumn36.Width = 218;
+ this.gridColumn36.Width = 249;
//
// gridColumn37
//
this.gridColumn37.AppearanceCell.Options.UseFont = true;
this.gridColumn37.Caption = "鏁伴噺";
this.gridColumn37.FieldName = "quantity";
- this.gridColumn37.MinWidth = 17;
+ this.gridColumn37.MinWidth = 19;
this.gridColumn37.Name = "gridColumn37";
this.gridColumn37.Tag = "query_a.QUANTITY";
this.gridColumn37.Visible = true;
this.gridColumn37.VisibleIndex = 5;
- this.gridColumn37.Width = 82;
+ this.gridColumn37.Width = 94;
//
// gridColumn38
//
this.gridColumn38.AppearanceCell.Options.UseFont = true;
this.gridColumn38.Caption = "搴撳瓨鍗曚綅";
this.gridColumn38.FieldName = "kcUnit";
- this.gridColumn38.MinWidth = 17;
+ this.gridColumn38.MinWidth = 19;
this.gridColumn38.Name = "gridColumn38";
this.gridColumn38.Tag = "query_a.UNIT";
this.gridColumn38.Visible = true;
this.gridColumn38.VisibleIndex = 6;
- this.gridColumn38.Width = 82;
+ this.gridColumn38.Width = 94;
//
// gridColumn39
//
this.gridColumn39.AppearanceCell.Options.UseFont = true;
this.gridColumn39.Caption = "鍒拌揣鍗曞彿";
this.gridColumn39.FieldName = "cbillNo";
- this.gridColumn39.MinWidth = 17;
+ this.gridColumn39.MinWidth = 19;
this.gridColumn39.Name = "gridColumn39";
this.gridColumn39.Tag = "query_a.RBILL_NO";
this.gridColumn39.Visible = true;
this.gridColumn39.VisibleIndex = 7;
- this.gridColumn39.Width = 82;
+ this.gridColumn39.Width = 94;
//
// gridColumn40
//
this.gridColumn40.AppearanceCell.Options.UseFont = true;
this.gridColumn40.Caption = "璐т綅缂栫爜";
this.gridColumn40.FieldName = "depotSectionCode";
- this.gridColumn40.MinWidth = 17;
+ this.gridColumn40.MinWidth = 19;
this.gridColumn40.Name = "gridColumn40";
this.gridColumn40.Tag = "query_a.DEPOT_SECTION_CODE";
this.gridColumn40.Visible = true;
this.gridColumn40.VisibleIndex = 8;
- this.gridColumn40.Width = 82;
+ this.gridColumn40.Width = 94;
//
// gridColumn41
//
this.gridColumn41.AppearanceCell.Options.UseFont = true;
this.gridColumn41.Caption = "浠撳簱缂栫爜";
this.gridColumn41.FieldName = "depotCode";
- this.gridColumn41.MinWidth = 17;
+ this.gridColumn41.MinWidth = 19;
this.gridColumn41.Name = "gridColumn41";
this.gridColumn41.Tag = "query_a.DEPOT_CODE";
this.gridColumn41.Visible = true;
this.gridColumn41.VisibleIndex = 9;
- this.gridColumn41.Width = 82;
+ this.gridColumn41.Width = 94;
//
// gridColumn42
//
this.gridColumn42.AppearanceCell.Options.UseFont = true;
this.gridColumn42.Caption = "閲囪喘璁㈠崟ID";
this.gridColumn42.FieldName = "ebelnK3id";
- this.gridColumn42.MinWidth = 17;
+ this.gridColumn42.MinWidth = 19;
this.gridColumn42.Name = "gridColumn42";
this.gridColumn42.Tag = "query_a.EBELN_K3ID";
- this.gridColumn42.Width = 82;
+ this.gridColumn42.Width = 94;
//
// gridColumn43
//
this.gridColumn43.AppearanceCell.Options.UseFont = true;
this.gridColumn43.Caption = "閲囪喘璁㈠崟琛孖D";
this.gridColumn43.FieldName = "lineK3id";
- this.gridColumn43.MinWidth = 17;
+ this.gridColumn43.MinWidth = 19;
this.gridColumn43.Name = "gridColumn43";
this.gridColumn43.Tag = "query_a.LINE_K3ID";
- this.gridColumn43.Width = 82;
+ this.gridColumn43.Width = 94;
//
// gridColumn44
//
this.gridColumn44.Caption = "寤虹珛鑰�";
this.gridColumn44.FieldName = "createBy";
- this.gridColumn44.MinWidth = 22;
+ this.gridColumn44.MinWidth = 25;
this.gridColumn44.Name = "gridColumn44";
this.gridColumn44.Visible = true;
this.gridColumn44.VisibleIndex = 10;
- this.gridColumn44.Width = 82;
+ this.gridColumn44.Width = 94;
//
// gridColumn45
//
this.gridColumn45.Caption = "寤虹珛鏃堕棿";
this.gridColumn45.FieldName = "createDate";
- this.gridColumn45.MinWidth = 22;
+ this.gridColumn45.MinWidth = 25;
this.gridColumn45.Name = "gridColumn45";
this.gridColumn45.Visible = true;
this.gridColumn45.VisibleIndex = 11;
- this.gridColumn45.Width = 82;
+ this.gridColumn45.Width = 94;
//
// gridColumn46
//
this.gridColumn46.Caption = "鍏宠仈GUID(鍒拌揣鏄庣粏琛℅uid)";
- this.gridColumn46.MinWidth = 22;
+ this.gridColumn46.MinWidth = 25;
this.gridColumn46.Name = "gridColumn46";
- this.gridColumn46.Width = 82;
+ this.gridColumn46.Width = 94;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1178, 443);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1347, 571);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -1081,6 +1113,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -1093,8 +1126,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(1178, 443);
- this.splitMx1.SplitterPosition = 112;
+ this.splitMx1.Size = new System.Drawing.Size(1347, 571);
+ this.splitMx1.SplitterPosition = 144;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -1119,144 +1152,159 @@
this.layoutControlItem7,
this.labl_guid});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(531, 330, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1178, 112);
+ this.layoutMx1.Size = new System.Drawing.Size(1347, 144);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(84, 60);
+ this.txt_dptName.Location = new System.Drawing.Point(99, 74);
+ this.txt_dptName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
- this.txt_dptName.Size = new System.Drawing.Size(209, 20);
+ this.txt_dptName.Size = new System.Drawing.Size(240, 24);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 593;
this.txt_dptName.Tag = "readonly";
//
// txt_dhgRemark
//
- this.txt_dhgRemark.Location = new System.Drawing.Point(369, 84);
+ this.txt_dhgRemark.Location = new System.Drawing.Point(430, 105);
+ this.txt_dhgRemark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_dhgRemark.Name = "txt_dhgRemark";
this.txt_dhgRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_dhgRemark.Size = new System.Drawing.Size(494, 20);
+ this.txt_dhgRemark.Size = new System.Drawing.Size(573, 24);
this.txt_dhgRemark.StyleController = this.layoutMx1;
this.txt_dhgRemark.TabIndex = 240;
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(84, 36);
+ this.txt_suppName.Location = new System.Drawing.Point(99, 43);
+ this.txt_suppName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_suppName.Name = "txt_suppName";
this.txt_suppName.Properties.Appearance.Options.UseFont = true;
- this.txt_suppName.Size = new System.Drawing.Size(209, 20);
+ this.txt_suppName.Size = new System.Drawing.Size(240, 24);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 592;
this.txt_suppName.Tag = "readonly";
//
// txt_fcheckUser
//
- this.txt_fcheckUser.Location = new System.Drawing.Point(939, 12);
+ this.txt_fcheckUser.Location = new System.Drawing.Point(1094, 12);
+ this.txt_fcheckUser.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_fcheckUser.Name = "txt_fcheckUser";
this.txt_fcheckUser.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckUser.Size = new System.Drawing.Size(210, 20);
+ this.txt_fcheckUser.Size = new System.Drawing.Size(241, 24);
this.txt_fcheckUser.StyleController = this.layoutMx1;
this.txt_fcheckUser.TabIndex = 595;
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(879, 108);
+ this.lbGuid.Location = new System.Drawing.Point(1005, 139);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(288, 46);
+ this.lbGuid.Size = new System.Drawing.Size(329, 59);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(369, 36);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(430, 43);
+ this.txt_paperBillNo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_paperBillNo.Name = "txt_paperBillNo";
this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_paperBillNo.Size = new System.Drawing.Size(209, 20);
+ this.txt_paperBillNo.Size = new System.Drawing.Size(241, 24);
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 243;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(939, 36);
+ this.txt_checkDate.Location = new System.Drawing.Point(1094, 43);
+ this.txt_checkDate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(210, 20);
+ this.txt_checkDate.Size = new System.Drawing.Size(241, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 587;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(99, 12);
+ this.txt_billNo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(209, 20);
+ this.txt_billNo.Size = new System.Drawing.Size(240, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
//
// txt_cbillNo
//
- this.txt_cbillNo.Location = new System.Drawing.Point(369, 12);
+ this.txt_cbillNo.Location = new System.Drawing.Point(430, 12);
+ this.txt_cbillNo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_cbillNo.Name = "txt_cbillNo";
this.txt_cbillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_cbillNo.Size = new System.Drawing.Size(209, 20);
+ this.txt_cbillNo.Size = new System.Drawing.Size(241, 24);
this.txt_cbillNo.StyleController = this.layoutMx1;
this.txt_cbillNo.TabIndex = 507;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(654, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(762, 12);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(209, 20);
+ this.txt_createBy.Size = new System.Drawing.Size(241, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 219;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(654, 36);
+ this.txt_createDate.Location = new System.Drawing.Point(762, 43);
+ this.txt_createDate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(209, 20);
+ this.txt_createDate.Size = new System.Drawing.Size(241, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 222;
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(867, 60);
+ this.txt_fstatus.Location = new System.Drawing.Point(1007, 74);
+ this.txt_fstatus.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_fstatus.Size = new System.Drawing.Size(282, 20);
+ this.txt_fstatus.Size = new System.Drawing.Size(328, 24);
this.txt_fstatus.StyleController = this.layoutMx1;
this.txt_fstatus.TabIndex = 596;
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(956, 118);
+ this.txt_guid.Location = new System.Drawing.Point(1093, 152);
+ this.txt_guid.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(211, 20);
+ this.txt_guid.Size = new System.Drawing.Size(241, 24);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 597;
//
// txt_depotCode
//
- this.txt_depotCode.Location = new System.Drawing.Point(84, 84);
+ this.txt_depotCode.Location = new System.Drawing.Point(99, 105);
+ this.txt_depotCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_depotCode.Name = "txt_depotCode";
- this.txt_depotCode.Size = new System.Drawing.Size(209, 20);
+ this.txt_depotCode.Size = new System.Drawing.Size(240, 24);
this.txt_depotCode.StyleController = this.layoutMx1;
this.txt_depotCode.TabIndex = 598;
//
// txt_receivingOrg
//
- this.txt_receivingOrg.Location = new System.Drawing.Point(369, 60);
+ this.txt_receivingOrg.Location = new System.Drawing.Point(430, 74);
+ this.txt_receivingOrg.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_receivingOrg.Name = "txt_receivingOrg";
- this.txt_receivingOrg.Size = new System.Drawing.Size(209, 20);
+ this.txt_receivingOrg.Size = new System.Drawing.Size(241, 24);
this.txt_receivingOrg.StyleController = this.layoutMx1;
this.txt_receivingOrg.TabIndex = 599;
//
@@ -1281,7 +1329,7 @@
this.labl_guid.OptionsTableLayoutItem.RowIndex = 2;
this.labl_guid.Size = new System.Drawing.Size(333, 70);
this.labl_guid.Text = "涓婚敭GUID";
- this.labl_guid.TextSize = new System.Drawing.Size(43, 15);
+ this.labl_guid.TextSize = new System.Drawing.Size(49, 19);
//
// Root
//
@@ -1303,33 +1351,33 @@
this.layoutControlItem14});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8});
- this.Root.Size = new System.Drawing.Size(1161, 116);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(1347, 144);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1337,101 +1385,101 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(285, 24);
+ this.layoutControlItem1.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem1.Text = "鍏ュ簱鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_cbillNo;
- this.layoutControlItem2.Location = new System.Drawing.Point(285, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(331, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(285, 24);
+ this.layoutControlItem2.Size = new System.Drawing.Size(332, 31);
this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_createBy;
- this.layoutControlItem3.Location = new System.Drawing.Point(570, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(663, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(285, 24);
+ this.layoutControlItem3.Size = new System.Drawing.Size(332, 31);
this.layoutControlItem3.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_createDate;
- this.layoutControlItem4.Location = new System.Drawing.Point(570, 24);
+ this.layoutControlItem4.Location = new System.Drawing.Point(663, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(285, 24);
+ this.layoutControlItem4.Size = new System.Drawing.Size(332, 31);
this.layoutControlItem4.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_fcheckUser;
- this.layoutControlItem5.Location = new System.Drawing.Point(855, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(995, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(286, 24);
+ this.layoutControlItem5.Size = new System.Drawing.Size(332, 31);
this.layoutControlItem5.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_checkDate;
- this.layoutControlItem6.Location = new System.Drawing.Point(855, 24);
+ this.layoutControlItem6.Location = new System.Drawing.Point(995, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(286, 24);
+ this.layoutControlItem6.Size = new System.Drawing.Size(332, 31);
this.layoutControlItem6.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_paperBillNo;
- this.layoutControlItem8.Location = new System.Drawing.Point(285, 24);
+ this.layoutControlItem8.Location = new System.Drawing.Point(331, 31);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(285, 24);
+ this.layoutControlItem8.Size = new System.Drawing.Size(332, 31);
this.layoutControlItem8.Text = "閫佽揣鍗曞彿";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_suppName;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 24);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(285, 24);
+ this.layoutControlItem9.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem9.Text = "渚涘簲鍟嗗悕绉�";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_dptName;
- this.layoutControlItem10.Location = new System.Drawing.Point(0, 48);
+ this.layoutControlItem10.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(285, 24);
+ this.layoutControlItem10.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem10.Text = "浠撳簱鍚嶇О";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_fstatus;
- this.layoutControlItem12.Location = new System.Drawing.Point(855, 48);
+ this.layoutControlItem12.Location = new System.Drawing.Point(995, 62);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(286, 24);
+ this.layoutControlItem12.Size = new System.Drawing.Size(332, 31);
this.layoutControlItem12.Text = "瀹℃牳鐘舵��";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
@@ -1439,43 +1487,44 @@
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_depotCode;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 72);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(285, 24);
+ this.layoutControlItem13.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem13.Text = "浠撳簱缂栧彿";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_dhgRemark;
- this.layoutControlItem11.Location = new System.Drawing.Point(285, 72);
+ this.layoutControlItem11.Location = new System.Drawing.Point(331, 93);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(570, 24);
+ this.layoutControlItem11.Size = new System.Drawing.Size(664, 31);
this.layoutControlItem11.Text = "澶囨敞璇存槑";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_receivingOrg;
- this.layoutControlItem14.Location = new System.Drawing.Point(285, 48);
+ this.layoutControlItem14.Location = new System.Drawing.Point(331, 62);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(285, 24);
+ this.layoutControlItem14.Size = new System.Drawing.Size(332, 31);
this.layoutControlItem14.Text = "鏀舵枡缁勭粐";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
// 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(3, 4, 3, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage2;
- this.tabMx.Size = new System.Drawing.Size(1178, 321);
+ this.tabMx.Size = new System.Drawing.Size(1347, 415);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage2,
@@ -1484,17 +1533,20 @@
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx1);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1176, 295);
+ this.tabMxPage2.Size = new System.Drawing.Size(1345, 383);
this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1176, 295);
+ this.gcMx1.Size = new System.Drawing.Size(1345, 383);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1519,7 +1571,6 @@
this.gridColumn11,
this.gridColumn13,
this.gridColumn47});
- this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1531,175 +1582,187 @@
this.gvMx2guid.AppearanceCell.Options.UseFont = true;
this.gvMx2guid.Caption = "鏄庣粏琛ㄤ富閿瓽UID";
this.gvMx2guid.FieldName = "guid";
- this.gvMx2guid.MinWidth = 43;
+ this.gvMx2guid.MinWidth = 49;
this.gvMx2guid.Name = "gvMx2guid";
this.gvMx2guid.Tag = "query_a.guid";
- this.gvMx2guid.Width = 82;
+ this.gvMx2guid.Width = 94;
//
// gvMx2itemId
//
this.gvMx2itemId.AppearanceCell.Options.UseFont = true;
this.gvMx2itemId.Caption = "鐗╂枡ID";
this.gvMx2itemId.FieldName = "itemId";
- this.gvMx2itemId.MinWidth = 17;
+ this.gvMx2itemId.MinWidth = 19;
this.gvMx2itemId.Name = "gvMx2itemId";
this.gvMx2itemId.Tag = "query_a.ITEM_ID";
- this.gvMx2itemId.Width = 82;
+ this.gvMx2itemId.Width = 94;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡缂栧彿";
this.gridColumn2.FieldName = "itemNo";
- this.gridColumn2.MinWidth = 17;
+ this.gridColumn2.MinWidth = 19;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 0;
- this.gridColumn2.Width = 82;
+ this.gridColumn2.Width = 94;
//
// gvMx2itemSname
//
this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О";
this.gvMx2itemSname.FieldName = "itemName";
- this.gvMx2itemSname.MinWidth = 17;
+ this.gvMx2itemSname.MinWidth = 19;
this.gvMx2itemSname.Name = "gvMx2itemSname";
this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
this.gvMx2itemSname.Visible = true;
this.gvMx2itemSname.VisibleIndex = 1;
- this.gvMx2itemSname.Width = 82;
+ this.gvMx2itemSname.Width = 94;
//
// gridColumn1
//
this.gridColumn1.Caption = "鐗╂枡瑙勬牸";
this.gridColumn1.FieldName = "itemModel";
- this.gridColumn1.MinWidth = 17;
+ this.gridColumn1.MinWidth = 19;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 2;
- this.gridColumn1.Width = 82;
+ this.gridColumn1.Width = 94;
//
// gvMx2quantity
//
this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
this.gvMx2quantity.Caption = "鏁伴噺";
this.gvMx2quantity.FieldName = "quantity";
- this.gvMx2quantity.MinWidth = 17;
+ this.gvMx2quantity.MinWidth = 19;
this.gvMx2quantity.Name = "gvMx2quantity";
this.gvMx2quantity.Tag = "query_a.QUANTITY";
this.gvMx2quantity.Visible = true;
this.gvMx2quantity.VisibleIndex = 4;
- this.gvMx2quantity.Width = 82;
+ this.gvMx2quantity.Width = 94;
//
// gvMx2unit
//
this.gvMx2unit.AppearanceCell.Options.UseFont = true;
this.gvMx2unit.Caption = "搴撳瓨鍗曚綅";
this.gvMx2unit.FieldName = "kcUnit";
- this.gvMx2unit.MinWidth = 17;
+ this.gvMx2unit.MinWidth = 19;
this.gvMx2unit.Name = "gvMx2unit";
this.gvMx2unit.Tag = "query_a.UNIT";
this.gvMx2unit.Visible = true;
this.gvMx2unit.VisibleIndex = 5;
- this.gvMx2unit.Width = 82;
+ this.gvMx2unit.Width = 94;
//
// gvMx2ebeln
//
this.gvMx2ebeln.AppearanceCell.Options.UseFont = true;
this.gvMx2ebeln.Caption = "閲囪喘鍗曞彿";
this.gvMx2ebeln.FieldName = "cgdh";
- this.gvMx2ebeln.MinWidth = 17;
+ this.gvMx2ebeln.MinWidth = 19;
this.gvMx2ebeln.Name = "gvMx2ebeln";
this.gvMx2ebeln.Tag = "query_a.EBELN";
this.gvMx2ebeln.Visible = true;
this.gvMx2ebeln.VisibleIndex = 6;
- this.gvMx2ebeln.Width = 82;
+ this.gvMx2ebeln.Width = 94;
//
// gvMx2ebelnK3id
//
this.gvMx2ebelnK3id.AppearanceCell.Options.UseFont = true;
this.gvMx2ebelnK3id.Caption = "閲囪喘璁㈠崟ID";
this.gvMx2ebelnK3id.FieldName = "ebelnK3id";
- this.gvMx2ebelnK3id.MinWidth = 17;
+ this.gvMx2ebelnK3id.MinWidth = 19;
this.gvMx2ebelnK3id.Name = "gvMx2ebelnK3id";
this.gvMx2ebelnK3id.Tag = "query_a.EBELN_K3ID";
this.gvMx2ebelnK3id.Visible = true;
this.gvMx2ebelnK3id.VisibleIndex = 7;
- this.gvMx2ebelnK3id.Width = 82;
+ this.gvMx2ebelnK3id.Width = 94;
//
// gvMx2lineK3id
//
this.gvMx2lineK3id.AppearanceCell.Options.UseFont = true;
this.gvMx2lineK3id.Caption = "閲囪喘璁㈠崟琛孖D";
this.gvMx2lineK3id.FieldName = "lineK3id";
- this.gvMx2lineK3id.MinWidth = 17;
+ this.gvMx2lineK3id.MinWidth = 19;
this.gvMx2lineK3id.Name = "gvMx2lineK3id";
this.gvMx2lineK3id.Tag = "query_a.LINE_K3ID";
this.gvMx2lineK3id.Visible = true;
this.gvMx2lineK3id.VisibleIndex = 8;
- this.gvMx2lineK3id.Width = 82;
+ this.gvMx2lineK3id.Width = 94;
//
// gridColumn10
//
this.gridColumn10.Caption = "澶囨敞";
this.gridColumn10.FieldName = "dhgRemark";
- this.gridColumn10.MinWidth = 22;
+ this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 9;
- this.gridColumn10.Width = 82;
+ this.gridColumn10.Width = 94;
//
// gridColumn5
//
this.gridColumn5.Caption = "寤虹珛鑰�";
this.gridColumn5.FieldName = "createBy";
- this.gridColumn5.MinWidth = 22;
+ this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 10;
- this.gridColumn5.Width = 82;
+ this.gridColumn5.Width = 94;
//
// gridColumn6
//
this.gridColumn6.Caption = "寤虹珛鏃堕棿";
this.gridColumn6.FieldName = "createDate";
- this.gridColumn6.MinWidth = 22;
+ this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 11;
- this.gridColumn6.Width = 82;
+ this.gridColumn6.Width = 94;
//
// gridColumn11
//
this.gridColumn11.Caption = "鍏宠仈GUID(鍒拌揣鏄庣粏琛℅uid)";
this.gridColumn11.FieldName = "itemDabid";
- this.gridColumn11.MinWidth = 22;
+ this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Width = 82;
+ this.gridColumn11.Width = 94;
//
// gridColumn13
//
this.gridColumn13.Caption = "闇�姹傝窡韪�";
this.gridColumn13.FieldName = "xqgz";
- this.gridColumn13.MinWidth = 21;
+ this.gridColumn13.MinWidth = 24;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 12;
- this.gridColumn13.Width = 66;
+ //
+ // gridColumn47
+ //
+ this.gridColumn47.Caption = "鍏嬮噸";
+ this.gridColumn47.FieldName = "weight";
+ this.gridColumn47.MinWidth = 23;
+ this.gridColumn47.Name = "gridColumn47";
+ this.gridColumn47.Visible = true;
+ this.gridColumn47.VisibleIndex = 3;
+ this.gridColumn47.Width = 86;
//
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
+ this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1176, 295);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1345, 383);
this.xtraTabPage3.Text = "鍏ュ簱鏉＄爜";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1176, 295);
+ this.gcMx2.Size = new System.Drawing.Size(1345, 383);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1725,7 +1788,6 @@
this.gridColumn7,
this.gridColumn8,
this.gridColumn12});
- this.gvMx2.DetailHeight = 272;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1737,223 +1799,209 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid ";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 43;
+ this.gvMx1guid.MinWidth = 49;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 82;
+ this.gvMx1guid.Width = 94;
//
// gvMx1urgentFlag
//
this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪";
this.gvMx1urgentFlag.FieldName = "urgentFlag";
- this.gvMx1urgentFlag.MinWidth = 43;
+ this.gvMx1urgentFlag.MinWidth = 49;
this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
this.gvMx1urgentFlag.Tag = "query_a.URGENT_FLAG";
- this.gvMx1urgentFlag.Width = 82;
+ this.gvMx1urgentFlag.Width = 94;
//
// gvMx1itemBarcode
//
this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx1itemBarcode.FieldName = "itemBarcode";
- this.gvMx1itemBarcode.MinWidth = 17;
+ this.gvMx1itemBarcode.MinWidth = 19;
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
this.gvMx1itemBarcode.VisibleIndex = 0;
- this.gvMx1itemBarcode.Width = 218;
+ this.gvMx1itemBarcode.Width = 249;
//
// gvMx1workNo
//
this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
this.gvMx1workNo.Caption = "閲囪喘鍗曞彿";
this.gvMx1workNo.FieldName = "ebeln";
- this.gvMx1workNo.MinWidth = 17;
+ this.gvMx1workNo.MinWidth = 19;
this.gvMx1workNo.Name = "gvMx1workNo";
this.gvMx1workNo.Tag = "query_a.WORK_NO";
this.gvMx1workNo.Visible = true;
this.gvMx1workNo.VisibleIndex = 1;
- this.gvMx1workNo.Width = 87;
+ this.gvMx1workNo.Width = 99;
//
// gvMx1cItemCode
//
this.gvMx1cItemCode.AppearanceCell.Options.UseFont = true;
this.gvMx1cItemCode.Caption = "鐗╂枡缂栫爜";
this.gvMx1cItemCode.FieldName = "itemNo";
- this.gvMx1cItemCode.MinWidth = 17;
+ this.gvMx1cItemCode.MinWidth = 19;
this.gvMx1cItemCode.Name = "gvMx1cItemCode";
this.gvMx1cItemCode.Tag = "query_a.C_ITEM_CODE";
this.gvMx1cItemCode.Visible = true;
this.gvMx1cItemCode.VisibleIndex = 2;
- this.gvMx1cItemCode.Width = 87;
+ this.gvMx1cItemCode.Width = 99;
//
// gvMx1itemSname
//
this.gvMx1itemSname.AppearanceCell.Options.UseFont = true;
this.gvMx1itemSname.Caption = "鐗╂枡鍚嶇О";
this.gvMx1itemSname.FieldName = "itemName";
- this.gvMx1itemSname.MinWidth = 17;
+ this.gvMx1itemSname.MinWidth = 19;
this.gvMx1itemSname.Name = "gvMx1itemSname";
this.gvMx1itemSname.Tag = "query_a.ITEM_SNAME";
this.gvMx1itemSname.Visible = true;
this.gvMx1itemSname.VisibleIndex = 3;
- this.gvMx1itemSname.Width = 218;
+ this.gvMx1itemSname.Width = 249;
//
// gvMx1itemNo
//
this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx1itemNo.Caption = "瑙勬牸鍨嬪彿";
this.gvMx1itemNo.FieldName = "itemModel";
- this.gvMx1itemNo.MinWidth = 17;
+ this.gvMx1itemNo.MinWidth = 19;
this.gvMx1itemNo.Name = "gvMx1itemNo";
this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
this.gvMx1itemNo.Visible = true;
this.gvMx1itemNo.VisibleIndex = 4;
- this.gvMx1itemNo.Width = 218;
+ this.gvMx1itemNo.Width = 249;
//
// gvMx1quantity
//
this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
this.gvMx1quantity.Caption = "鏁伴噺";
this.gvMx1quantity.FieldName = "quantity";
- this.gvMx1quantity.MinWidth = 17;
+ this.gvMx1quantity.MinWidth = 19;
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.QUANTITY";
this.gvMx1quantity.Visible = true;
this.gvMx1quantity.VisibleIndex = 5;
- this.gvMx1quantity.Width = 82;
+ this.gvMx1quantity.Width = 94;
//
// gvMx1unit
//
this.gvMx1unit.AppearanceCell.Options.UseFont = true;
this.gvMx1unit.Caption = "搴撳瓨鍗曚綅";
this.gvMx1unit.FieldName = "kcUnit";
- this.gvMx1unit.MinWidth = 17;
+ this.gvMx1unit.MinWidth = 19;
this.gvMx1unit.Name = "gvMx1unit";
this.gvMx1unit.Tag = "query_a.UNIT";
this.gvMx1unit.Visible = true;
this.gvMx1unit.VisibleIndex = 6;
- this.gvMx1unit.Width = 82;
+ this.gvMx1unit.Width = 94;
//
// gvMx1rbillNo
//
this.gvMx1rbillNo.AppearanceCell.Options.UseFont = true;
this.gvMx1rbillNo.Caption = "鍒拌揣鍗曞彿";
this.gvMx1rbillNo.FieldName = "cbillNo";
- this.gvMx1rbillNo.MinWidth = 17;
+ this.gvMx1rbillNo.MinWidth = 19;
this.gvMx1rbillNo.Name = "gvMx1rbillNo";
this.gvMx1rbillNo.Tag = "query_a.RBILL_NO";
this.gvMx1rbillNo.Visible = true;
this.gvMx1rbillNo.VisibleIndex = 7;
- this.gvMx1rbillNo.Width = 82;
+ this.gvMx1rbillNo.Width = 94;
//
// gvMx1depotSectionCode
//
this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜";
this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
- this.gvMx1depotSectionCode.MinWidth = 17;
+ this.gvMx1depotSectionCode.MinWidth = 19;
this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
this.gvMx1depotSectionCode.Visible = true;
this.gvMx1depotSectionCode.VisibleIndex = 8;
- this.gvMx1depotSectionCode.Width = 82;
+ this.gvMx1depotSectionCode.Width = 94;
//
// gvMx1depotCode
//
this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
this.gvMx1depotCode.Caption = "浠撳簱缂栫爜";
this.gvMx1depotCode.FieldName = "depotCode";
- this.gvMx1depotCode.MinWidth = 17;
+ this.gvMx1depotCode.MinWidth = 19;
this.gvMx1depotCode.Name = "gvMx1depotCode";
this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
this.gvMx1depotCode.Visible = true;
this.gvMx1depotCode.VisibleIndex = 9;
- this.gvMx1depotCode.Width = 82;
+ this.gvMx1depotCode.Width = 94;
//
// gvMx1ebelnK3id
//
this.gvMx1ebelnK3id.AppearanceCell.Options.UseFont = true;
this.gvMx1ebelnK3id.Caption = "閲囪喘璁㈠崟ID";
this.gvMx1ebelnK3id.FieldName = "ebelnK3id";
- this.gvMx1ebelnK3id.MinWidth = 17;
+ this.gvMx1ebelnK3id.MinWidth = 19;
this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id";
this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID";
- this.gvMx1ebelnK3id.Width = 82;
+ this.gvMx1ebelnK3id.Width = 94;
//
// gvMx1lineK3id
//
this.gvMx1lineK3id.AppearanceCell.Options.UseFont = true;
this.gvMx1lineK3id.Caption = "閲囪喘璁㈠崟琛孖D";
this.gvMx1lineK3id.FieldName = "lineK3id";
- this.gvMx1lineK3id.MinWidth = 17;
+ this.gvMx1lineK3id.MinWidth = 19;
this.gvMx1lineK3id.Name = "gvMx1lineK3id";
this.gvMx1lineK3id.Tag = "query_a.LINE_K3ID";
- this.gvMx1lineK3id.Width = 82;
+ this.gvMx1lineK3id.Width = 94;
//
// gridColumn7
//
this.gridColumn7.Caption = "寤虹珛鑰�";
this.gridColumn7.FieldName = "createBy";
- this.gridColumn7.MinWidth = 22;
+ this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 10;
- this.gridColumn7.Width = 82;
+ this.gridColumn7.Width = 94;
//
// gridColumn8
//
this.gridColumn8.Caption = "寤虹珛鏃堕棿";
this.gridColumn8.FieldName = "createDate";
- this.gridColumn8.MinWidth = 22;
+ this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 11;
- this.gridColumn8.Width = 82;
+ this.gridColumn8.Width = 94;
//
// gridColumn12
//
this.gridColumn12.Caption = "鍏宠仈GUID(鍒拌揣鏄庣粏琛℅uid)";
- this.gridColumn12.MinWidth = 22;
+ this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Width = 82;
+ this.gridColumn12.Width = 94;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(841, 43);
+ this.picCheckBox.Location = new System.Drawing.Point(961, 55);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(88, 39);
+ this.picCheckBox.Size = new System.Drawing.Size(101, 50);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn47
- //
- this.gridColumn47.Caption = "鍏嬮噸";
- this.gridColumn47.FieldName = "weight";
- this.gridColumn47.Name = "gridColumn47";
- this.gridColumn47.Visible = true;
- this.gridColumn47.VisibleIndex = 3;
- //
- // gridColumn48
- //
- this.gridColumn48.Caption = "鍏嬮噸";
- this.gridColumn48.FieldName = "weight";
- this.gridColumn48.Name = "gridColumn48";
- this.gridColumn48.Visible = true;
- this.gridColumn48.VisibleIndex = 12;
- //
// Frm_MesInvItemIns
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1180, 531);
+ this.ClientSize = new System.Drawing.Size(1349, 683);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "Frm_MesInvItemIns";
this.Text = "閲囪喘鍏ュ簱鍗�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -2171,5 +2219,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn46;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn48;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn49;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 7598a5d..a361b64 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -188,6 +188,7 @@
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.lay99 = new DevExpress.XtraLayout.LayoutControl();
+ this.ucBtnPrintOne1 = new Gs.DevApp.UserControl.UcBtnPrintOne();
this.layoutControl2 = new DevExpress.XtraLayout.LayoutControl();
this.txt_iCount_2 = new DevExpress.XtraEditors.TextEdit();
this.txt_yuliang_2 = new DevExpress.XtraEditors.TextEdit();
@@ -217,6 +218,7 @@
this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
this.gcMx3 = new DevExpress.XtraGrid.GridControl();
this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -319,8 +321,8 @@
this.gv_hbdy = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
- this.ucBtnPrintOne1 = new Gs.DevApp.UserControl.UcBtnPrintOne();
- this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.gridColumn109 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn110 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -424,6 +426,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
@@ -474,7 +477,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -858,7 +860,8 @@
this.gridColumn102,
this.gridColumn103,
this.gridColumn104,
- this.gridColumn105});
+ this.gridColumn105,
+ this.gridColumn110});
this.gvMxL2.DetailHeight = 272;
this.gvMxL2.GridControl = this.gcMxL2;
this.gvMxL2.Name = "gvMxL2";
@@ -2038,6 +2041,17 @@
this.lay99.TabIndex = 0;
this.lay99.Text = "layoutControl2";
//
+ // ucBtnPrintOne1
+ //
+ this.ucBtnPrintOne1.allClickKey = null;
+ this.ucBtnPrintOne1.guidKey = null;
+ this.ucBtnPrintOne1.Location = new System.Drawing.Point(1011, 12);
+ this.ucBtnPrintOne1.Margin = new System.Windows.Forms.Padding(0);
+ this.ucBtnPrintOne1.Name = "ucBtnPrintOne1";
+ this.ucBtnPrintOne1.rptParameter = null;
+ this.ucBtnPrintOne1.Size = new System.Drawing.Size(330, 52);
+ this.ucBtnPrintOne1.TabIndex = 485;
+ //
// layoutControl2
//
this.layoutControl2.Controls.Add(this.txt_iCount_2);
@@ -2390,6 +2404,16 @@
this.layoutControlItem40.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem40.TextVisible = false;
//
+ // layoutControlItem41
+ //
+ this.layoutControlItem41.Control = this.ucBtnPrintOne1;
+ this.layoutControlItem41.Location = new System.Drawing.Point(999, 0);
+ this.layoutControlItem41.Name = "layoutControlItem41";
+ this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem41.Size = new System.Drawing.Size(334, 56);
+ this.layoutControlItem41.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem41.TextVisible = false;
+ //
// gcMx3
//
this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -2428,7 +2452,8 @@
this.gridColumn50,
this.gridColumn52,
this.gridColumn53,
- this.gridColumn54});
+ this.gridColumn54,
+ this.gridColumn109});
this.gvMx3.DetailHeight = 272;
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
@@ -2567,7 +2592,7 @@
this.gridColumn47.MinWidth = 44;
this.gridColumn47.Name = "gridColumn47";
this.gridColumn47.Visible = true;
- this.gridColumn47.VisibleIndex = 8;
+ this.gridColumn47.VisibleIndex = 9;
this.gridColumn47.Width = 73;
//
// gridColumn48
@@ -2577,7 +2602,7 @@
this.gridColumn48.MinWidth = 44;
this.gridColumn48.Name = "gridColumn48";
this.gridColumn48.Visible = true;
- this.gridColumn48.VisibleIndex = 9;
+ this.gridColumn48.VisibleIndex = 10;
this.gridColumn48.Width = 80;
//
// gridColumn49
@@ -2587,7 +2612,7 @@
this.gridColumn49.MinWidth = 22;
this.gridColumn49.Name = "gridColumn49";
this.gridColumn49.Visible = true;
- this.gridColumn49.VisibleIndex = 10;
+ this.gridColumn49.VisibleIndex = 11;
this.gridColumn49.Width = 82;
//
// gridColumn50
@@ -2604,7 +2629,7 @@
this.gridColumn52.FieldName = "depotCode";
this.gridColumn52.Name = "gridColumn52";
this.gridColumn52.Visible = true;
- this.gridColumn52.VisibleIndex = 11;
+ this.gridColumn52.VisibleIndex = 12;
//
// gridColumn53
//
@@ -2612,7 +2637,7 @@
this.gridColumn53.FieldName = "depotName";
this.gridColumn53.Name = "gridColumn53";
this.gridColumn53.Visible = true;
- this.gridColumn53.VisibleIndex = 12;
+ this.gridColumn53.VisibleIndex = 13;
//
// gridColumn54
//
@@ -2620,7 +2645,7 @@
this.gridColumn54.FieldName = "staffName";
this.gridColumn54.Name = "gridColumn54";
this.gridColumn54.Visible = true;
- this.gridColumn54.VisibleIndex = 13;
+ this.gridColumn54.VisibleIndex = 14;
//
// repositoryItemButtonEdit3
//
@@ -3285,7 +3310,7 @@
this.gridColumn15.MinWidth = 44;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 10;
+ this.gridColumn15.VisibleIndex = 11;
this.gridColumn15.Width = 60;
//
// gridColumn19
@@ -3295,7 +3320,7 @@
this.gridColumn19.MinWidth = 44;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 11;
+ this.gridColumn19.VisibleIndex = 12;
this.gridColumn19.Width = 66;
//
// gridColumn12
@@ -3305,7 +3330,7 @@
this.gridColumn12.MinWidth = 22;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 12;
+ this.gridColumn12.VisibleIndex = 13;
this.gridColumn12.Width = 68;
//
// gridColumn27
@@ -3341,7 +3366,7 @@
this.gridColumn29.FieldName = "depotCode";
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.Visible = true;
- this.gridColumn29.VisibleIndex = 13;
+ this.gridColumn29.VisibleIndex = 14;
this.gridColumn29.Width = 62;
//
// gridColumn30
@@ -3350,7 +3375,7 @@
this.gridColumn30.FieldName = "depotName";
this.gridColumn30.Name = "gridColumn30";
this.gridColumn30.Visible = true;
- this.gridColumn30.VisibleIndex = 14;
+ this.gridColumn30.VisibleIndex = 15;
this.gridColumn30.Width = 62;
//
// gridColumn31
@@ -3359,7 +3384,7 @@
this.gridColumn31.FieldName = "staffName";
this.gridColumn31.Name = "gridColumn31";
this.gridColumn31.Visible = true;
- this.gridColumn31.VisibleIndex = 15;
+ this.gridColumn31.VisibleIndex = 16;
this.gridColumn31.Width = 82;
//
// gridColumn107
@@ -3369,7 +3394,7 @@
this.gridColumn107.MinWidth = 21;
this.gridColumn107.Name = "gridColumn107";
this.gridColumn107.Visible = true;
- this.gridColumn107.VisibleIndex = 16;
+ this.gridColumn107.VisibleIndex = 10;
this.gridColumn107.Width = 78;
//
// repositoryItemButtonEdit1
@@ -3589,26 +3614,21 @@
this.gv_hbdy.Visible = true;
this.gv_hbdy.VisibleIndex = 13;
//
- // ucBtnPrintOne1
+ // gridColumn109
//
- this.ucBtnPrintOne1.allClickKey = null;
- this.ucBtnPrintOne1.guidKey = null;
- this.ucBtnPrintOne1.Location = new System.Drawing.Point(1011, 12);
- this.ucBtnPrintOne1.Margin = new System.Windows.Forms.Padding(0);
- this.ucBtnPrintOne1.Name = "ucBtnPrintOne1";
- this.ucBtnPrintOne1.rptParameter = null;
- this.ucBtnPrintOne1.Size = new System.Drawing.Size(330, 52);
- this.ucBtnPrintOne1.TabIndex = 485;
+ this.gridColumn109.Caption = "闇�姹傝窡韪彿";
+ this.gridColumn109.FieldName = "xqgz";
+ this.gridColumn109.Name = "gridColumn109";
+ this.gridColumn109.Visible = true;
+ this.gridColumn109.VisibleIndex = 8;
//
- // layoutControlItem41
+ // gridColumn110
//
- this.layoutControlItem41.Control = this.ucBtnPrintOne1;
- this.layoutControlItem41.Location = new System.Drawing.Point(999, 0);
- this.layoutControlItem41.Name = "layoutControlItem41";
- this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem41.Size = new System.Drawing.Size(334, 56);
- this.layoutControlItem41.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem41.TextVisible = false;
+ this.gridColumn110.Caption = "闇�姹傝窡韪彿";
+ this.gridColumn110.FieldName = "xqgz";
+ this.gridColumn110.Name = "gridColumn110";
+ this.gridColumn110.Visible = true;
+ this.gridColumn110.VisibleIndex = 14;
//
// Frm_ArrivalBarcode
//
@@ -3723,6 +3743,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
@@ -3773,7 +3794,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
this.ResumeLayout(false);
}
@@ -4042,5 +4062,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn108;
private UserControl.UcBtnPrintOne ucBtnPrintOne1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn110;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn109;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index ff01d88..181488c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -163,135 +163,25 @@
};
// --------------------gvMx3 ucBtnPrintOne1 鎵归噺鎵撳嵃浜嬩欢锛堜紭鍖栫増锛�--------------------
+
+ //涓�閿墦鍗颁簨浠�
this.ucBtnPrintOne1.btnPrintClick += (s, e) =>
{
- // 1. 鍩虹楠岃瘉锛氫富琛ㄨ閫夋嫨
string mainGuid = lbGuid.Text.Trim();
- if (string.IsNullOrEmpty(mainGuid) || mainGuid.Length < 10)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛鍦ㄤ富琛ㄤ腑閫夋嫨鏁版嵁琛岋紒");
- this.ucBtnPrintOne1.rptParameter = "return false";
- return;
- }
-
- // 2. 鑾峰彇鏄庣粏鏁版嵁婧�
- DataTable dtDetails = gcMx3.DataSource as DataTable;
- if (dtDetails == null || dtDetails.Rows.Count == 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("褰撳墠涓昏〃鏃犲叧鑱旂殑鏄庣粏鏁版嵁锛岃鍏堝姞杞芥槑缁嗭紒");
- this.ucBtnPrintOne1.rptParameter = "return false";
- return;
- }
-
- // 3. 绛涢�夊彲鎵撳嵃鏄庣粏锛堥�昏緫涓嶅彉锛�
- List<string> validReleaseNos = new List<string>();
- List<string> validPrintQtys = new List<string>();
- string releaseNoField = "releaseNo";
-
- if (!dtDetails.Columns.Contains(releaseNoField))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError($"鏄庣粏鏁版嵁婧愮己灏戝繀瑕佸瓧娈碉細{releaseNoField}");
- this.ucBtnPrintOne1.rptParameter = "return false";
- return;
- }
-
- foreach (DataRow row in dtDetails.Rows)
- {
- string rowReleaseNo = row[releaseNoField]?.ToString()?.Trim() ?? "";
- if (string.IsNullOrEmpty(rowReleaseNo) || rowReleaseNo.Length < 5)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError($"璺宠繃鏃犳晥鏄庣粏琛岋細缂哄皯鎴栨棤鏁堢殑releaseNo");
- continue;
- }
-
- string kQtyStr = row["kQty"]?.ToString()?.Trim() ?? "0";
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(kQtyStr)
- || !decimal.TryParse(kQtyStr, out decimal kQty)
- || kQty <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError($"璺宠繃鏄庣粏琛岋紙releaseNo锛歿rowReleaseNo}锛夛細鍙墦鍗版暟閲忔棤鏁堟垨<=0");
- continue;
- }
-
- if (!validReleaseNos.Contains(rowReleaseNo))
- {
- validReleaseNos.Add(rowReleaseNo);
- validPrintQtys.Add(kQty.ToString("F2"));
- }
- else
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError($"璺宠繃閲嶅鏄庣粏琛岋紙releaseNo锛歿rowReleaseNo}锛夛細宸插寘鍚releaseNo");
- }
- }
-
- if (validReleaseNos.Count == 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("娌℃湁鍙壒閲忔墦鍗扮殑鏄庣粏琛岋紙鎵�鏈夎鍧囦负鏃犳晥鏁版嵁鎴栧彲鎵撳嵃鏁伴噺<=0锛�");
- this.ucBtnPrintOne1.rptParameter = "return false";
- return;
- }
-
- // 4. 缁勮鍙傛暟锛堥�傞厤_rptGetParameterP瑙ｆ瀽閫昏緫锛�
- string releaseNosStr = string.Join("|", validReleaseNos);
- string printQtysStr = string.Join("|", validPrintQtys);
-
- // 浠呬紶6涓叧閿弬鏁帮紝瀵瑰簲瑙ｆ瀽鏂规硶鐨剆0-s5
- string[] reportParams = new string[]
- {
- "batch", // s0 鈫� @in1锛氭壒閲忔爣璇�
- "0", // s1 鈫� @in2锛氬崰浣�
- "0", // s2 鈫� @in3锛氫綑閲�
- "1", // s3 鈫� @in4锛氬紶鏁�
- printQtysStr, // s4 鈫� @in5锛氭暟閲忓垪琛�
- releaseNosStr // s5 鈫� @in6锛歳eleaseNo鍒楄〃
- };
-
- /*string paramContent = string.Join(",", reportParams);
- string rptParam = $"rpt_Arrival_One{{{paramContent}}}";
-
- this.ucBtnPrintOne1.guidKey = mainGuid;
- this.ucBtnPrintOne1.rptParameter = rptParam;
-
- // 5. 璋冪敤棰勮锛堥�昏緫涓嶅彉锛�
- try
- {
- using (Form rptPreviewForm = new RptPreview(mainGuid, rptParam))
- {
- DialogResult previewResult = rptPreviewForm.ShowDialog();
- if (previewResult == DialogResult.OK)
- {
- getModel(mainGuid);
- Gs.DevApp.ToolBox.MsgHelper.ShowError($"鎵归噺鎵撳嵃瀹屾垚锛佸叡鎵撳嵃 {validReleaseNos.Count} 鏉℃湁鏁堟槑缁�");
- }
- else if (previewResult == DialogResult.Cancel)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢ㄦ埛鍙栨秷鎵归噺鎵撳嵃鎿嶄綔");
- }
- }
- }
- catch (Exception ex)
- {
- string errorMsg = $"鎵归噺鎵撳嵃寮傚父锛歿ex.Message}";
- if (ex.InnerException != null)
- {
- errorMsg += $"\n鍐呴儴閿欒锛歿ex.InnerException.Message}";
- }
- Gs.DevApp.ToolBox.MsgHelper.ShowError(errorMsg);
- this.ucBtnPrintOne1.rptParameter = "return false";
- }
-*/
-
- this.ucBtnPrintOne1.guidKey = mainGuid;
+ ucBtnPrintOne1.guidKey = mainGuid;
this.ucBtnPrintOne1.rptParameter = "rpt_Arrival{"
- + string.Join(",", reportParams) // 鎷兼帴reportParams鏁扮粍鍏冪礌
- + "}";
- // 6. 娓呯┖鎺т欢
- txt_iCount_2.Text = "";
- txt_psnQty_2.Text = "";
- txt_releaseNo.Text = "";
+ + "101"//涓�閿墦鍗�101
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "}";
+
+ txt_iCount_1.Text = "";
+ txt_psnQty_1.Text = "";
};
-
+
this.ucBtnPrintOne1.btnAllClick += (s, e) =>
{
string mainGuid = lbGuid.Text.Trim();
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.resx b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.resx
index a989fe1..0eb38cd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.resx
@@ -123,4 +123,7 @@
<metadata name="behaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>93, 17</value>
</metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>25</value>
+ </metadata>
</root>
\ No newline at end of file
--
Gitblit v1.9.3