From d16952a4c6f6e09b2bba71040a9963ce892ed983 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 08 八月 2025 15:45:27 +0800
Subject: [PATCH] 称重
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.cs | 6
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs | 49 ++--
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx | 3
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 550 ++++++++++++++++++++++++++++++++++++++-----------
4 files changed, 450 insertions(+), 158 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 4e53e28..f565473 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -34,18 +34,27 @@
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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- 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 rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -85,6 +94,19 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.layWeight = new DevExpress.XtraLayout.LayoutControl();
+ this.txtW1 = new DevExpress.XtraEditors.TextEdit();
+ this.txtW2 = new DevExpress.XtraEditors.TextEdit();
+ this.txtW3 = new DevExpress.XtraEditors.TextEdit();
+ this.txtW4 = new DevExpress.XtraEditors.TextEdit();
+ this.txtW5 = new DevExpress.XtraEditors.TextEdit();
+ this.btnW = new DevExpress.XtraEditors.SimpleButton();
+ this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
this.txt_fngDesc = new Gs.DevApp.UserControl.UcDictionary();
this.btnYcReport = new DevExpress.XtraEditors.SimpleButton();
this.lbGuid = new System.Windows.Forms.Label();
@@ -134,10 +156,10 @@
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -198,6 +220,10 @@
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.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txtWCurrent = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -218,6 +244,19 @@
this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layWeight)).BeginInit();
+ this.layWeight.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txtW1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtW2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtW3.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtW4.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtW5.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
@@ -264,10 +303,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -308,6 +347,10 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtWCurrent.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
this.SuspendLayout();
//
// repositoryItemComboBox1
@@ -800,11 +843,12 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1435, 688);
- this.splitMx1.SplitterPosition = 231;
+ this.splitMx1.SplitterPosition = 278;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.layWeight);
this.layoutMx1.Controls.Add(this.txt_fngDesc);
this.layoutMx1.Controls.Add(this.btnYcReport);
this.layoutMx1.Controls.Add(this.lbGuid);
@@ -839,18 +883,182 @@
this.layoutControlItem23});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(609, 530, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(569, 547, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1435, 231);
+ this.layoutMx1.Size = new System.Drawing.Size(1435, 278);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // layWeight
+ //
+ this.layWeight.BackColor = System.Drawing.Color.LightBlue;
+ this.layWeight.Controls.Add(this.txtW1);
+ this.layWeight.Controls.Add(this.txtW2);
+ this.layWeight.Controls.Add(this.txtW3);
+ this.layWeight.Controls.Add(this.txtW4);
+ this.layWeight.Controls.Add(this.txtW5);
+ this.layWeight.Controls.Add(this.btnW);
+ this.layWeight.Controls.Add(this.txtWCurrent);
+ this.layWeight.Location = new System.Drawing.Point(10, 234);
+ 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(1061, 34);
+ this.layWeight.TabIndex = 818;
+ this.layWeight.Text = "layoutControl1";
+ //
+ // txtW1
+ //
+ this.txtW1.Location = new System.Drawing.Point(52, 2);
+ this.txtW1.Name = "txtW1";
+ this.txtW1.Size = new System.Drawing.Size(95, 24);
+ this.txtW1.StyleController = this.layWeight;
+ this.txtW1.TabIndex = 4;
+ //
+ // txtW2
+ //
+ this.txtW2.Location = new System.Drawing.Point(201, 2);
+ this.txtW2.Name = "txtW2";
+ this.txtW2.Size = new System.Drawing.Size(98, 24);
+ this.txtW2.StyleController = this.layWeight;
+ this.txtW2.TabIndex = 5;
+ //
+ // txtW3
+ //
+ this.txtW3.Location = new System.Drawing.Point(353, 2);
+ this.txtW3.Name = "txtW3";
+ this.txtW3.Size = new System.Drawing.Size(98, 24);
+ this.txtW3.StyleController = this.layWeight;
+ this.txtW3.TabIndex = 6;
+ //
+ // txtW4
+ //
+ this.txtW4.Location = new System.Drawing.Point(505, 2);
+ this.txtW4.Name = "txtW4";
+ this.txtW4.Size = new System.Drawing.Size(98, 24);
+ this.txtW4.StyleController = this.layWeight;
+ this.txtW4.TabIndex = 7;
+ //
+ // txtW5
+ //
+ this.txtW5.Location = new System.Drawing.Point(657, 2);
+ this.txtW5.Name = "txtW5";
+ this.txtW5.Size = new System.Drawing.Size(98, 24);
+ this.txtW5.StyleController = this.layWeight;
+ this.txtW5.TabIndex = 8;
+ //
+ // btnW
+ //
+ this.btnW.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
+ 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(911, 2);
+ this.btnW.Name = "btnW";
+ this.btnW.Size = new System.Drawing.Size(148, 27);
+ this.btnW.StyleController = this.layWeight;
+ this.btnW.TabIndex = 9;
+ this.btnW.Text = "鑾峰彇";
+ //
+ // layoutControlGroup2
+ //
+ this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup2.GroupBordersVisible = false;
+ this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem31,
+ this.layoutControlItem32,
+ this.layoutControlItem33,
+ this.layoutControlItem34,
+ this.layoutControlItem35,
+ this.layoutControlItem36,
+ this.layoutControlItem37});
+ this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup2.Name = "layoutControlGroup2";
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4,
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ 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(1061, 34);
+ this.layoutControlGroup2.TextVisible = false;
+ //
+ // layoutControlItem31
+ //
+ this.layoutControlItem31.Control = this.txtW1;
+ this.layoutControlItem31.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem31.Name = "layoutControlItem31";
+ this.layoutControlItem31.Size = new System.Drawing.Size(149, 34);
+ this.layoutControlItem31.Text = "閲嶉噺1";
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(38, 18);
+ //
+ // layoutControlItem32
+ //
+ this.layoutControlItem32.Control = this.txtW2;
+ this.layoutControlItem32.Location = new System.Drawing.Point(149, 0);
+ this.layoutControlItem32.Name = "layoutControlItem32";
+ this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem32.Size = new System.Drawing.Size(152, 34);
+ this.layoutControlItem32.Text = "閲嶉噺2";
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(38, 18);
+ //
+ // layoutControlItem33
+ //
+ this.layoutControlItem33.Control = this.txtW3;
+ this.layoutControlItem33.Location = new System.Drawing.Point(301, 0);
+ this.layoutControlItem33.Name = "layoutControlItem33";
+ this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem33.Size = new System.Drawing.Size(152, 34);
+ this.layoutControlItem33.Text = "閲嶉噺3";
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(38, 18);
+ //
+ // layoutControlItem34
+ //
+ this.layoutControlItem34.Control = this.txtW4;
+ this.layoutControlItem34.Location = new System.Drawing.Point(453, 0);
+ this.layoutControlItem34.Name = "layoutControlItem34";
+ this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem34.Size = new System.Drawing.Size(152, 34);
+ this.layoutControlItem34.Text = "閲嶉噺4";
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(38, 18);
+ //
+ // layoutControlItem35
+ //
+ this.layoutControlItem35.Control = this.txtW5;
+ this.layoutControlItem35.Location = new System.Drawing.Point(605, 0);
+ this.layoutControlItem35.Name = "layoutControlItem35";
+ this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem35.Size = new System.Drawing.Size(152, 34);
+ this.layoutControlItem35.Text = "閲嶉噺5";
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(38, 18);
//
// txt_fngDesc
//
this.txt_fngDesc.BtnTxt = "寮傚父鎻忚堪";
- this.txt_fngDesc.Location = new System.Drawing.Point(12, 162);
+ this.txt_fngDesc.Location = new System.Drawing.Point(12, 172);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(703, 57);
+ this.txt_fngDesc.Size = new System.Drawing.Size(703, 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\'";
@@ -858,7 +1066,7 @@
// btnYcReport
//
this.btnYcReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttopdf_16x16;
- this.btnYcReport.Location = new System.Drawing.Point(719, 192);
+ this.btnYcReport.Location = new System.Drawing.Point(719, 172);
this.btnYcReport.Name = "btnYcReport";
this.btnYcReport.Size = new System.Drawing.Size(116, 27);
this.btnYcReport.StyleController = this.layoutMx1;
@@ -877,7 +1085,7 @@
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(437, 102);
+ this.txt_suppName.Location = new System.Drawing.Point(437, 108);
this.txt_suppName.Name = "txt_suppName";
this.txt_suppName.Size = new System.Drawing.Size(278, 24);
this.txt_suppName.StyleController = this.layoutMx1;
@@ -886,7 +1094,7 @@
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(84, 132);
+ this.txt_remarks.Location = new System.Drawing.Point(84, 140);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
this.txt_remarks.Size = new System.Drawing.Size(631, 24);
@@ -896,7 +1104,7 @@
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(791, 102);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(791, 108);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
@@ -907,7 +1115,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(84, 42);
+ this.txt_itemName.Location = new System.Drawing.Point(84, 44);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
this.txt_itemName.Size = new System.Drawing.Size(277, 24);
@@ -947,7 +1155,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(84, 72);
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 76);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Size = new System.Drawing.Size(277, 24);
@@ -957,7 +1165,7 @@
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(84, 102);
+ this.txt_itemModel.Location = new System.Drawing.Point(84, 108);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Size = new System.Drawing.Size(277, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
@@ -975,7 +1183,7 @@
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(791, 42);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(791, 44);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
this.txt_fcheckBy.Size = new System.Drawing.Size(278, 24);
@@ -985,7 +1193,7 @@
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(437, 72);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(437, 76);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
this.txt_fbatchQty.Size = new System.Drawing.Size(278, 24);
@@ -995,7 +1203,7 @@
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1145, 42);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1145, 44);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
this.txt_fsubmitDate.Size = new System.Drawing.Size(278, 24);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
@@ -1004,7 +1212,7 @@
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1145, 72);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1145, 76);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
this.txt_fsubmitBy.Size = new System.Drawing.Size(278, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
@@ -1023,7 +1231,7 @@
//
// txt_slOrg
//
- this.txt_slOrg.Location = new System.Drawing.Point(791, 132);
+ this.txt_slOrg.Location = new System.Drawing.Point(791, 140);
this.txt_slOrg.Name = "txt_slOrg";
this.txt_slOrg.Size = new System.Drawing.Size(278, 24);
this.txt_slOrg.StyleController = this.layoutMx1;
@@ -1041,7 +1249,7 @@
//
// txt_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(791, 72);
+ this.txt_checkStates.Location = new System.Drawing.Point(791, 76);
this.txt_checkStates.Name = "txt_checkStates";
this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
@@ -1063,7 +1271,7 @@
//
// txt_cgdNo
//
- this.txt_cgdNo.Location = new System.Drawing.Point(437, 42);
+ this.txt_cgdNo.Location = new System.Drawing.Point(437, 44);
this.txt_cgdNo.Name = "txt_cgdNo";
this.txt_cgdNo.Size = new System.Drawing.Size(278, 24);
this.txt_cgdNo.StyleController = this.layoutMx1;
@@ -1072,7 +1280,7 @@
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(1145, 102);
+ this.txt_fngHandle.Location = new System.Drawing.Point(1145, 108);
this.txt_fngHandle.Name = "txt_fngHandle";
this.txt_fngHandle.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fngHandle.Properties.Appearance.Options.UseForeColor = true;
@@ -1083,16 +1291,16 @@
//
// txt_xblb
//
- this.txt_xblb.Location = new System.Drawing.Point(1145, 162);
+ this.txt_xblb.Location = new System.Drawing.Point(1145, 172);
this.txt_xblb.Name = "txt_xblb";
- this.txt_xblb.Size = new System.Drawing.Size(278, 57);
+ this.txt_xblb.Size = new System.Drawing.Size(278, 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(1145, 132);
+ this.txt_xbsl.Location = new System.Drawing.Point(1145, 140);
this.txt_xbsl.Name = "txt_xbsl";
this.txt_xbsl.Size = new System.Drawing.Size(278, 24);
this.txt_xbsl.StyleController = this.layoutMx1;
@@ -1166,27 +1374,26 @@
this.layoutControlItem24,
this.layoutControlItem18,
this.layoutControlItem28,
- this.layoutControlItem27,
this.layoutControlItem25,
this.layoutControlItem26,
- this.layoutControlItem29});
+ this.layoutControlItem29,
+ this.layoutControlItem30,
+ this.layoutControlItem27});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8,
+ columnDefinition9,
+ columnDefinition10,
+ columnDefinition11});
rowDefinition2.Height = 100D;
rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition3.Height = 100D;
@@ -1197,17 +1404,22 @@
rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition6.Height = 100D;
rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 31D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
rowDefinition2,
rowDefinition3,
rowDefinition4,
rowDefinition5,
rowDefinition6,
- rowDefinition7});
- this.Root.Size = new System.Drawing.Size(1435, 231);
+ rowDefinition7,
+ rowDefinition8,
+ rowDefinition9});
+ this.Root.Size = new System.Drawing.Size(1435, 278);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1215,59 +1427,59 @@
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(353, 30);
+ this.layoutControlItem1.Size = new System.Drawing.Size(353, 32);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_itemName;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 30);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(353, 30);
+ this.layoutControlItem4.Size = new System.Drawing.Size(353, 32);
this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 60);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(353, 30);
+ this.layoutControlItem5.Size = new System.Drawing.Size(353, 32);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 90);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 96);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(353, 30);
+ this.layoutControlItem6.Size = new System.Drawing.Size(353, 32);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(1061, 30);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1061, 32);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem15.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitBy;
- this.layoutControlItem16.Location = new System.Drawing.Point(1061, 60);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1061, 64);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem16.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1277,7 +1489,7 @@
this.layoutControlItem14.Location = new System.Drawing.Point(1061, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem14.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1285,66 +1497,66 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 120);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 128);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem12.Size = new System.Drawing.Size(707, 30);
+ this.layoutControlItem12.Size = new System.Drawing.Size(707, 32);
this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(707, 90);
+ this.layoutControlItem10.Location = new System.Drawing.Point(707, 96);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem10.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_suppName;
- this.layoutControlItem13.Location = new System.Drawing.Point(353, 90);
+ this.layoutControlItem13.Location = new System.Drawing.Point(353, 96);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem13.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem13.Text = "渚涘簲鍟�";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_checkStates;
- this.layoutControlItem22.Location = new System.Drawing.Point(707, 60);
+ this.layoutControlItem22.Location = new System.Drawing.Point(707, 64);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem22.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem22.Text = "妫�楠岀姸鎬�";
this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(353, 60);
+ this.layoutControlItem9.Location = new System.Drawing.Point(353, 64);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem9.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem9.Text = "鏀惰揣鏁伴噺";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(707, 30);
+ this.layoutControlItem8.Location = new System.Drawing.Point(707, 32);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem8.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1354,7 +1566,7 @@
this.layoutControlItem2.Location = new System.Drawing.Point(707, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem2.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1364,93 +1576,91 @@
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(354, 30);
+ this.layoutControlItem3.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem3.Text = "閫佹鎵瑰彿";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_cgdNo;
- this.layoutControlItem24.Location = new System.Drawing.Point(353, 30);
+ this.layoutControlItem24.Location = new System.Drawing.Point(353, 32);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem24.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem24.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem24.Text = "閲囪喘鍗曞彿";
this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_slOrg;
- this.layoutControlItem18.Location = new System.Drawing.Point(707, 120);
+ this.layoutControlItem18.Location = new System.Drawing.Point(707, 128);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem18.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem18.Text = "鏀舵枡缁勭粐";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_fngDesc;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 150);
+ this.layoutControlItem28.Location = new System.Drawing.Point(0, 160);
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(707, 61);
+ this.layoutControlItem28.Size = new System.Drawing.Size(707, 64);
this.layoutControlItem28.Text = "寮傚父澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem28.TextVisible = false;
//
- // layoutControlItem27
- //
- this.layoutControlItem27.Control = this.btnYcReport;
- this.layoutControlItem27.Location = new System.Drawing.Point(707, 180);
- 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(354, 31);
- this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem27.TextVisible = false;
- //
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_fngHandle;
- this.layoutControlItem25.Location = new System.Drawing.Point(1061, 90);
+ this.layoutControlItem25.Location = new System.Drawing.Point(1061, 96);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem25.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem25.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem25.Text = "澶勭悊鎰忚";
this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_xblb;
- this.layoutControlItem26.Location = new System.Drawing.Point(1061, 150);
+ this.layoutControlItem26.Location = new System.Drawing.Point(1061, 160);
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(354, 61);
+ this.layoutControlItem26.Size = new System.Drawing.Size(354, 64);
this.layoutControlItem26.Text = "閫夊埆绫诲埆";
this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem29
//
this.layoutControlItem29.Control = this.txt_xbsl;
- this.layoutControlItem29.Location = new System.Drawing.Point(1061, 120);
+ this.layoutControlItem29.Location = new System.Drawing.Point(1061, 128);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem29.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem29.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem29.Text = "鎸戦�夋暟閲�";
this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem30
+ //
+ this.layoutControlItem30.Control = this.layWeight;
+ this.layoutControlItem30.Location = new System.Drawing.Point(0, 224);
+ 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(1061, 34);
+ this.layoutControlItem30.Text = "绉伴噸";
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem30.TextVisible = false;
//
// xtraTabControl2
//
@@ -1458,7 +1668,7 @@
this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
- this.xtraTabControl2.Size = new System.Drawing.Size(1435, 445);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1435, 398);
this.xtraTabControl2.TabIndex = 3;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1469,7 +1679,7 @@
this.tabMxPage1.Controls.Add(this.splitMx2);
this.tabMxPage1.Controls.Add(this.panMsg);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1433, 413);
+ this.tabMxPage1.Size = new System.Drawing.Size(1433, 366);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitMx2
@@ -1488,7 +1698,7 @@
//
this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
this.splitMx2.Panel2.Text = "Panel2";
- this.splitMx2.Size = new System.Drawing.Size(1433, 366);
+ this.splitMx2.Size = new System.Drawing.Size(1433, 319);
this.splitMx2.SplitterPosition = 287;
this.splitMx2.TabIndex = 3;
//
@@ -1761,7 +1971,7 @@
//
this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
this.splitYangLi.Panel2.Text = "Panel2";
- this.splitYangLi.Size = new System.Drawing.Size(1433, 67);
+ this.splitYangLi.Size = new System.Drawing.Size(1433, 20);
this.splitYangLi.SplitterPosition = 676;
this.splitYangLi.TabIndex = 4;
//
@@ -1771,7 +1981,7 @@
this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl1.Location = new System.Drawing.Point(0, 0);
this.groupControl1.Name = "groupControl1";
- this.groupControl1.Size = new System.Drawing.Size(676, 67);
+ this.groupControl1.Size = new System.Drawing.Size(676, 20);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "妫�娴嬬粨鏋�";
//
@@ -1781,7 +1991,7 @@
this.gcMx2.Location = new System.Drawing.Point(2, 28);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(672, 37);
+ this.gcMx2.Size = new System.Drawing.Size(672, 0);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1869,7 +2079,7 @@
this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl2.Location = new System.Drawing.Point(0, 0);
this.groupControl2.Name = "groupControl2";
- this.groupControl2.Size = new System.Drawing.Size(745, 67);
+ this.groupControl2.Size = new System.Drawing.Size(745, 20);
this.groupControl2.TabIndex = 4;
this.groupControl2.Text = "鏍锋湰缁撴灉";
//
@@ -1879,7 +2089,7 @@
this.gcMx3.Location = new System.Drawing.Point(2, 28);
this.gcMx3.MainView = this.gvMx3;
this.gcMx3.Name = "gcMx3";
- this.gcMx3.Size = new System.Drawing.Size(741, 37);
+ this.gcMx3.Size = new System.Drawing.Size(741, 0);
this.gcMx3.TabIndex = 0;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -2037,23 +2247,23 @@
this.layoutControlItem19});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.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.AutoSize;
- columnDefinition8.Width = 110D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
+ columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition13.Width = 100D;
+ columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition14.Width = 100D;
+ columnDefinition15.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition15.Width = 110D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12,
+ columnDefinition13,
+ columnDefinition14,
+ columnDefinition15});
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition8});
+ rowDefinition10});
this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlGroup1.Size = new System.Drawing.Size(1429, 43);
this.layoutControlGroup1.TextVisible = false;
@@ -2103,7 +2313,7 @@
//
this.tabMxPage2.Controls.Add(this.ucUpFileList1);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1433, 413);
+ this.tabMxPage2.Size = new System.Drawing.Size(1433, 373);
this.tabMxPage2.Text = "闄勪欢淇℃伅";
//
// ucUpFileList1
@@ -2113,7 +2323,7 @@
this.ucUpFileList1.Name = "ucUpFileList1";
this.ucUpFileList1.parentGroup = null;
this.ucUpFileList1.pGuid = null;
- this.ucUpFileList1.Size = new System.Drawing.Size(1433, 413);
+ this.ucUpFileList1.Size = new System.Drawing.Size(1433, 373);
this.ucUpFileList1.TabIndex = 0;
//
// repositoryItemComboBox2
@@ -2149,6 +2359,52 @@
//
this.gridView4.Name = "gridView4";
//
+ // layoutControlItem36
+ //
+ this.layoutControlItem36.Control = this.btnW;
+ this.layoutControlItem36.Location = new System.Drawing.Point(909, 0);
+ this.layoutControlItem36.Name = "layoutControlItem36";
+ this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 6;
+ this.layoutControlItem36.Size = new System.Drawing.Size(152, 34);
+ this.layoutControlItem36.Text = "鑾峰彇";
+ this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem36.TextVisible = false;
+ //
+ // txtWCurrent
+ //
+ this.txtWCurrent.Location = new System.Drawing.Point(759, 2);
+ this.txtWCurrent.Name = "txtWCurrent";
+ this.txtWCurrent.Properties.ReadOnly = true;
+ this.txtWCurrent.Size = new System.Drawing.Size(148, 24);
+ this.txtWCurrent.StyleController = this.layWeight;
+ this.txtWCurrent.TabIndex = 10;
+ //
+ // layoutControlItem37
+ //
+ this.layoutControlItem37.Control = this.txtWCurrent;
+ this.layoutControlItem37.Location = new System.Drawing.Point(757, 0);
+ this.layoutControlItem37.Name = "layoutControlItem37";
+ this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 5;
+ this.layoutControlItem37.Size = new System.Drawing.Size(152, 34);
+ this.layoutControlItem37.Text = "瀹炴椂閲嶉噺";
+ this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem37.TextVisible = false;
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.btnYcReport;
+ this.layoutControlItem27.Location = new System.Drawing.Point(707, 160);
+ 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 = 5;
+ this.layoutControlItem27.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem27.TextVisible = false;
+ //
// Frm_MesQaItemsDetect01
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2179,6 +2435,19 @@
this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layWeight)).EndInit();
+ this.layWeight.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txtW1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtW2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtW3.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtW4.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtW5.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
@@ -2225,10 +2494,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2269,6 +2538,10 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtWCurrent.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
this.ResumeLayout(false);
}
@@ -2419,11 +2692,28 @@
private UserControl.UcDictionary txt_fngDesc;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
private DevExpress.XtraEditors.MemoEdit txt_xblb;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
private DevExpress.XtraEditors.TextEdit txt_xbsl;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraLayout.LayoutControl layWeight;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+ private DevExpress.XtraEditors.TextEdit txtW1;
+ private DevExpress.XtraEditors.TextEdit txtW2;
+ private DevExpress.XtraEditors.TextEdit txtW3;
+ private DevExpress.XtraEditors.TextEdit txtW4;
+ private DevExpress.XtraEditors.TextEdit txtW5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+ private DevExpress.XtraEditors.SimpleButton btnW;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
+ private DevExpress.XtraEditors.TextEdit txtWCurrent;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
index a4826a3..25d6b3c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
@@ -120,4 +120,7 @@
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <metadata name="$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
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs
index 1d445ba..bae9789 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs
@@ -45,7 +45,6 @@
this.comStopBits = new DevExpress.XtraEditors.ComboBoxEdit();
this.comParity = new DevExpress.XtraEditors.ComboBoxEdit();
this.txtMsg = new DevExpress.XtraEditors.MemoEdit();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.cmbBaudRate1111 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -55,6 +54,7 @@
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -84,7 +84,6 @@
((System.ComponentModel.ISupportInitialize)(this.comStopBits.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.comParity.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtMsg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cmbBaudRate1111)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
@@ -94,6 +93,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
this.SuspendLayout();
@@ -116,7 +116,7 @@
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1040, 511);
- this.split1.SplitterPosition = 110;
+ this.split1.SplitterPosition = 113;
this.split1.TabIndex = 1;
//
// layoutMx1
@@ -137,7 +137,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(310, 455, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1040, 110);
+ this.layoutMx1.Size = new System.Drawing.Size(1040, 113);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "dataLayoutControl1";
//
@@ -200,7 +200,7 @@
this.txtNum.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
this.txtNum.Properties.Appearance.Options.UseFont = true;
this.txtNum.Properties.ReadOnly = true;
- this.txtNum.Size = new System.Drawing.Size(413, 36);
+ this.txtNum.Size = new System.Drawing.Size(434, 36);
this.txtNum.StyleController = this.layoutMx1;
this.txtNum.TabIndex = 8;
//
@@ -257,23 +257,11 @@
//
// txtMsg
//
- this.txtMsg.Location = new System.Drawing.Point(344, 74);
+ this.txtMsg.Location = new System.Drawing.Point(94, 123);
this.txtMsg.Name = "txtMsg";
- this.txtMsg.Size = new System.Drawing.Size(663, 27);
+ this.txtMsg.Size = new System.Drawing.Size(414, 35);
this.txtMsg.StyleController = this.layoutMx1;
this.txtMsg.TabIndex = 15;
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txtMsg;
- this.layoutControlItem5.Location = new System.Drawing.Point(250, 62);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(749, 31);
- this.layoutControlItem5.Text = "鏀跺垪琛�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(70, 18);
//
// Root
//
@@ -310,7 +298,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1019, 113);
+ this.Root.Size = new System.Drawing.Size(1040, 113);
this.Root.TextVisible = false;
//
// cmbBaudRate1111
@@ -375,7 +363,7 @@
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem4.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(499, 62);
+ this.layoutControlItem4.Size = new System.Drawing.Size(520, 62);
this.layoutControlItem4.Text = "閲嶉噺";
this.layoutControlItem4.TextSize = new System.Drawing.Size(70, 41);
//
@@ -387,7 +375,7 @@
this.layoutControlItem2.MinSize = new System.Drawing.Size(41, 31);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(499, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(520, 31);
this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem2.Text = "鍚姩";
this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
@@ -404,13 +392,24 @@
this.layoutControlItem8.Text = "鍋滄浣�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(70, 18);
//
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txtMsg;
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 111);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem5.Size = new System.Drawing.Size(500, 39);
+ this.layoutControlItem5.Text = "鏀跺垪琛�";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(70, 18);
+ //
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1040, 389);
+ this.gcMx1.Size = new System.Drawing.Size(1040, 386);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -590,7 +589,6 @@
((System.ComponentModel.ISupportInitialize)(this.comStopBits.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.comParity.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtMsg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cmbBaudRate1111)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
@@ -600,6 +598,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
this.ResumeLayout(false);
@@ -640,7 +639,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraEditors.MemoEdit txtMsg;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.cs
index 884842b..dcfa62a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.cs
@@ -22,7 +22,7 @@
/// </summary>
private SerialPort Sp = new SerialPort();
/// <summary>
- /// 瀹氭椂鍒锋柊
+ /// gridview瀹氭椂鍒锋柊
/// </summary>
System.Timers.Timer timer = new System.Timers.Timer(10000);
public Frm_Work09()
@@ -166,7 +166,7 @@
}
catch (Exception exe)
{
- LogHelper.Debug(this.ToString(), "鎵撳紑澶辫触:" + exe.Message);
+ LogHelper.Debug(this.ToString(), "鎵撳紑涓插彛閫氫俊澶辫触:" + exe.Message);
Gs.DevApp.ToolBox.MsgHelper.ShowError("鎵撳紑澶辫触" + exe.Message);
}
}
@@ -261,7 +261,7 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
--
Gitblit v1.9.3