From 3c1412617bd3b403b48616fed7d0a14bf7ac6946 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 09 八月 2025 17:15:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 18
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 149 +++++++
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.cs | 47 +
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 40 +
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 35 +
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs | 49 +-
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx | 3
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx | 165 +++++--
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 589 ++++++++++++++++++++++++------
DevApp/Gs.DevApp/Program.cs | 3
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 34 +
11 files changed, 864 insertions(+), 268 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index c3aa09e..6b93081 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -335,15 +335,15 @@
{
if (item.Name == name)
{
- //鍚庢潵鍔犱笂锛屼负浜嗛噴鏀剧獥浣撹祫婧恇eg
- //foreach (Control control in item.Controls)
- //{
- // if (control is Form)
- // {
- // Form myForm = control as Form;
- // myForm.Invoke((MethodInvoker)delegate { myForm.Dispose(); }); // 纭繚 UI 绾跨▼瀹夊叏鍦伴噴鏀捐祫婧�
- // }
- //}
+ //2025-08-08鍔犱笂锛屼负浜嗛噴鏀剧獥浣撹祫婧恇eg
+ foreach (Control control in item.Controls)
+ {
+ if (control is Form)
+ {
+ Form myForm = control as Form;
+ myForm.Invoke((MethodInvoker)delegate { myForm.Dispose(); }); // 纭繚 UI 绾跨▼瀹夊叏鍦伴噴鏀捐祫婧�
+ }
+ }
//鍚庢潵鍔犱笂锛屼负浜嗛噴鏀剧獥浣撹祫婧恊nd
tabControl.TabPages.Remove(item);
item.Dispose();
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 4e53e28..abc60a4 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -34,18 +34,28 @@
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.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition 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 columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = 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 +95,24 @@
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.btnW = new DevExpress.XtraEditors.SimpleButton();
+ this.txtWCurrent = new DevExpress.XtraEditors.TextEdit();
+ this.txtW5 = new DevExpress.XtraEditors.TextEdit();
+ this.btnClean = 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.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem38 = 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 +162,11 @@
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.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -218,6 +247,23 @@
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.txtWCurrent.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.layoutControlItem36)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).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 +310,11 @@
((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.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -800,11 +847,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 = 270;
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 +887,245 @@
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, 270);
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.btnW);
+ this.layWeight.Controls.Add(this.txtWCurrent);
+ this.layWeight.Controls.Add(this.txtW5);
+ this.layWeight.Controls.Add(this.btnClean);
+ this.layWeight.Location = new System.Drawing.Point(10, 227);
+ 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, 33);
+ this.layWeight.TabIndex = 818;
+ this.layWeight.Text = "layoutControl1";
+ //
+ // txtW1
+ //
+ this.txtW1.Location = new System.Drawing.Point(52, 2);
+ this.txtW1.Name = "txtW1";
+ this.txtW1.Properties.ReadOnly = true;
+ this.txtW1.Size = new System.Drawing.Size(76, 24);
+ this.txtW1.StyleController = this.layWeight;
+ this.txtW1.TabIndex = 4;
+ //
+ // txtW2
+ //
+ this.txtW2.Location = new System.Drawing.Point(182, 2);
+ this.txtW2.Name = "txtW2";
+ this.txtW2.Properties.ReadOnly = true;
+ this.txtW2.Size = new System.Drawing.Size(79, 24);
+ this.txtW2.StyleController = this.layWeight;
+ this.txtW2.TabIndex = 5;
+ //
+ // txtW3
+ //
+ this.txtW3.Location = new System.Drawing.Point(315, 2);
+ this.txtW3.Name = "txtW3";
+ this.txtW3.Properties.ReadOnly = true;
+ this.txtW3.Size = new System.Drawing.Size(79, 24);
+ this.txtW3.StyleController = this.layWeight;
+ this.txtW3.TabIndex = 6;
+ //
+ // txtW4
+ //
+ this.txtW4.Location = new System.Drawing.Point(448, 2);
+ this.txtW4.Name = "txtW4";
+ this.txtW4.Properties.ReadOnly = true;
+ this.txtW4.Size = new System.Drawing.Size(79, 24);
+ this.txtW4.StyleController = this.layWeight;
+ this.txtW4.TabIndex = 7;
+ //
+ // 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(797, 2);
+ this.btnW.Name = "btnW";
+ this.btnW.Size = new System.Drawing.Size(129, 27);
+ this.btnW.StyleController = this.layWeight;
+ this.btnW.TabIndex = 9;
+ this.btnW.Text = "鑾峰彇";
+ //
+ // txtWCurrent
+ //
+ this.txtWCurrent.Location = new System.Drawing.Point(664, 2);
+ this.txtWCurrent.Name = "txtWCurrent";
+ this.txtWCurrent.Properties.ReadOnly = true;
+ this.txtWCurrent.Size = new System.Drawing.Size(129, 24);
+ this.txtWCurrent.StyleController = this.layWeight;
+ this.txtWCurrent.TabIndex = 10;
+ //
+ // txtW5
+ //
+ this.txtW5.Location = new System.Drawing.Point(581, 2);
+ this.txtW5.Name = "txtW5";
+ this.txtW5.Properties.ReadOnly = true;
+ this.txtW5.Size = new System.Drawing.Size(79, 24);
+ this.txtW5.StyleController = this.layWeight;
+ this.txtW5.TabIndex = 11;
+ //
+ // btnClean
+ //
+ this.btnClean.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
+ this.btnClean.Appearance.Options.UseBackColor = true;
+ this.btnClean.Location = new System.Drawing.Point(930, 2);
+ this.btnClean.Name = "btnClean";
+ this.btnClean.Size = new System.Drawing.Size(129, 27);
+ this.btnClean.StyleController = this.layWeight;
+ this.btnClean.TabIndex = 12;
+ this.btnClean.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.layoutControlItem36,
+ this.layoutControlItem37,
+ this.layoutControlItem35,
+ this.layoutControlItem38});
+ 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;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4,
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ 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, 33);
+ 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(130, 33);
+ 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(130, 0);
+ this.layoutControlItem32.Name = "layoutControlItem32";
+ this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem32.Size = new System.Drawing.Size(133, 33);
+ 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(263, 0);
+ this.layoutControlItem33.Name = "layoutControlItem33";
+ this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem33.Size = new System.Drawing.Size(133, 33);
+ 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(396, 0);
+ this.layoutControlItem34.Name = "layoutControlItem34";
+ this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem34.Size = new System.Drawing.Size(133, 33);
+ this.layoutControlItem34.Text = "閲嶉噺4";
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(38, 18);
+ //
+ // layoutControlItem36
+ //
+ this.layoutControlItem36.Control = this.btnW;
+ this.layoutControlItem36.Location = new System.Drawing.Point(795, 0);
+ this.layoutControlItem36.Name = "layoutControlItem36";
+ this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 6;
+ this.layoutControlItem36.Size = new System.Drawing.Size(133, 33);
+ this.layoutControlItem36.Text = "鑾峰彇";
+ this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem36.TextVisible = false;
+ //
+ // layoutControlItem37
+ //
+ this.layoutControlItem37.Control = this.txtWCurrent;
+ this.layoutControlItem37.Location = new System.Drawing.Point(662, 0);
+ this.layoutControlItem37.Name = "layoutControlItem37";
+ this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 5;
+ this.layoutControlItem37.Size = new System.Drawing.Size(133, 33);
+ this.layoutControlItem37.Text = "瀹炴椂閲嶉噺";
+ this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem37.TextVisible = false;
+ //
+ // layoutControlItem35
+ //
+ this.layoutControlItem35.Control = this.txtW5;
+ this.layoutControlItem35.Location = new System.Drawing.Point(529, 0);
+ this.layoutControlItem35.Name = "layoutControlItem35";
+ this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem35.Size = new System.Drawing.Size(133, 33);
+ this.layoutControlItem35.Text = "绉伴噸5";
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(38, 18);
+ //
+ // layoutControlItem38
+ //
+ this.layoutControlItem38.Control = this.btnClean;
+ this.layoutControlItem38.Location = new System.Drawing.Point(928, 0);
+ this.layoutControlItem38.Name = "layoutControlItem38";
+ this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 7;
+ this.layoutControlItem38.Size = new System.Drawing.Size(133, 33);
+ this.layoutControlItem38.Text = "娓呯┖";
+ this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem38.TextVisible = false;
//
// 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, 167);
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, 58);
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 +1133,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, 167);
this.btnYcReport.Name = "btnYcReport";
this.btnYcReport.Size = new System.Drawing.Size(116, 27);
this.btnYcReport.StyleController = this.layoutMx1;
@@ -877,7 +1152,7 @@
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(437, 102);
+ this.txt_suppName.Location = new System.Drawing.Point(437, 105);
this.txt_suppName.Name = "txt_suppName";
this.txt_suppName.Size = new System.Drawing.Size(278, 24);
this.txt_suppName.StyleController = this.layoutMx1;
@@ -886,7 +1161,7 @@
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(84, 132);
+ this.txt_remarks.Location = new System.Drawing.Point(84, 136);
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 +1171,7 @@
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(791, 102);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(791, 105);
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 +1182,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(84, 42);
+ this.txt_itemName.Location = new System.Drawing.Point(84, 43);
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 +1222,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(84, 72);
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 74);
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 +1232,7 @@
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(84, 102);
+ this.txt_itemModel.Location = new System.Drawing.Point(84, 105);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Size = new System.Drawing.Size(277, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
@@ -975,7 +1250,7 @@
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(791, 42);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(791, 43);
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 +1260,7 @@
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(437, 72);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(437, 74);
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 +1270,7 @@
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1145, 42);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1145, 43);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
this.txt_fsubmitDate.Size = new System.Drawing.Size(278, 24);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
@@ -1004,7 +1279,7 @@
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1145, 72);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1145, 74);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
this.txt_fsubmitBy.Size = new System.Drawing.Size(278, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
@@ -1023,7 +1298,7 @@
//
// txt_slOrg
//
- this.txt_slOrg.Location = new System.Drawing.Point(791, 132);
+ this.txt_slOrg.Location = new System.Drawing.Point(791, 136);
this.txt_slOrg.Name = "txt_slOrg";
this.txt_slOrg.Size = new System.Drawing.Size(278, 24);
this.txt_slOrg.StyleController = this.layoutMx1;
@@ -1041,7 +1316,7 @@
//
// txt_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(791, 72);
+ this.txt_checkStates.Location = new System.Drawing.Point(791, 74);
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 +1338,7 @@
//
// txt_cgdNo
//
- this.txt_cgdNo.Location = new System.Drawing.Point(437, 42);
+ this.txt_cgdNo.Location = new System.Drawing.Point(437, 43);
this.txt_cgdNo.Name = "txt_cgdNo";
this.txt_cgdNo.Size = new System.Drawing.Size(278, 24);
this.txt_cgdNo.StyleController = this.layoutMx1;
@@ -1072,7 +1347,7 @@
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(1145, 102);
+ this.txt_fngHandle.Location = new System.Drawing.Point(1145, 105);
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 +1358,16 @@
//
// txt_xblb
//
- this.txt_xblb.Location = new System.Drawing.Point(1145, 162);
+ this.txt_xblb.Location = new System.Drawing.Point(1145, 167);
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, 58);
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, 136);
this.txt_xbsl.Name = "txt_xbsl";
this.txt_xbsl.Size = new System.Drawing.Size(278, 24);
this.txt_xbsl.StyleController = this.layoutMx1;
@@ -1166,27 +1441,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;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9,
+ columnDefinition10,
+ columnDefinition11,
+ columnDefinition12});
rowDefinition2.Height = 100D;
rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition3.Height = 100D;
@@ -1197,17 +1471,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, 270);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1215,59 +1494,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, 31);
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, 31);
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, 31);
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, 62);
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, 31);
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, 93);
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, 31);
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, 31);
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, 31);
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, 62);
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, 31);
this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1277,7 +1556,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, 31);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1285,66 +1564,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, 124);
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, 31);
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, 93);
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, 31);
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, 93);
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, 31);
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, 62);
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, 31);
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, 62);
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, 31);
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, 31);
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, 31);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1354,7 +1633,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, 31);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1364,93 +1643,106 @@
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, 31);
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, 31);
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, 31);
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, 124);
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, 31);
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, 155);
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, 62);
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, 93);
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, 31);
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, 155);
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, 62);
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, 124);
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, 31);
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, 217);
+ 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, 33);
+ this.layoutControlItem30.Text = "绉伴噸";
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem30.TextVisible = false;
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.btnYcReport;
+ this.layoutControlItem27.Location = new System.Drawing.Point(707, 155);
+ 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, 31);
+ this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem27.TextVisible = false;
//
// xtraTabControl2
//
@@ -1458,7 +1750,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, 406);
this.xtraTabControl2.TabIndex = 3;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1469,7 +1761,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, 374);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitMx2
@@ -1488,7 +1780,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, 327);
this.splitMx2.SplitterPosition = 287;
this.splitMx2.TabIndex = 3;
//
@@ -1761,7 +2053,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, 28);
this.splitYangLi.SplitterPosition = 676;
this.splitYangLi.TabIndex = 4;
//
@@ -1771,7 +2063,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, 28);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "妫�娴嬬粨鏋�";
//
@@ -1781,7 +2073,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 +2161,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, 28);
this.groupControl2.TabIndex = 4;
this.groupControl2.Text = "鏍锋湰缁撴灉";
//
@@ -1879,7 +2171,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 +2329,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;
+ 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.Percent;
+ columnDefinition15.Width = 100D;
+ columnDefinition16.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition16.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;
+ columnDefinition13,
+ columnDefinition14,
+ columnDefinition15,
+ columnDefinition16});
+ 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 +2395,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, 374);
this.tabMxPage2.Text = "闄勪欢淇℃伅";
//
// ucUpFileList1
@@ -2113,7 +2405,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, 374);
this.ucUpFileList1.TabIndex = 0;
//
// repositoryItemComboBox2
@@ -2179,6 +2471,23 @@
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.txtWCurrent.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.layoutControlItem36)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).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 +2534,11 @@
((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.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2419,11 +2729,30 @@
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.XtraLayout.LayoutControlItem layoutControlItem31;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+ 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;
+ private DevExpress.XtraEditors.TextEdit txtW5;
+ private DevExpress.XtraEditors.SimpleButton btnClean;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 32dbf78..667d8df 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -1,3 +1,5 @@
+using DevExpress.Pdf.Native.BouncyCastle.Utilities.Collections;
+using DevExpress.XtraRichEdit.API.Native;
using Gs.DevApp.DevFrm.QC;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -10,6 +12,7 @@
using System.Data;
using System.Net;
using System.Threading.Tasks;
+using System.Timers;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -19,6 +22,10 @@
string _strTag = "N:涓嶅悎鏍�";
string _webServiceName = "MesQaItemsDetect01Manager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
+ /// <summary>
+ /// 瀹氭椂鍒锋柊
+ /// </summary>
+ System.Timers.Timer timer = new System.Timers.Timer(1000);
public Frm_MesQaItemsDetect01()
{
InitializeComponent();
@@ -54,8 +61,147 @@
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
btnIpt.Click += BtnIpt_Click;
btnYcReport.Click += BtnYcReport_Click;
- }
+ //鍏抽棴鏃堕噴鏀総imer
+ this.Disposed += (s, e) =>
+ {
+ // MessageBox.Show("ddddddd");
+ if (timer != null)
+ {
+ timer.Stop();
+ timer.Dispose();
+ }
+ };
+ timer.Elapsed += (s, e) =>
+ {
+ var _obj = new
+ {
+ };
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "WorkWeight/GetIqcWeight", JsonConvert.SerializeObject(_obj), false);
+ var dd = UtilityHelper.ReturnToDynamic(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ BeginInvoke(new Action(() =>
+ {
+ txtWCurrent.Text = dd.rtnData;
+ }));
+ }
+ }
+ catch (Exception ex)
+ {
+
+ }
+ };
+ timer.AutoReset = true; // 璁剧疆涓簍rue琛ㄧず閲嶅鎵ц锛宖alse琛ㄧず鎵ц涓�娆″悗鍋滄
+ timer.Enabled = true; // 寮�濮嬭鏃�
+ //璇诲彇閲嶉噺
+ this.btnW.Click += (s, e) =>
+ {
+ string _strCurrent = this.txtWCurrent.Text.Trim();
+ bool _isNumeric = decimal.TryParse(_strCurrent, out _);
+ if (!_isNumeric)
+ {
+ ToolBox.MsgHelper.ShowError("璇锋鏌ョО閲嶈缃紒");
+ return;
+ }
+ decimal _decCurrent = decimal.Parse(_strCurrent);
+ if (_decCurrent * 1 <= 0)
+ {
+ ToolBox.MsgHelper.ShowError("璇锋鏌ョО閲嶈缃紒");
+ return;
+ }
+ if (txtW1.Text.Trim().Length <= 0)
+ {
+ _setWeigth(1, _strCurrent);
+ return;
+ }
+ if (txtW2.Text.Trim().Length <= 0)
+ {
+ _setWeigth(2, _strCurrent);
+ return;
+ }
+ if (txtW3.Text.Trim().Length <= 0)
+ {
+ _setWeigth(3, _strCurrent);
+ return;
+ }
+ if (txtW4.Text.Trim().Length <= 0)
+ {
+ _setWeigth(4, _strCurrent);
+ return;
+ }
+ if (txtW5.Text.Trim().Length <= 0)
+ {
+ _setWeigth(5, _strCurrent);
+ return;
+ }
+ ToolBox.MsgHelper.ShowError("閲嶉噺宸茶幏鍙栧畬姣曪紒");
+ return;
+ };
+ //娓呯┖
+ this.btnClean.Click += (s, e) =>
+ {
+ _setWeigth(1, "");
+ this.txtW1.Text = this.txtW2.Text = this.txtW3.Text = this.txtW4.Text = this.txtW5.Text = "";
+ };
+ }
+ /// <summary>
+ /// 鎻愪氦绉伴噸
+ /// </summary>
+ /// <param name="_weightType"></param>
+ /// <param name="_weight"></param>
+ private void _setWeigth(int _weightType, string _weight)
+ {
+ var _obj = new
+ {
+ iqcGuid = this.txt_guid.Text.Trim(),
+ weightType = _weightType,
+ weight = _weight
+ };
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "WorkWeight/EditIqc", JsonConvert.SerializeObject(_obj), false);
+ var dd = UtilityHelper.ReturnToDynamic(strReturn);
+ if (dd.rtnCode <= 0)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ else
+ {
+ if (_weightType == 1)
+ {
+ txtW1.Text = _weight;
+ return;
+ }
+ if (_weightType == 2)
+ {
+ txtW2.Text = _weight;
+ return;
+ }
+ if (_weightType == 3)
+ {
+ txtW3.Text = _weight;
+ return;
+ }
+ if (_weightType == 4)
+ {
+ txtW4.Text = _weight;
+ return;
+ }
+ if (_weightType == 5)
+ {
+ txtW5.Text = _weight;
+ return;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
/// <summary>
/// 鎵归噺褰曞叆
@@ -591,6 +737,7 @@
txtJianYan.ReadOnly = !bl;
btnLoad.Enabled = bl;
btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
+ btnW.Enabled = btnClean.Enabled = bl;
}
#region 鎵撳紑鐖朵翰绐楀彛濮旀墭锛屾煡鐪嬪紓甯告姤鍛�
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..10f7707 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.cs
@@ -15,19 +15,21 @@
{
public partial class Frm_Work09 : DevExpress.XtraEditors.XtraForm
{
+ string _strType = "";
string _webServiceName = "WorkWeight/";
- string value = string.Empty;
/// <summary>
/// 涓插彛绫�
/// </summary>
private SerialPort Sp = new SerialPort();
/// <summary>
- /// 瀹氭椂鍒锋柊
+ /// gridview瀹氭椂鍒锋柊
/// </summary>
System.Timers.Timer timer = new System.Timers.Timer(10000);
- public Frm_Work09()
+ public Frm_Work09(string strType)
{
InitializeComponent();
+ this._strType = strType;
+ this.Text = _strType + ":" + this.Text;
this.FormClosing += (s, e) =>
{
if (Sp.IsOpen)
@@ -39,7 +41,10 @@
}
};
GetComList();
- this.comLine.getSuppler("");
+ if (this._strType == QcSeason.浜х嚎绉伴噸.ToString())
+ {
+ this.comLine.getSuppler("");
+ }
gvMx1.OptionsFind.ShowSearchNavButtons = false;
gvMx1.OptionsView.ShowAutoFilterRow = false;
gvMx1.OptionsView.ShowGroupPanel = false;
@@ -87,17 +92,20 @@
private void btnStart_Click(object sender, EventArgs e)
{
Sp.DataReceived -= new SerialDataReceivedEventHandler(Sp_DataReceived);
- string _comLine = comLine.GetId();
string _cmbSerialPortNum = cmbSerialPortNum.Text.Trim();
string _cmbBaudRate = cmbBaudRate.Text.Trim();
string _comSjw = comSjw.Text.Trim();
string _comStopBits = comStopBits.Text.Trim();
string _comParity = comParity.Text.Trim();
- if (string.IsNullOrEmpty(_comLine))
+ if (this._strType == QcSeason.浜х嚎绉伴噸.ToString())
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨绾夸綋");
- this.comLine.Focus();
- return;
+ string _comLine = comLine.GetId();
+ if (string.IsNullOrEmpty(_comLine))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨绾夸綋");
+ this.comLine.Focus();
+ return;
+ }
}
if (cmbSerialPortNum.SelectedIndex < 0)
{
@@ -166,7 +174,7 @@
}
catch (Exception exe)
{
- LogHelper.Debug(this.ToString(), "鎵撳紑澶辫触:" + exe.Message);
+ LogHelper.Debug(this.ToString(), "鎵撳紑涓插彛閫氫俊澶辫触:" + exe.Message);
Gs.DevApp.ToolBox.MsgHelper.ShowError("鎵撳紑澶辫触" + exe.Message);
}
}
@@ -185,7 +193,7 @@
if (i > 0)
{
_tmpStr = Sp.ReadExisting();
- // Thread.Sleep(1000);
+ // Thread.Sleep(1000);
LogHelper.Debug(this.ToString(), $"鐩戝惉鍒版暟鎹紝瀛楄妭闀垮害:{i.ToString()}锛寋_tmpStr}");
this.BeginInvoke(new Action(() =>
{
@@ -206,9 +214,9 @@
LogHelper.Debug(this.ToString(), "_tmpStr涓嶅寘鍚噸閲�+锛岄��鍑轰笂鎶�");
return;
}
- string[] _ary=_tmpStr.Split('+');
+ string[] _ary = _tmpStr.Split('+');
string abc = _ary.Last();//ST,GS,
- txtNum.Text = (abc.Trim().Replace("k", "").Replace("g", "").Replace("S","").Replace("T","").Replace("G","").Replace(",",""));
+ txtNum.Text = (abc.Trim().Replace("k", "").Replace("g", "").Replace("S", "").Replace("T", "").Replace("G", "").Replace(",", ""));
addModel(txtNum.Text, _tmpStr);
}));
}
@@ -242,7 +250,13 @@
/// <param name="_realWeightTxt">鍘熷瓙涓�</param>
private void addModel(string _realWeight, string _realWeightTxt)
{
- string _lineId = comLine.GetId();
+ string _lineId = "";
+ if (this._strType == QcSeason.浜х嚎绉伴噸.ToString())
+ {
+ _lineId = comLine.GetId();
+ }
+ else
+ _lineId = "0";
var _obj = new
{
lineId = _lineId,
@@ -261,7 +275,7 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -272,13 +286,14 @@
/// <param name="e"></param>
private void OnTimedEvent(Object source, ElapsedEventArgs e)
{
+ if (this._strType == QcSeason.iqc绉伴噸.ToString())
+ return;
var _obj = new
{
lineId = comLine.GetId(),
};
try
{
- var lst = new List<string>();
var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModelList", JsonConvert.SerializeObject(_obj), false);
var dd = UtilityHelper.ReturnToList(strReturn);
var dt = dd.rtnData;
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 5474a54..801da22 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -3,6 +3,7 @@
using Gs.DevApp.DevFrm;
using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Properties;
+using Gs.DevApp.ToolBox;
using System;
using System.Diagnostics;
using System.IO;
@@ -62,7 +63,7 @@
{
}
if (IsWeight == true)
- Application.Run(new Frm_Work09());
+ Application.Run(new Frm_Work09(QcSeason.浜х嚎绉伴噸.ToString()));
else
Application.Run(new FrmMain());
}
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 67b3d33..fbf24e5 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -62,13 +62,17 @@
/// <returns></returns>
public static string HttpPost(string url, string meth, string param, bool isLoading = true)
{
- Size _size; string _caption; Color _color; Padding _pad;
- (_size, _caption, _color, _pad) = getLoading();
- DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("鍔犺浇杩涘害:" + meth, _caption, _size);
- wdf.BackColor = _color;
- wdf.Padding = _pad;
- wdf.SetCaption("鍔犺浇杩涘害:" + meth);
- wdf.Visible = isLoading;
+ DevExpress.Utils.WaitDialogForm wdf = null;
+ if (isLoading == true)
+ {
+ Size _size; string _caption; Color _color; Padding _pad;
+ (_size, _caption, _color, _pad) = getLoading();
+ wdf = new DevExpress.Utils.WaitDialogForm("鍔犺浇杩涘害:" + meth, _caption, _size);
+ wdf.BackColor = _color;
+ wdf.Padding = _pad;
+ wdf.SetCaption("鍔犺浇杩涘害:" + meth);
+ wdf.Visible = isLoading;
+ }
HttpWebRequest request = null;
StreamWriter requestStream = null;
WebResponse response = null;
@@ -103,7 +107,8 @@
}
catch (Exception ex)
{
- wdf.Close();
+ if (wdf != null)
+ wdf.Close();
LogHelper.Debug(url, param + ":" + ex.Message);
throw ex;
}
@@ -113,7 +118,8 @@
requestStream = null;
response = null;
}
- wdf.Close();
+ if (wdf != null)
+ wdf.Close();
return responseStr;
}
@@ -268,7 +274,8 @@
{
colmn.Visible = true;
colmn.OptionsColumn.ReadOnly = false;
- };
+ }
+ ;
if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
{
colmn.Visible = !isEdt;
@@ -458,7 +465,7 @@
{
var txt = colType as RadioGroup;
if (txt != null)
- txt.SelectedIndex =int.Parse( strVal);
+ txt.SelectedIndex = int.Parse(strVal);
txt.ReadOnly = isEdt;
continue;
}
@@ -1933,7 +1940,8 @@
{
int _handle = gridView1.FocusedRowHandle;
bool _bl = xtraTabControl1.TabPages[0].PageEnabled;
- if (_bl == false) { return; };
+ if (_bl == false) { return; }
+ ;
if (_handle < 0)
{
xtraTabControl1.SelectedTabPageIndex = -1;
@@ -2477,6 +2485,8 @@
濮斿閫�鏂欏叆搴撴,
cqcjyes,//閲嶆鏂规
cqcjno,//閲嶆鏂规
+ 浜х嚎绉伴噸,
+ iqc绉伴噸,
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index af7c710..3c8c24b 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -66,6 +66,7 @@
this.btnAll = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnGongZi = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnLianBan = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnGx = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnLayout = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnFont = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -73,7 +74,7 @@
this.barLargeButtonItem2 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem3 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem4 = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnGx = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnWeight = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -134,9 +135,10 @@
this.btnAll,
this.btnGongZi,
this.btnLianBan,
- this.btnGx});
+ this.btnGx,
+ this.btnWeight});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 72;
+ this.barManager1.MaxItemId = 74;
//
// bar2
//
@@ -189,8 +191,8 @@
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem1),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem2),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem3),
- new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem4)});
- this.bar2.OptionsBar.DrawBorder = false;
+ new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem4),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnWeight)});
this.bar2.OptionsBar.DrawDragBorder = false;
this.bar2.OptionsBar.MultiLine = true;
this.bar2.OptionsBar.UseWholeRow = true;
@@ -519,6 +521,15 @@
this.btnLianBan.Name = "btnLianBan";
this.btnLianBan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnGx
+ //
+ this.btnGx.Caption = "宸ュ簭鍙樻洿";
+ this.btnGx.Id = 71;
+ this.btnGx.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnGx.ImageOptions.Image")));
+ this.btnGx.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnGx.ImageOptions.LargeImage")));
+ this.btnGx.Name = "btnGx";
+ this.btnGx.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// btnLayout
//
this.btnLayout.Caption = "鐗堥潰";
@@ -587,14 +598,14 @@
this.barLargeButtonItem4.Tag = "Never";
this.barLargeButtonItem4.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
- // btnGx
+ // btnWeight
//
- this.btnGx.Caption = "宸ュ簭鍙樻洿";
- this.btnGx.Id = 71;
- this.btnGx.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnGx.ImageOptions.Image")));
- this.btnGx.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnGx.ImageOptions.LargeImage")));
- this.btnGx.Name = "btnGx";
- this.btnGx.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ this.btnWeight.Caption = "绉伴噸";
+ this.btnWeight.Id = 73;
+ this.btnWeight.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnWeight.ImageOptions.Image")));
+ this.btnWeight.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnWeight.ImageOptions.LargeImage")));
+ this.btnWeight.Name = "btnWeight";
+ this.btnWeight.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
// barDockControlTop
//
@@ -608,7 +619,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 67);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 68);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -637,7 +648,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 67);
+ this.Size = new System.Drawing.Size(1543, 68);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -692,5 +703,6 @@
private DevExpress.XtraBars.BarLargeButtonItem btnGongZi;
private DevExpress.XtraBars.BarLargeButtonItem btnLianBan;
private DevExpress.XtraBars.BarLargeButtonItem btnGx;
+ private DevExpress.XtraBars.BarLargeButtonItem btnWeight;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index a010583..5db6917 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -5,6 +5,7 @@
using DevExpress.XtraLayout;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
+using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -60,6 +61,7 @@
btnGongZi.ItemClick += BtnGongZi_ItemClick;
btnLianBan.ItemClick += BtnLianBan_ItemClick;
btnGx.ItemClick += BtnGx_ItemClick;
+ btnWeight.ItemClick += BtnWeight_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -67,8 +69,30 @@
lst.Add(item.Caption);
actions = lst;
}
-
-
+ /// <summary>
+ /// 鍚姩绉伴噸
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void BtnWeight_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ bool isOpen = false;
+ foreach (Form form in Application.OpenForms)
+ {
+ if (form is Frm_Work09)
+ {
+ isOpen = true;
+ form.Activate(); // 婵�娲诲凡瀛樺湪鐨勭獥浣�
+ break;
+ }
+ }
+ if (!isOpen)
+ {
+ var form = new Frm_Work09(QcSeason.iqc绉伴噸.ToString());
+ form.Show();
+ }
+ }
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
@@ -428,7 +452,7 @@
lst.Add(btnShouHouFchk.Name);
lst.Add(btnGongZi.Name);
lst.Add(btnLianBan.Name);
- lst.Add(btnEsc.Name);
+ // lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
_enabledBtn(lst);
this.currentAction = "esc";
@@ -480,7 +504,7 @@
lst.Add(btnOut.Name);
lst.Add(btnGongZi.Name);
lst.Add(btnLianBan.Name);
- lst.Add(btnEsc.Name);
+ // lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
_enabledBtn(lst);
}
@@ -506,8 +530,8 @@
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
- lst.Add(btnFont.Name);
lst.Add(btnLog.Name);
+ lst.Add(btnWeight.Name);
_enabledBtn(lst);
this.currentAction = "edit";
if (btnEdtClick != null) btnEdtClick(this, e);
@@ -535,6 +559,7 @@
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
+ lst.Add(btnWeight.Name);
_enabledBtn(lst);
this.currentAction = "add";
if (btnAddClick != null) btnAddClick(this, e);
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
index 0fcfa3b..dc08b03 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
@@ -438,65 +438,120 @@
</data>
<data name="btnGx.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAldEVYdFRpdGxlAEZ1bmN0aW9uc0RhdGVBbmRUaW1lO0Z1bmN0aW9uczuCdFjGAAACwklEQVQ4
- T3WT+0uTURjHvV/S/o6IEmkFaaZiSiqSl9rUZqa5HJnammnLwNLpFKIfrIwCS6qpuUJKMVxauomX4S0N
- S+c2Z22a1kTRzUy3fTvnzWIqvfCBw3Pe74fzPIfjBMBp83MmuGzD9T/QPWcmuylw1pWXdk5XSKAvL4Ne
- UgadpBRTZWJoKaWUYmjFxdCUFGP8RpGCihwFLhqxGIs9PbDb7bBabfi1bsXq2jpWLGtYWv4J09Iq5hfM
- +GZaxlhhIQ25OQpcP4tEGL9agE/5+RgTCvHxkgAjObkYvpCNQX4W+nl8qNJ56Es9h+EcAQ25OwrcRoV5
- sAx2YnWwA5aBd3/obye0waJqg1n1FuZeOcw9rRjgX6Qhjy2CD9m5MPfJ8f1RBQyVN6E8zUVTWBSaw6Kh
- 5KbAcKcEc1XFWHjxAL3kJCTj6ShwV53LxHLHa+grRCQYg9GXLbCQ/il0TWv6W9fx41kllJyUnYJubhoW
- Xz2BMikZ3VU12CCD/Ptt2GzovlcDBScJcw8r0B7LpiEvsvVP4KFgc2GS3kdzaCTUagMaAkJRywqCKDyR
- kU2ov6Ip5DhpQwJ5VDwNeTsKPN/HJWK++jbTs05jxDy5NqvNjlOp15i1Vmsk8ijMkvm0HIvZKZBHJ2D2
- bgnpLxFD1VIYF1YwQ0jgFsBoWsHQ4zooTrJhKCczComkoV2OAq83ESdgIANUC3hoJbKRpzIY9bMw6Gcw
- Stat0fHM3nRhFhoDwmnIx1Hg3USO96UoF5psLibzMtFFTiKPiiXEoYvNweTlDOgEadBkJUN2MJSGfLcI
- GgMjMHWFh0k+B+rzbGhzuNAJM5iaVnCWqY+ficFEejzq/Y7sEHjUsoI7ZKxQyFghaDgQjOf+R1HvH8T8
- XOcXiLr9gZDuC4B072FU7zlEH9OWa6TP05PgQ/Ddxu5t0JoXwQWA0292ED6Rmga6ogAAAABJRU5ErkJg
- gg==
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACV0RVh0VGl0
+ bGUARnVuY3Rpb25zRGF0ZUFuZFRpbWU7RnVuY3Rpb25zO4J0WMYAAALCSURBVDhPdZP7S5NRGMe9X9L+
+ jogSaQVppmJKKpKX2tRmprkcmdqaacvA0ukUoh+sjAJLqqm5QkoxXFq6iZfhLQ1L5zZnbZrWRNHNTLd9
+ O+fNYiq98IHDc97vh/M8h+MEwGnzcya4bMP1P9A9Zya7KXDWlZd2TldIoC8vg15SBp2kFFNlYmgppZRi
+ aMXF0JQUY/xGkYKKHAUuGrEYiz09sNvtsFpt+LVuxeraOlYsa1ha/gnT0irmF8z4ZlrGWGEhDbk5Clw/
+ i0QYv1qAT/n5GBMK8fGSACM5uRi+kI1Bfhb6eXyo0nnoSz2H4RwBDbk7CtxGhXmwDHZidbADloF3f+hv
+ J7TBomqDWfUW5l45zD2tGOBfpCGPLYIP2bkw98nx/VEFDJU3oTzNRVNYFJrDoqHkpsBwpwRzVcVYePEA
+ veQkJOPpKHBXncvEcsdr6CtEJBiD0ZctsJD+KXRNa/pb1/HjWSWUnJSdgm5uGhZfPYEyKRndVTXYIIP8
+ +23YbOi+VwMFJwlzDyvQHsumIS+y9U/goWBzYZLeR3NoJNRqAxoCQlHLCoIoPJGRTai/oinkOGlDAnlU
+ PA15Owo838clYr76NtOzTmPEPLk2q82OU6nXmLVWayTyKMyS+bQci9kpkEcnYPZuCekvEUPVUhgXVjBD
+ SOAWwGhawdDjOihOsmEoJzMKiaShXY4CrzcRJ2AgA1QLeGglspGnMhj1szDoZzBK1q3R8czedGEWGgPC
+ acjHUeDdRI73pSgXmmwuJvMy0UVOIo+KJcShi83B5OUM6ARp0GQlQ3YwlIZ8twgaAyMwdYWHST4H6vNs
+ aHO40AkzmJpWcJapj5+JwUR6POr9juwQeNSygjtkrFDIWCFoOBCM5/5HUe8fxPxc5xeIuv2BkO4LgHTv
+ YVTvOUQf05ZrpM/Tk+BD8N3G7m3QmhfBBYDTb3YQPpGaBrqiAAAAAElFTkSuQmCC
</value>
</data>
<data name="btnGx.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- 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
- vnqQAAAAAElFTkSuQmCC
+ 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
+ YII=
+</value>
+ </data>
+ <data name="btnWeight.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAANdEVYdFRpdGxlAExlZ2VuZDvZEKE5AAACjElEQVQ4
+ T33QyU9TURQG8LsjUf8hlypx44YVMrgAEigkGoPBQGhsoICWoShCEJlKB0hAsEIpSAELKIIUbAkSDYkj
+ hNKW0kLp68znubfWbpQmv3z33Z5z8t5hOuPG4uDEJv7HwI1zjqRXnB16Ss2YbZF1GlZxdnYmJBLni3Px
+ tLaBZbAO/Yr4MxKJIxxJUCYo6RxOC6WEYiIlSq617x3YU+2ymBYKxxCky6mVPdTpHJCp36NW68Dkyi8E
+ pKhoCEpJp3+0dC+B8SmxeEJcNOgdUOjssGy5sXkgwWR3obp/A0rNOo5PI1QTRSAYI5SnUaieWcGaaUo0
+ lsDI/FdU9axj4ccJzDt+gZ8XvgVQ1WvD0MwOTqipumlaOA5E0dAxB6bqsiISTaBUZUXXwi76bG6MbXsx
+ SnrWXNDbvRhec6JIOSua/CcR+AMR+CiVTyxgDR3zYmlZ90xQW/dRP/0TRU1LyKowoUC1SM/fYf7iw43b
+ L+E7pkZyxPnDUKinwZRtFki0wPxqMx4Yd5BbO4d24yd89obROrqFbIUFA293kV0xDq8/gkNq9BKe8sYp
+ MIX6tVhg+9BH5NXM4HrZqPh2w7YPGschrhUPo6h+Fo91Nnh8YVSqzILniM4PTWDyRjMtJwanO4hC+SQy
+ ZSOoG3RAu+VHee86MkuGcatyAnuuU7jprVxCSJwr6sbBKh+ZaDFRMdHlldCi+YCrhQZcztfiSoEBzf2r
+ cHok0eQ6DOGApLK8xgjGp3hpKcnJyem8IFWU4hQpiRRo6F3FGFh5zUuxkHRxqojSwwuTxdw+nfdFJt2R
+ vwDLKe58k1fWg7xSrhu5nOw5SWYOV5J2s7jrL9l9vZXRL4NcIBfPcekf6J5l/Aauhh2JcwbEOwAAAABJ
+ RU5ErkJggg==
+</value>
+ </data>
+ <data name="btnWeight.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ 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
+ VNfrnh8B+4l3G6bTtFEAAAAASUVORK5CYII=
</value>
</data>
</root>
\ No newline at end of file
--
Gitblit v1.9.3