From 6b7f640c7952a3948b896d4c585d416f546788a1 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 17 七月 2025 08:17:12 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 39 +++--
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 339 +++++++++++++++++++++++++-----------------------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 2
DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs | 12 +
DevApp/Gs.DevApp/UserControl/SelectDeleteBar.Designer.cs | 1
7 files changed, 207 insertions(+), 190 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index cd849e8..413fc40 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -30,22 +30,22 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.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.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 rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition15 = 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 rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -160,6 +160,7 @@
this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.splitYangLi = new DevExpress.XtraEditors.SplitContainerControl();
this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
@@ -330,7 +331,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1344, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1437, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -341,7 +342,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1344, 720);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1437, 720);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -778,7 +779,7 @@
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1342, 688);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1435, 688);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -798,7 +799,7 @@
this.splitMx1.Panel2.Controls.Add(this.xtraTabControl2);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1342, 688);
+ this.splitMx1.Size = new System.Drawing.Size(1435, 688);
this.splitMx1.SplitterPosition = 231;
this.splitMx1.TabIndex = 0;
//
@@ -840,7 +841,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(609, 530, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1342, 231);
+ this.layoutMx1.Size = new System.Drawing.Size(1435, 231);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -849,7 +850,7 @@
this.txt_fngDesc.BtnTxt = "寮傚父鎻忚堪";
this.txt_fngDesc.Location = new System.Drawing.Point(12, 162);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(656, 57);
+ this.txt_fngDesc.Size = new System.Drawing.Size(703, 57);
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\'";
@@ -857,7 +858,7 @@
// btnYcReport
//
this.btnYcReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttopdf_16x16;
- this.btnYcReport.Location = new System.Drawing.Point(672, 192);
+ this.btnYcReport.Location = new System.Drawing.Point(719, 192);
this.btnYcReport.Name = "btnYcReport";
this.btnYcReport.Size = new System.Drawing.Size(116, 27);
this.btnYcReport.StyleController = this.layoutMx1;
@@ -876,9 +877,9 @@
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(414, 102);
+ this.txt_suppName.Location = new System.Drawing.Point(437, 102);
this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Size = new System.Drawing.Size(254, 24);
+ this.txt_suppName.Size = new System.Drawing.Size(278, 24);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 801;
this.txt_suppName.Tag = "readonly";
@@ -888,18 +889,18 @@
this.txt_remarks.Location = new System.Drawing.Point(84, 132);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(584, 24);
+ this.txt_remarks.Size = new System.Drawing.Size(631, 24);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 797;
this.txt_remarks.Tag = "readonly";
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(744, 102);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(791, 102);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
+ this.txt_fcheckResu.Size = new System.Drawing.Size(278, 24);
this.txt_fcheckResu.StyleController = this.layoutMx1;
this.txt_fcheckResu.TabIndex = 798;
this.txt_fcheckResu.Tag = "readonly";
@@ -909,7 +910,7 @@
this.txt_itemName.Location = new System.Drawing.Point(84, 42);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(277, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 800;
this.txt_itemName.Tag = "readonly";
@@ -919,27 +920,27 @@
this.txt_releaseNo.Location = new System.Drawing.Point(84, 12);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(254, 24);
+ this.txt_releaseNo.Size = new System.Drawing.Size(277, 24);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
this.txt_releaseNo.Tag = "readonly";
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Location = new System.Drawing.Point(744, 12);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(791, 12);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(278, 24);
this.txt_fcheckDate.StyleController = this.layoutMx1;
this.txt_fcheckDate.TabIndex = 216;
this.txt_fcheckDate.Tag = "readonly";
//
// txt_lotNo
//
- this.txt_lotNo.Location = new System.Drawing.Point(414, 12);
+ this.txt_lotNo.Location = new System.Drawing.Point(437, 12);
this.txt_lotNo.Name = "txt_lotNo";
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
+ this.txt_lotNo.Size = new System.Drawing.Size(278, 24);
this.txt_lotNo.StyleController = this.layoutMx1;
this.txt_lotNo.TabIndex = 262;
this.txt_lotNo.Tag = "readonly";
@@ -949,7 +950,7 @@
this.txt_itemNo.Location = new System.Drawing.Point(84, 72);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(277, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 789;
this.txt_itemNo.Tag = "readonly";
@@ -958,7 +959,7 @@
//
this.txt_itemModel.Location = new System.Drawing.Point(84, 102);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(277, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 801;
this.txt_itemModel.Tag = "readonly";
@@ -974,57 +975,57 @@
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(744, 42);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(791, 42);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
+ this.txt_fcheckBy.Size = new System.Drawing.Size(278, 24);
this.txt_fcheckBy.StyleController = this.layoutMx1;
this.txt_fcheckBy.TabIndex = 217;
this.txt_fcheckBy.Tag = "readonly";
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(414, 72);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(437, 72);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
- this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(278, 24);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.TabIndex = 222;
this.txt_fbatchQty.Tag = "readonly";
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 42);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1145, 42);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
- this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
+ this.txt_fsubmitBy.Size = new System.Drawing.Size(278, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
this.txt_fsubmitBy.TabIndex = 804;
this.txt_fsubmitBy.Tag = "readonly";
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 72);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1145, 72);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
- this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
+ this.txt_fsubmitDate.Size = new System.Drawing.Size(278, 24);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
this.txt_fsubmitDate.TabIndex = 805;
this.txt_fsubmitDate.Tag = "readonly";
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(1002, 12);
+ this.txt_fsubmit.Location = new System.Drawing.Point(1073, 12);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
+ this.txt_fsubmit.Size = new System.Drawing.Size(350, 24);
this.txt_fsubmit.StyleController = this.layoutMx1;
this.txt_fsubmit.TabIndex = 806;
this.txt_fsubmit.Tag = "readonly";
//
// txt_slOrg
//
- this.txt_slOrg.Location = new System.Drawing.Point(744, 132);
+ this.txt_slOrg.Location = new System.Drawing.Point(791, 132);
this.txt_slOrg.Name = "txt_slOrg";
- this.txt_slOrg.Size = new System.Drawing.Size(254, 24);
+ this.txt_slOrg.Size = new System.Drawing.Size(278, 24);
this.txt_slOrg.StyleController = this.layoutMx1;
this.txt_slOrg.TabIndex = 807;
this.txt_slOrg.Tag = "readonly";
@@ -1040,11 +1041,11 @@
//
// txt_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(744, 72);
+ this.txt_checkStates.Location = new System.Drawing.Point(791, 72);
this.txt_checkStates.Name = "txt_checkStates";
this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
- this.txt_checkStates.Size = new System.Drawing.Size(254, 24);
+ this.txt_checkStates.Size = new System.Drawing.Size(278, 24);
this.txt_checkStates.StyleController = this.layoutMx1;
this.txt_checkStates.TabIndex = 809;
this.txt_checkStates.Tag = "readonly";
@@ -1062,38 +1063,38 @@
//
// txt_cgdNo
//
- this.txt_cgdNo.Location = new System.Drawing.Point(414, 42);
+ this.txt_cgdNo.Location = new System.Drawing.Point(437, 42);
this.txt_cgdNo.Name = "txt_cgdNo";
- this.txt_cgdNo.Size = new System.Drawing.Size(254, 24);
+ this.txt_cgdNo.Size = new System.Drawing.Size(278, 24);
this.txt_cgdNo.StyleController = this.layoutMx1;
this.txt_cgdNo.TabIndex = 811;
this.txt_cgdNo.Tag = "readonly";
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(1074, 102);
+ this.txt_fngHandle.Location = new System.Drawing.Point(1145, 102);
this.txt_fngHandle.Name = "txt_fngHandle";
this.txt_fngHandle.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fngHandle.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fngHandle.Size = new System.Drawing.Size(256, 24);
+ this.txt_fngHandle.Size = new System.Drawing.Size(278, 24);
this.txt_fngHandle.StyleController = this.layoutMx1;
this.txt_fngHandle.TabIndex = 812;
this.txt_fngHandle.Tag = "readonly";
//
// txt_xblb
//
- this.txt_xblb.Location = new System.Drawing.Point(1074, 162);
+ this.txt_xblb.Location = new System.Drawing.Point(1145, 162);
this.txt_xblb.Name = "txt_xblb";
- this.txt_xblb.Size = new System.Drawing.Size(256, 57);
+ this.txt_xblb.Size = new System.Drawing.Size(278, 57);
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(1074, 132);
+ this.txt_xbsl.Location = new System.Drawing.Point(1145, 132);
this.txt_xbsl.Name = "txt_xbsl";
- this.txt_xbsl.Size = new System.Drawing.Size(256, 24);
+ this.txt_xbsl.Size = new System.Drawing.Size(278, 24);
this.txt_xbsl.StyleController = this.layoutMx1;
this.txt_xbsl.TabIndex = 817;
this.txt_xbsl.Tag = "readonly";
@@ -1171,42 +1172,42 @@
this.layoutControlItem29});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- 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;
+ columnDefinition9,
+ columnDefinition10,
+ columnDefinition11,
+ columnDefinition12});
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition15.Height = 31D;
+ rowDefinition15.SizeType = System.Windows.Forms.SizeType.AutoSize;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6,
- rowDefinition7});
- this.Root.Size = new System.Drawing.Size(1342, 231);
+ rowDefinition9,
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14,
+ rowDefinition15});
+ this.Root.Size = new System.Drawing.Size(1435, 231);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1214,7 +1215,7 @@
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(330, 30);
+ this.layoutControlItem1.Size = new System.Drawing.Size(353, 30);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1224,7 +1225,7 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 30);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(330, 30);
+ this.layoutControlItem4.Size = new System.Drawing.Size(353, 30);
this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1234,7 +1235,7 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 60);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 30);
+ this.layoutControlItem5.Size = new System.Drawing.Size(353, 30);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1244,39 +1245,39 @@
this.layoutControlItem6.Location = new System.Drawing.Point(0, 90);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 30);
+ this.layoutControlItem6.Size = new System.Drawing.Size(353, 30);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(990, 30);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1061, 30);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(332, 30);
+ this.layoutControlItem15.Size = new System.Drawing.Size(354, 30);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(990, 60);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1061, 60);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(332, 30);
+ this.layoutControlItem16.Size = new System.Drawing.Size(354, 30);
this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(990, 0);
+ 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(332, 30);
+ this.layoutControlItem14.Size = new System.Drawing.Size(354, 30);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1288,104 +1289,104 @@
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem12.Size = new System.Drawing.Size(660, 30);
+ this.layoutControlItem12.Size = new System.Drawing.Size(707, 30);
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(660, 90);
+ this.layoutControlItem10.Location = new System.Drawing.Point(707, 90);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 30);
+ this.layoutControlItem10.Size = new System.Drawing.Size(354, 30);
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(330, 90);
+ this.layoutControlItem13.Location = new System.Drawing.Point(353, 90);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(330, 30);
+ this.layoutControlItem13.Size = new System.Drawing.Size(354, 30);
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(660, 60);
+ this.layoutControlItem22.Location = new System.Drawing.Point(707, 60);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(330, 30);
+ this.layoutControlItem22.Size = new System.Drawing.Size(354, 30);
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(330, 60);
+ this.layoutControlItem9.Location = new System.Drawing.Point(353, 60);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(330, 30);
+ this.layoutControlItem9.Size = new System.Drawing.Size(354, 30);
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(660, 30);
+ this.layoutControlItem8.Location = new System.Drawing.Point(707, 30);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(330, 30);
+ this.layoutControlItem8.Size = new System.Drawing.Size(354, 30);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(660, 0);
+ 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(330, 30);
+ this.layoutControlItem2.Size = new System.Drawing.Size(354, 30);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_lotNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(330, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(353, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(330, 30);
+ this.layoutControlItem3.Size = new System.Drawing.Size(354, 30);
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(330, 30);
+ this.layoutControlItem24.Location = new System.Drawing.Point(353, 30);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem24.Size = new System.Drawing.Size(330, 30);
+ this.layoutControlItem24.Size = new System.Drawing.Size(354, 30);
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(660, 120);
+ this.layoutControlItem18.Location = new System.Drawing.Point(707, 120);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(330, 30);
+ this.layoutControlItem18.Size = new System.Drawing.Size(354, 30);
this.layoutControlItem18.Text = "鏀舵枡缁勭粐";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1397,7 +1398,7 @@
this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
this.layoutControlItem28.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem28.Size = new System.Drawing.Size(660, 61);
+ this.layoutControlItem28.Size = new System.Drawing.Size(707, 61);
this.layoutControlItem28.Text = "寮傚父澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem28.TextVisible = false;
@@ -1405,13 +1406,13 @@
// layoutControlItem27
//
this.layoutControlItem27.Control = this.btnYcReport;
- this.layoutControlItem27.Location = new System.Drawing.Point(660, 180);
+ 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(330, 31);
+ 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);
@@ -1420,34 +1421,34 @@
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_fngHandle;
- this.layoutControlItem25.Location = new System.Drawing.Point(990, 90);
+ this.layoutControlItem25.Location = new System.Drawing.Point(1061, 90);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem25.Size = new System.Drawing.Size(332, 30);
+ this.layoutControlItem25.Size = new System.Drawing.Size(354, 30);
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(990, 150);
+ this.layoutControlItem26.Location = new System.Drawing.Point(1061, 150);
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(332, 61);
+ this.layoutControlItem26.Size = new System.Drawing.Size(354, 61);
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(990, 120);
+ this.layoutControlItem29.Location = new System.Drawing.Point(1061, 120);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem29.Size = new System.Drawing.Size(332, 30);
+ this.layoutControlItem29.Size = new System.Drawing.Size(354, 30);
this.layoutControlItem29.Text = "鎸戦�夋暟閲�";
this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1457,7 +1458,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(1342, 445);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1435, 445);
this.xtraTabControl2.TabIndex = 3;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1468,7 +1469,7 @@
this.tabMxPage1.Controls.Add(this.splitMx2);
this.tabMxPage1.Controls.Add(this.panMsg);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1340, 413);
+ this.tabMxPage1.Size = new System.Drawing.Size(1433, 413);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitMx2
@@ -1487,7 +1488,7 @@
//
this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
this.splitMx2.Panel2.Text = "Panel2";
- this.splitMx2.Size = new System.Drawing.Size(1340, 366);
+ this.splitMx2.Size = new System.Drawing.Size(1433, 366);
this.splitMx2.SplitterPosition = 287;
this.splitMx2.TabIndex = 3;
//
@@ -1497,7 +1498,7 @@
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(1340, 287);
+ this.gcMx1.Size = new System.Drawing.Size(1433, 287);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1524,7 +1525,8 @@
this.gvMx1fngQty,
this.gvMx1sampleSizeNo,
this.gvMx1fcheckLevel,
- this.gvMx1facLevel});
+ this.gvMx1facLevel,
+ this.gridColumn7});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1736,6 +1738,14 @@
this.gvMx1facLevel.VisibleIndex = 14;
this.gvMx1facLevel.Width = 200;
//
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鏍锋湰鏁�";
+ this.gridColumn7.FieldName = "ybsl";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Width = 94;
+ //
// splitYangLi
//
this.splitYangLi.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1751,7 +1761,7 @@
//
this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
this.splitYangLi.Panel2.Text = "Panel2";
- this.splitYangLi.Size = new System.Drawing.Size(1340, 67);
+ this.splitYangLi.Size = new System.Drawing.Size(1433, 67);
this.splitYangLi.SplitterPosition = 676;
this.splitYangLi.TabIndex = 4;
//
@@ -1859,7 +1869,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(652, 67);
+ this.groupControl2.Size = new System.Drawing.Size(745, 67);
this.groupControl2.TabIndex = 4;
this.groupControl2.Text = "鏍锋湰缁撴灉";
//
@@ -1869,7 +1879,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(648, 37);
+ this.gcMx3.Size = new System.Drawing.Size(741, 37);
this.gcMx3.TabIndex = 0;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -1970,7 +1980,7 @@
this.panMsg.Dock = System.Windows.Forms.DockStyle.Top;
this.panMsg.Location = new System.Drawing.Point(0, 0);
this.panMsg.Name = "panMsg";
- this.panMsg.Size = new System.Drawing.Size(1340, 47);
+ this.panMsg.Size = new System.Drawing.Size(1433, 47);
this.panMsg.TabIndex = 1;
//
// layoutMxMsg
@@ -1983,14 +1993,14 @@
this.layoutMxMsg.Name = "layoutMxMsg";
this.layoutMxMsg.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(348, 385, 812, 500);
this.layoutMxMsg.Root = this.layoutControlGroup1;
- this.layoutMxMsg.Size = new System.Drawing.Size(1336, 43);
+ this.layoutMxMsg.Size = new System.Drawing.Size(1429, 43);
this.layoutMxMsg.TabIndex = 0;
this.layoutMxMsg.Text = "layoutControl1";
//
// btnIpt
//
this.btnIpt.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.calculatenow_32x32;
- this.btnIpt.Location = new System.Drawing.Point(1228, 2);
+ this.btnIpt.Location = new System.Drawing.Point(1321, 2);
this.btnIpt.Name = "btnIpt";
this.btnIpt.Size = new System.Drawing.Size(106, 36);
this.btnIpt.StyleController = this.layoutMxMsg;
@@ -2000,7 +2010,7 @@
// btnLoad
//
this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.refresh_32x321;
- this.btnLoad.Location = new System.Drawing.Point(1062, 2);
+ this.btnLoad.Location = new System.Drawing.Point(1155, 2);
this.btnLoad.Name = "btnLoad";
this.btnLoad.Size = new System.Drawing.Size(162, 36);
this.btnLoad.StyleController = this.layoutMxMsg;
@@ -2013,7 +2023,7 @@
this.txtJianYan.Name = "txtJianYan";
this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
this.txtJianYan.Properties.Appearance.Options.UseFont = true;
- this.txtJianYan.Size = new System.Drawing.Size(594, 36);
+ this.txtJianYan.Size = new System.Drawing.Size(656, 36);
this.txtJianYan.StyleController = this.layoutMxMsg;
this.txtJianYan.TabIndex = 2;
//
@@ -2027,25 +2037,25 @@
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});
+ rowDefinition16.Height = 100D;
+ rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition8});
+ rowDefinition16});
this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1429, 43);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem11
@@ -2055,7 +2065,7 @@
this.layoutControlItem11.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(817, 43);
+ this.layoutControlItem11.Size = new System.Drawing.Size(879, 43);
this.layoutControlItem11.Text = "褰曞叆妫�楠岀粨鏋滐紙OK-19,NG-19锛�";
this.layoutControlItem11.TextSize = new System.Drawing.Size(207, 18);
//
@@ -2063,7 +2073,7 @@
//
this.layoutControlItem20.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
this.layoutControlItem20.Control = this.btnIpt;
- this.layoutControlItem20.Location = new System.Drawing.Point(1226, 0);
+ this.layoutControlItem20.Location = new System.Drawing.Point(1319, 0);
this.layoutControlItem20.MaxSize = new System.Drawing.Size(110, 40);
this.layoutControlItem20.MinSize = new System.Drawing.Size(110, 40);
this.layoutControlItem20.Name = "layoutControlItem20";
@@ -2078,12 +2088,12 @@
//
this.layoutControlItem19.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
this.layoutControlItem19.Control = this.btnLoad;
- this.layoutControlItem19.Location = new System.Drawing.Point(817, 0);
+ this.layoutControlItem19.Location = new System.Drawing.Point(879, 0);
this.layoutControlItem19.MaxSize = new System.Drawing.Size(166, 40);
this.layoutControlItem19.MinSize = new System.Drawing.Size(166, 40);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(409, 43);
+ this.layoutControlItem19.Size = new System.Drawing.Size(440, 43);
this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem19.Text = "閲嶆柊鍔犺浇";
this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
@@ -2143,7 +2153,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1344, 800);
+ this.ClientSize = new System.Drawing.Size(1437, 800);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
@@ -2414,5 +2424,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index d03e86e..b2d18c1 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -48,6 +48,8 @@
txt_ftype.Text = strType;
if (strType == QcSeason.iqc.ToString())
dfValue = 5;
+ if (strType == QcSeason.fqc.ToString())
+ dfValue = 999;
//濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
if (strType != QcSeason.ipqc宸℃.ToString())
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 192946b..1cc3ed5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -1407,7 +1407,7 @@
//
// gridColumn20
//
- this.gridColumn20.Caption = "绱Н浠撻��";
+ this.gridColumn20.Caption = "绱浠撻��";
this.gridColumn20.FieldName = "ljct";
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index d4e74a3..e850eef 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -78,32 +78,36 @@
string rowGuid = lbMxGuid.Text.Trim();
SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "閲囪喘鍏ュ簱");
string strCodeList = "";
+ string strAction = "";
frm.UpdateParent += (ss, ee) =>
{
strCodeList = ee.StringSingle;
+ strAction = ee.Data;
};
frm.ShowDialog();
if (string.IsNullOrEmpty(strCodeList))
return;
- try
- {
- string rptParameter = "rpt_Arrival{"
- + "100"//閲嶆墦閮芥槸浼�100锛�
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + strCodeList
- + "}";
- using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ if (strAction == "print") {
+ try
{
- rpt.ShowDialog();
+ string rptParameter = "rpt_Arrival{"
+ + "100"//閲嶆墦閮芥槸浼�100锛�
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
}
- frm.Close();
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError(ex.Message);
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
}
};
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
@@ -116,7 +120,6 @@
{
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
- this.ucBtnPrint1.SetPrintButton(false);
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
diff --git a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.Designer.cs
index 4403b3e..1172579 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.Designer.cs
@@ -250,7 +250,6 @@
this.btnDelete.Size = new System.Drawing.Size(94, 39);
this.btnDelete.TabIndex = 5;
this.btnDelete.Text = "鎵归噺鍒犻櫎";
- this.btnDelete.Visible = false;
//
// SelectDeleteBar
//
diff --git a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
index cfc26e9..23beeb0 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
@@ -37,8 +37,10 @@
this.Text = "鎵归噺鎿嶄綔銆�" + this.aboutType + "銆�,銆�" + this.aboutGuid + "銆�";
switch (aboutType)
{
+ case "閲囪喘鍏ュ簱":
+ btnDelete.Visible = false;
+ break;
case "鍚庣洊鐮�":
- btnDelete.Visible = true;
colT1.Caption = "缁戝畾鎵樻澘鐮�";
colT2.Caption = "缁戝畾杩芥函鐮�";
break;
@@ -75,7 +77,7 @@
}
if (sb.Length <= 0)
{
- MsgHelper.Warning("璇峰嬀閫変綘瑕佸垹闄ょ殑鏉＄爜锛�");
+ MsgHelper.ShowError("璇峰嬀閫変綘瑕佸垹闄ょ殑鏉＄爜锛�");
return;
}
var _obj = new
@@ -106,7 +108,7 @@
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
return;
}
- UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = strMsg }); Close();
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = strMsg, Data="delete" }); Close();
};
btnPrint.Click += (s, e) =>
{
@@ -129,11 +131,11 @@
}
if (sb.Length <= 0)
{
- MsgHelper.Warning("璇峰嬀閫変綘瑕佹墦鍗扮殑鏉＄爜锛�");
+ MsgHelper.ShowError("璇峰嬀閫変綘瑕佹墦鍗扮殑鏉＄爜锛�");
return;
}
- UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = sb.ToString() }); Close();
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = sb.ToString() ,Data = "print" }); Close();
};
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 0062ab2..332e827 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -254,7 +254,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
};
frm.ShowDialog();
--
Gitblit v1.9.3