From cc808388afff145b90b8fd27e7a60f707d5acab7 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 17 六月 2025 15:47:09 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 480 ++++------------- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 137 ----- DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs | 113 ++++ DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs | 832 ++++++++++++++++++++++++++++-- 4 files changed, 995 insertions(+), 567 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs index c1a86a3..87c673a 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs @@ -41,24 +41,15 @@ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -123,21 +114,14 @@ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.split99 = new DevExpress.XtraEditors.SplitContainerControl(); this.layout99 = new DevExpress.XtraLayout.LayoutControl(); - this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); - this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit(); - this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); - this.radOut = new DevExpress.XtraEditors.RadioGroup(); - this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint(); this.lbMxGuid = new DevExpress.XtraEditors.LabelControl(); this.txtWlid = new DevExpress.XtraEditors.TextEdit(); - this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit(); this.txtWlmc = new DevExpress.XtraEditors.TextEdit(); this.txtWlgg = new DevExpress.XtraEditors.TextEdit(); this.txt_kQty = new DevExpress.XtraEditors.TextEdit(); @@ -147,14 +131,10 @@ this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gvMx1tlid = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -189,12 +169,8 @@ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); - this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); - this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -247,6 +223,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -258,16 +236,7 @@ this.split99.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit(); this.layout99.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); - this.layoutControl1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit(); @@ -277,24 +246,17 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); this.xtraTabPage3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -686,7 +648,7 @@ // btnSelect // this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16; - this.btnSelect.Location = new System.Drawing.Point(12, 131); + this.btnSelect.Location = new System.Drawing.Point(12, 136); this.btnSelect.Name = "btnSelect"; this.btnSelect.Size = new System.Drawing.Size(96, 27); this.btnSelect.StyleController = this.layoutMx1; @@ -696,7 +658,7 @@ // txt_tbl023 // this.txt_tbl023.IsReadly = false; - this.txt_tbl023.Location = new System.Drawing.Point(84, 38); + this.txt_tbl023.Location = new System.Drawing.Point(84, 43); this.txt_tbl023.Name = "txt_tbl023"; this.txt_tbl023.Size = new System.Drawing.Size(195, 24); this.txt_tbl023.TabIndex = 462; @@ -704,7 +666,7 @@ // txt_tbl005 // this.txt_tbl005.EditValue = "-璇烽�夋嫨-"; - this.txt_tbl005.Location = new System.Drawing.Point(84, 100); + this.txt_tbl005.Location = new System.Drawing.Point(84, 105); this.txt_tbl005.Name = "txt_tbl005"; this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -720,7 +682,7 @@ // // txt_tbl006 // - this.txt_tbl006.Location = new System.Drawing.Point(355, 100); + this.txt_tbl006.Location = new System.Drawing.Point(355, 105); this.txt_tbl006.Name = "txt_tbl006"; this.txt_tbl006.Properties.Appearance.Options.UseFont = true; this.txt_tbl006.Size = new System.Drawing.Size(466, 24); @@ -731,14 +693,14 @@ // this.txt_tbl002.category = null; this.txt_tbl002.IsReadly = false; - this.txt_tbl002.Location = new System.Drawing.Point(84, 69); + this.txt_tbl002.Location = new System.Drawing.Point(84, 74); this.txt_tbl002.Name = "txt_tbl002"; this.txt_tbl002.Size = new System.Drawing.Size(195, 24); this.txt_tbl002.TabIndex = 458; // // txt_workName // - this.txt_workName.Location = new System.Drawing.Point(355, 38); + this.txt_workName.Location = new System.Drawing.Point(355, 43); this.txt_workName.Name = "txt_workName"; this.txt_workName.Properties.Appearance.Options.UseFont = true; this.txt_workName.Size = new System.Drawing.Size(195, 24); @@ -748,7 +710,7 @@ // // txt_tbl012 // - this.txt_tbl012.Location = new System.Drawing.Point(897, 38); + this.txt_tbl012.Location = new System.Drawing.Point(897, 43); this.txt_tbl012.Name = "txt_tbl012"; this.txt_tbl012.Properties.Appearance.Options.UseFont = true; this.txt_tbl012.Size = new System.Drawing.Size(196, 24); @@ -758,7 +720,7 @@ // // txt_billNo // - this.txt_billNo.Location = new System.Drawing.Point(84, 7); + this.txt_billNo.Location = new System.Drawing.Point(84, 12); this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Options.UseFont = true; this.txt_billNo.Size = new System.Drawing.Size(195, 24); @@ -768,7 +730,7 @@ // // txt_rwd // - this.txt_rwd.Location = new System.Drawing.Point(355, 7); + this.txt_rwd.Location = new System.Drawing.Point(355, 12); this.txt_rwd.Name = "txt_rwd"; this.txt_rwd.Properties.Appearance.Options.UseFont = true; this.txt_rwd.Size = new System.Drawing.Size(195, 24); @@ -778,7 +740,7 @@ // // txt_tbl011 // - this.txt_tbl011.Location = new System.Drawing.Point(897, 7); + this.txt_tbl011.Location = new System.Drawing.Point(897, 12); this.txt_tbl011.Name = "txt_tbl011"; this.txt_tbl011.Properties.Appearance.Options.UseFont = true; this.txt_tbl011.Size = new System.Drawing.Size(196, 24); @@ -788,7 +750,7 @@ // // txt_itemName // - this.txt_itemName.Location = new System.Drawing.Point(355, 69); + this.txt_itemName.Location = new System.Drawing.Point(355, 74); this.txt_itemName.Name = "txt_itemName"; this.txt_itemName.Properties.Appearance.Options.UseFont = true; this.txt_itemName.Size = new System.Drawing.Size(195, 24); @@ -798,7 +760,7 @@ // // txt_tbl013 // - this.txt_tbl013.Location = new System.Drawing.Point(825, 69); + this.txt_tbl013.Location = new System.Drawing.Point(825, 74); this.txt_tbl013.Name = "txt_tbl013"; this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��"; this.txt_tbl013.RightToLeft = System.Windows.Forms.RightToLeft.No; @@ -809,7 +771,7 @@ // // txt_tbl009 // - this.txt_tbl009.Location = new System.Drawing.Point(626, 7); + this.txt_tbl009.Location = new System.Drawing.Point(626, 12); this.txt_tbl009.Name = "txt_tbl009"; this.txt_tbl009.Size = new System.Drawing.Size(195, 24); this.txt_tbl009.StyleController = this.layoutMx1; @@ -818,7 +780,7 @@ // // txt_tbl010 // - this.txt_tbl010.Location = new System.Drawing.Point(626, 38); + this.txt_tbl010.Location = new System.Drawing.Point(626, 43); this.txt_tbl010.Name = "txt_tbl010"; this.txt_tbl010.Size = new System.Drawing.Size(195, 24); this.txt_tbl010.StyleController = this.layoutMx1; @@ -827,7 +789,7 @@ // // txt_tbl020 // - this.txt_tbl020.Location = new System.Drawing.Point(825, 100); + this.txt_tbl020.Location = new System.Drawing.Point(825, 105); this.txt_tbl020.Name = "txt_tbl020"; this.txt_tbl020.Properties.Caption = "瀹岀粨鏍囪瘑"; this.txt_tbl020.Size = new System.Drawing.Size(268, 24); @@ -837,7 +799,7 @@ // // txt_itemNo // - this.txt_itemNo.Location = new System.Drawing.Point(626, 69); + this.txt_itemNo.Location = new System.Drawing.Point(626, 74); this.txt_itemNo.Name = "txt_itemNo"; this.txt_itemNo.Size = new System.Drawing.Size(195, 24); this.txt_itemNo.StyleController = this.layoutMx1; @@ -855,7 +817,7 @@ // // txt_daa014 // - this.txt_daa014.Location = new System.Drawing.Point(355, 131); + this.txt_daa014.Location = new System.Drawing.Point(355, 136); this.txt_daa014.Name = "txt_daa014"; this.txt_daa014.Size = new System.Drawing.Size(195, 24); this.txt_daa014.StyleController = this.layoutMx1; @@ -1105,6 +1067,27 @@ this.layoutControlItem6.Text = "鐢熶骇杞﹂棿"; this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txt_rwd; + this.layoutControlItem2.Location = new System.Drawing.Point(271, 0); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem2.Size = new System.Drawing.Size(271, 31); + this.layoutControlItem2.Text = "浠诲姟鍗曞彿"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); + // + // lab_daa014 + // + this.lab_daa014.Control = this.txt_daa014; + this.lab_daa014.Location = new System.Drawing.Point(271, 124); + this.lab_daa014.Name = "lab_daa014"; + this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 1; + this.lab_daa014.OptionsTableLayoutItem.RowIndex = 4; + this.lab_daa014.Size = new System.Drawing.Size(271, 31); + this.lab_daa014.Text = "鎶曟枡鍗曞彿"; + this.lab_daa014.TextSize = new System.Drawing.Size(60, 18); + // // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1142,17 +1125,13 @@ this.split99.Panel2.Text = "Panel2"; this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split99.Size = new System.Drawing.Size(1124, 378); - this.split99.SplitterPosition = 114; + this.split99.SplitterPosition = 73; this.split99.TabIndex = 2; // // layout99 // - this.layout99.Controls.Add(this.layoutControl1); - this.layout99.Controls.Add(this.radOut); - this.layout99.Controls.Add(this.ucBtnPrint1); this.layout99.Controls.Add(this.lbMxGuid); this.layout99.Controls.Add(this.txtWlid); - this.layout99.Controls.Add(this.txt_psnQty_1); this.layout99.Controls.Add(this.txtWlmc); this.layout99.Controls.Add(this.txtWlgg); this.layout99.Controls.Add(this.txt_kQty); @@ -1165,106 +1144,9 @@ this.layout99.Name = "layout99"; this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(237, 453, 812, 500); this.layout99.Root = this.layoutControlGroup1; - this.layout99.Size = new System.Drawing.Size(1124, 114); + this.layout99.Size = new System.Drawing.Size(1124, 73); this.layout99.TabIndex = 0; this.layout99.Text = "layoutControl1"; - // - // layoutControl1 - // - this.layoutControl1.Controls.Add(this.txt_iCount_1); - this.layoutControl1.Controls.Add(this.txt_yuliang_1); - this.layoutControl1.Location = new System.Drawing.Point(692, 82); - this.layoutControl1.Name = "layoutControl1"; - this.layoutControl1.Root = this.layoutControlGroup2; - this.layoutControl1.Size = new System.Drawing.Size(336, 31); - this.layoutControl1.TabIndex = 475; - this.layoutControl1.Text = "layoutControl1"; - // - // txt_iCount_1 - // - this.txt_iCount_1.Location = new System.Drawing.Point(104, 2); - this.txt_iCount_1.Name = "txt_iCount_1"; - this.txt_iCount_1.Properties.Appearance.Options.UseFont = true; - this.txt_iCount_1.Properties.ReadOnly = true; - this.txt_iCount_1.Size = new System.Drawing.Size(62, 24); - this.txt_iCount_1.StyleController = this.layoutControl1; - this.txt_iCount_1.TabIndex = 228; - // - // txt_yuliang_1 - // - this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2); - this.txt_yuliang_1.Name = "txt_yuliang_1"; - this.txt_yuliang_1.Properties.ReadOnly = true; - this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24); - this.txt_yuliang_1.StyleController = this.layoutControl1; - this.txt_yuliang_1.TabIndex = 229; - // - // layoutControlGroup2 - // - this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - this.layoutControlGroup2.GroupBordersVisible = false; - this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem30, - this.layoutControlItem31}); - this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; - this.layoutControlGroup2.Name = "layoutControlGroup2"; - columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition5.Width = 100D; - columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition6.Width = 100D; - this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition5, - columnDefinition6}); - rowDefinition6.Height = 100D; - rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; - this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition6}); - this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup2.Size = new System.Drawing.Size(336, 31); - this.layoutControlGroup2.TextVisible = false; - // - // layoutControlItem30 - // - this.layoutControlItem30.Control = this.txt_iCount_1; - this.layoutControlItem30.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem30.Name = "layoutControlItem30"; - this.layoutControlItem30.Size = new System.Drawing.Size(168, 31); - this.layoutControlItem30.Text = "鎵撳嵃鏁村紶鏁板��"; - this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem31 - // - this.layoutControlItem31.Control = this.txt_yuliang_1; - this.layoutControlItem31.Location = new System.Drawing.Point(168, 0); - this.layoutControlItem31.Name = "layoutControlItem31"; - this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem31.Size = new System.Drawing.Size(168, 31); - this.layoutControlItem31.Text = "鎵撳嵃浣欐暟"; - this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18); - // - // radOut - // - this.radOut.Location = new System.Drawing.Point(1033, 10); - this.radOut.Margin = new System.Windows.Forms.Padding(0); - this.radOut.Name = "radOut"; - this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; - this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { - new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"), - new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"), - new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")}); - this.radOut.Size = new System.Drawing.Size(227, 28); - this.radOut.StyleController = this.layout99; - this.radOut.TabIndex = 474; - // - // ucBtnPrint1 - // - this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 47); - this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); - this.ucBtnPrint1.Name = "ucBtnPrint1"; - this.ucBtnPrint1.rptParameter = null; - this.ucBtnPrint1.Size = new System.Drawing.Size(336, 31); - this.ucBtnPrint1.TabIndex = 231; // // lbMxGuid // @@ -1278,72 +1160,63 @@ // // txtWlid // - this.txtWlid.Location = new System.Drawing.Point(114, 12); + this.txtWlid.Location = new System.Drawing.Point(99, 12); this.txtWlid.Name = "txtWlid"; this.txtWlid.Properties.Appearance.Options.UseFont = true; this.txtWlid.Properties.ReadOnly = true; - this.txtWlid.Size = new System.Drawing.Size(234, 24); + this.txtWlid.Size = new System.Drawing.Size(179, 24); this.txtWlid.StyleController = this.layout99; this.txtWlid.TabIndex = 214; // - // txt_psnQty_1 - // - this.txt_psnQty_1.Location = new System.Drawing.Point(794, 47); - this.txt_psnQty_1.Name = "txt_psnQty_1"; - this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; - this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24); - this.txt_psnQty_1.StyleController = this.layout99; - this.txt_psnQty_1.TabIndex = 226; - // // txtWlmc // - this.txtWlmc.Location = new System.Drawing.Point(114, 47); + this.txtWlmc.Location = new System.Drawing.Point(99, 40); this.txtWlmc.Name = "txtWlmc"; this.txtWlmc.Properties.Appearance.Options.UseFont = true; this.txtWlmc.Properties.ReadOnly = true; - this.txtWlmc.Size = new System.Drawing.Size(234, 24); + this.txtWlmc.Size = new System.Drawing.Size(179, 24); this.txtWlmc.StyleController = this.layout99; this.txtWlmc.TabIndex = 216; // // txtWlgg // - this.txtWlgg.Location = new System.Drawing.Point(114, 82); + this.txtWlgg.Location = new System.Drawing.Point(369, 40); this.txtWlgg.Name = "txtWlgg"; this.txtWlgg.Properties.Appearance.Options.UseFont = true; this.txtWlgg.Properties.ReadOnly = true; - this.txtWlgg.Size = new System.Drawing.Size(234, 24); + this.txtWlgg.Size = new System.Drawing.Size(180, 24); this.txtWlgg.StyleController = this.layout99; this.txtWlgg.TabIndex = 218; // // txt_kQty // - this.txt_kQty.Location = new System.Drawing.Point(794, 12); + this.txt_kQty.Location = new System.Drawing.Point(640, 12); this.txt_kQty.Name = "txt_kQty"; this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_kQty.Properties.Appearance.Options.UseFont = true; this.txt_kQty.Properties.Appearance.Options.UseForeColor = true; this.txt_kQty.Properties.ReadOnly = true; - this.txt_kQty.Size = new System.Drawing.Size(234, 24); + this.txt_kQty.Size = new System.Drawing.Size(180, 24); this.txt_kQty.StyleController = this.layout99; this.txt_kQty.TabIndex = 224; // // txtQuantity // - this.txtQuantity.Location = new System.Drawing.Point(454, 12); + this.txtQuantity.Location = new System.Drawing.Point(369, 12); this.txtQuantity.Name = "txtQuantity"; this.txtQuantity.Properties.Appearance.Options.UseFont = true; this.txtQuantity.Properties.ReadOnly = true; - this.txtQuantity.Size = new System.Drawing.Size(234, 24); + this.txtQuantity.Size = new System.Drawing.Size(180, 24); this.txtQuantity.StyleController = this.layout99; this.txtQuantity.TabIndex = 220; // // txtYdy // - this.txtYdy.Location = new System.Drawing.Point(454, 47); + this.txtYdy.Location = new System.Drawing.Point(911, 12); this.txtYdy.Name = "txtYdy"; this.txtYdy.Properties.Appearance.Options.UseFont = true; this.txtYdy.Properties.ReadOnly = true; - this.txtYdy.Size = new System.Drawing.Size(234, 24); + this.txtYdy.Size = new System.Drawing.Size(180, 24); this.txtYdy.StyleController = this.layout99; this.txtYdy.TabIndex = 222; // @@ -1366,40 +1239,33 @@ this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem19, this.layoutControlItem20, - this.layoutControlItem21, this.layoutControlItem22, - this.layoutControlItem23, this.layoutControlItem24, - this.layoutControlItem25, - this.layoutControlItem27, - this.layoutControlItem28, - this.layoutControlItem29}); + this.layoutControlItem23, + this.layoutControlItem21}); 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.Percent; columnDefinition8.Width = 100D; - columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition9.Width = 100D; - columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition10.Width = 100D; this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition5, + columnDefinition6, columnDefinition7, - columnDefinition8, - columnDefinition9, - columnDefinition10}); + columnDefinition8}); + rowDefinition6.Height = 100D; + rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition7.Height = 100D; rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition8.Height = 100D; - rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition9.Height = 100D; - rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition7, - rowDefinition8, - rowDefinition9}); - this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 125); + rowDefinition6, + rowDefinition7}); + this.layoutControlGroup1.Size = new System.Drawing.Size(1103, 76); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem19 @@ -1407,110 +1273,60 @@ this.layoutControlItem19.Control = this.txtWlid; this.layoutControlItem19.Location = new System.Drawing.Point(0, 0); this.layoutControlItem19.Name = "layoutControlItem19"; - this.layoutControlItem19.Size = new System.Drawing.Size(340, 35); + this.layoutControlItem19.Size = new System.Drawing.Size(270, 28); this.layoutControlItem19.Text = "鐗╂枡缂栧彿"; - this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem20 // this.layoutControlItem20.Control = this.txtWlmc; - this.layoutControlItem20.Location = new System.Drawing.Point(0, 35); + this.layoutControlItem20.Location = new System.Drawing.Point(0, 28); this.layoutControlItem20.Name = "layoutControlItem20"; this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem20.Size = new System.Drawing.Size(340, 35); + this.layoutControlItem20.Size = new System.Drawing.Size(270, 28); this.layoutControlItem20.Text = "鐗╂枡鍚嶇О"; - this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem21 - // - this.layoutControlItem21.Control = this.txtWlgg; - this.layoutControlItem21.Location = new System.Drawing.Point(0, 70); - this.layoutControlItem21.Name = "layoutControlItem21"; - this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem21.Size = new System.Drawing.Size(340, 35); - this.layoutControlItem21.Text = "鐗╂枡瑙勬牸"; - this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem22 // this.layoutControlItem22.Control = this.txtQuantity; - this.layoutControlItem22.Location = new System.Drawing.Point(340, 0); + this.layoutControlItem22.Location = new System.Drawing.Point(270, 0); this.layoutControlItem22.Name = "layoutControlItem22"; this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem22.Size = new System.Drawing.Size(340, 35); + this.layoutControlItem22.Size = new System.Drawing.Size(271, 28); this.layoutControlItem22.Text = "鐢宠鎬婚噺"; - this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem23 - // - this.layoutControlItem23.Control = this.txtYdy; - this.layoutControlItem23.Location = new System.Drawing.Point(340, 35); - this.layoutControlItem23.Name = "layoutControlItem23"; - this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem23.Size = new System.Drawing.Size(340, 35); - this.layoutControlItem23.Text = "宸叉墦鍗版�婚噺"; - this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem24 // this.layoutControlItem24.Control = this.txt_kQty; - this.layoutControlItem24.Location = new System.Drawing.Point(680, 0); + this.layoutControlItem24.Location = new System.Drawing.Point(541, 0); this.layoutControlItem24.Name = "layoutControlItem24"; this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem24.Size = new System.Drawing.Size(340, 35); + this.layoutControlItem24.Size = new System.Drawing.Size(271, 28); this.layoutControlItem24.Text = "鍙墦鍗版�绘暟"; - this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18); // - // layoutControlItem25 + // layoutControlItem23 // - this.layoutControlItem25.Control = this.txt_psnQty_1; - this.layoutControlItem25.Location = new System.Drawing.Point(680, 35); - this.layoutControlItem25.Name = "layoutControlItem25"; - this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem25.Size = new System.Drawing.Size(340, 35); - this.layoutControlItem25.Text = "姣忓紶鏉$爜鏁伴噺"; - this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem23.Control = this.txtYdy; + this.layoutControlItem23.Location = new System.Drawing.Point(812, 0); + this.layoutControlItem23.Name = "layoutControlItem23"; + this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem23.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem23.Text = "宸叉墦鍗版�婚噺"; + this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18); // - // layoutControlItem27 + // layoutControlItem21 // - this.layoutControlItem27.Control = this.ucBtnPrint1; - this.layoutControlItem27.Location = new System.Drawing.Point(1020, 35); - this.layoutControlItem27.Name = "layoutControlItem27"; - this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem27.Size = new System.Drawing.Size(340, 35); - this.layoutControlItem27.Text = "鎵撳嵃鎸夐挳"; - this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem27.TextVisible = false; - // - // layoutControlItem28 - // - this.layoutControlItem28.Control = this.radOut; - this.layoutControlItem28.Location = new System.Drawing.Point(1020, 0); - this.layoutControlItem28.MaxSize = new System.Drawing.Size(230, 28); - this.layoutControlItem28.MinSize = new System.Drawing.Size(230, 28); - this.layoutControlItem28.Name = "layoutControlItem28"; - this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem28.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0); - this.layoutControlItem28.Size = new System.Drawing.Size(340, 35); - this.layoutControlItem28.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem28.Text = "鑷姩璁$畻"; - this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem28.TextVisible = false; - // - // layoutControlItem29 - // - this.layoutControlItem29.Control = this.layoutControl1; - this.layoutControlItem29.Location = new System.Drawing.Point(680, 70); - this.layoutControlItem29.Name = "layoutControlItem29"; - this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem29.Size = new System.Drawing.Size(340, 35); - this.layoutControlItem29.Text = "鑷姩璁$畻"; - this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem29.TextVisible = false; + this.layoutControlItem21.Control = this.txtWlgg; + this.layoutControlItem21.Location = new System.Drawing.Point(270, 28); + this.layoutControlItem21.Name = "layoutControlItem21"; + this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem21.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem21.Text = "鐗╂枡瑙勬牸"; + this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18); // // gcMx1 // @@ -1520,7 +1336,7 @@ this.gcMx1.Name = "gcMx1"; this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1124, 252); + this.gcMx1.Size = new System.Drawing.Size(1124, 293); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1745,8 +1561,6 @@ this.gcMx2.Location = new System.Drawing.Point(0, 0); this.gcMx2.MainView = this.gvMx2; this.gcMx2.Name = "gcMx2"; - this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { - this.repositoryItemButtonEdit2}); this.gcMx2.Size = new System.Drawing.Size(1124, 378); this.gcMx2.TabIndex = 1; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -1768,8 +1582,7 @@ this.gvMx1lotDate, this.gridColumn14, this.gridColumn17, - this.gridColumn16, - this.gvBtnAlawys}); + this.gridColumn16}); this.gvMx2.GridControl = this.gcMx2; this.gvMx2.Name = "gvMx2"; this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -1914,27 +1727,6 @@ this.gridColumn16.VisibleIndex = 11; this.gridColumn16.Width = 94; // - // gvBtnAlawys - // - this.gvBtnAlawys.Caption = "绉诲嚭"; - this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2; - this.gvBtnAlawys.MinWidth = 25; - this.gvBtnAlawys.Name = "gvBtnAlawys"; - this.gvBtnAlawys.Visible = true; - this.gvBtnAlawys.VisibleIndex = 12; - this.gvBtnAlawys.Width = 94; - // - // repositoryItemButtonEdit2 - // - this.repositoryItemButtonEdit2.AutoHeight = false; - editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; - this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); - this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2"; - this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; - this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick); - // // picCheckBox // this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; @@ -1945,27 +1737,6 @@ this.picCheckBox.TabIndex = 5; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.txt_rwd; - this.layoutControlItem2.Location = new System.Drawing.Point(271, 0); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(271, 31); - this.layoutControlItem2.Text = "浠诲姟鍗曞彿"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); - // - // lab_daa014 - // - this.lab_daa014.Control = this.txt_daa014; - this.lab_daa014.Location = new System.Drawing.Point(271, 124); - this.lab_daa014.Name = "lab_daa014"; - this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 1; - this.lab_daa014.OptionsTableLayoutItem.RowIndex = 4; - this.lab_daa014.Size = new System.Drawing.Size(271, 31); - this.lab_daa014.Text = "鎶曟枡鍗曞彿"; - this.lab_daa014.TextSize = new System.Drawing.Size(60, 18); // // Frm_MesItemTbl // @@ -2029,6 +1800,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -2040,16 +1813,7 @@ this.split99.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit(); this.layout99.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); - this.layoutControl1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit(); @@ -2059,24 +1823,17 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); this.xtraTabPage3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit(); this.ResumeLayout(false); } @@ -2150,10 +1907,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; - private UserControl.UcBtnPrint ucBtnPrint1; private DevExpress.XtraEditors.LabelControl lbMxGuid; - private DevExpress.XtraEditors.TextEdit txt_iCount_1; - private DevExpress.XtraEditors.TextEdit txt_psnQty_1; private DevExpress.XtraEditors.TextEdit txt_kQty; private DevExpress.XtraEditors.TextEdit txtYdy; private DevExpress.XtraEditors.TextEdit txtQuantity; @@ -2172,8 +1926,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy; private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate; - private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys; - private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; private DevExpress.XtraEditors.TextEdit txt_id; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; @@ -2185,26 +1937,14 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; private DevExpress.Utils.ToolTipController tips; - private DevExpress.XtraEditors.RadioGroup radOut; private DevExpress.XtraEditors.SplitContainerControl split99; private DevExpress.XtraLayout.LayoutControl layout99; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; - private DevExpress.XtraLayout.LayoutControl layoutControl1; - private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; - private DevExpress.XtraEditors.TextEdit txt_yuliang_1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31; private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; @@ -2217,5 +1957,7 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem lab_daa014; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs index 086d5d5..7e53765 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs @@ -107,52 +107,6 @@ frm.ShowDialog(); }; gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged; - this.ucBtnPrint1.btnDesignClick += (s, e) => - { - ucBtnPrint1.rptParameter = "rpt_SCTL{}"; - }; - this.ucBtnPrint1.btnReportClick += (s, e) => - { - ucBtnPrint1.guidKey = ""; - string rowGuid = lbMxGuid.Text.Trim(); - ucBtnPrint1.guidKey = rowGuid; - if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim())) - { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); - txt_iCount_1.Focus(); - this.ucBtnPrint1.rptParameter = "return false"; - return; - } - if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim())) - { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�"); - txt_psnQty_1.Focus(); - this.ucBtnPrint1.rptParameter = "return false"; - return; - } - if (lbMxGuid.Text.Trim().Length < 10) - { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�"); - this.ucBtnPrint1.rptParameter = "return false"; - return; - } - this.ucBtnPrint1.rptParameter = "rpt_SCTL{" + lbMxGuid.Text.Trim() - + "," + "" - + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim()) - + "," + txt_iCount_1.Text.Trim() - + "," + txt_psnQty_1.Text.Trim() - + "}"; - }; - - //鑷姩璁$畻鎵撳嵃閲� - txt_psnQty_1.TextChanged += (s, e) => - { - Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1); - }; - radOut.SelectedIndexChanged += (s, e) => - { - Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1); - }; } @@ -208,55 +162,7 @@ _filterList = e.FilterList; getPageList(1); } - private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e) - { - toolBarMenu1.guidKey = ""; - string rowGuid, rowName; - (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, - lbGuid, txt_billNo, gridView1); - toolBarMenu1.guidKey = rowGuid; - toolBarMenu1.rptParameter = "rpt_SCTL{}"; - } - private void ToolBarMenu1_btnReportClick(object sender, EventArgs e) - { - toolBarMenu1.guidKey = ""; - string rowGuid, rowName; - (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, - lbGuid, txt_billNo, gridView1); - toolBarMenu1.guidKey = rowGuid; - if (xtraTabControl1.SelectedTabPageIndex == 0) - { - getModel(rowGuid); - this.toolBarMenu1.rptParameter = "return false"; - return; - } - if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim())) - { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); - txt_iCount_1.Focus(); - this.toolBarMenu1.rptParameter = "return false"; - return; - } - if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim())) - { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�"); - txt_psnQty_1.Focus(); - this.toolBarMenu1.rptParameter = "return false"; - return; - } - if (lbMxGuid.Text.Trim().Length < 10) - { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�"); - this.toolBarMenu1.rptParameter = "return false"; - return; - } - this.toolBarMenu1.rptParameter = "rpt_SCTL{" + lbMxGuid.Text.Trim() - + "," + "" - + "," + "" - + "," + txt_iCount_1.Text.Trim() - + "," + txt_psnQty_1.Text.Trim() - + "}"; - } + /// <summary> /// 鎵瑰噯 /// </summary> @@ -676,46 +582,6 @@ } } - - /// <summary> - /// 绉诲嚭鏉$爜 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) - { - var rowhandle = gvMx2.FocusedRowHandle; - if (rowhandle < 0) - return; - if (e.Button.Index == 0) - { - var dr = gvMx2.GetDataRow(rowhandle); - var mxGuid = dr["guid"].ToString(); - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵")) - return; - var _obj = new - { - mxGuid = mxGuid, - inType = "dhtm" - }; - try - { - var strJson = UtilityHelper.HttpPost("", - "VArrivalBarcodeManager/DeleteBarcode", - JsonConvert.SerializeObject(_obj)); - var _rtn = UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) - { - if (_rtn.rtnCode > 0) getModel(lbGuid.Text); - } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); - } - catch (Exception ex) - { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } - } - } /// <summary> /// 宸ュ叿鏉′簨浠� /// </summary> @@ -816,7 +682,6 @@ txtQuantity.Text = row["tld005"].ToString();//鐢宠鎬婚噺 txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺 txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺 - txt_psnQty_1.Text = row["tld005"].ToString(); //榛樿姣忓紶鏉$爜鏁伴噺 } else { diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs index b2a9da6..32c6c47 100644 --- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs @@ -29,21 +29,36 @@ 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.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 rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition(); + 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.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); @@ -97,10 +112,12 @@ this.txt_guid = new DevExpress.XtraEditors.TextEdit(); this.txt_checkStates = new DevExpress.XtraEditors.TextEdit(); this.txt_freceQty = new DevExpress.XtraEditors.TextEdit(); + this.txt_aboutGuid = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -170,6 +187,47 @@ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); this.ucUpFileList1 = new Gs.DevApp.UserControl.UCUpFileList(); + this.tabMxPage3 = new DevExpress.XtraTab.XtraTabPage(); + this.split99 = new DevExpress.XtraEditors.SplitContainerControl(); + this.layout99 = new DevExpress.XtraLayout.LayoutControl(); + this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit(); + this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); + this.radOut = new DevExpress.XtraEditors.RadioGroup(); + this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint(); + this.lbMxGuid = new DevExpress.XtraEditors.LabelControl(); + this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit(); + this.txt_kQty = new DevExpress.XtraEditors.TextEdit(); + this.txtQuantity = new DevExpress.XtraEditors.TextEdit(); + this.txtYdy = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); + this.gcMx8 = new DevExpress.XtraGrid.GridControl(); + this.gvMx8 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -213,10 +271,12 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); @@ -268,6 +328,39 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); this.tabMxPage2.SuspendLayout(); + this.tabMxPage3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit(); + this.split99.Panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit(); + this.split99.Panel2.SuspendLayout(); + this.split99.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit(); + this.layout99.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); + this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(repositoryItemButtonEdit2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); @@ -725,12 +818,14 @@ this.layoutMx1.Controls.Add(this.txt_guid); this.layoutMx1.Controls.Add(this.txt_checkStates); this.layoutMx1.Controls.Add(this.txt_freceQty); + this.layoutMx1.Controls.Add(this.txt_aboutGuid); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem17, this.layoutControlItem7, this.layoutControlItem21, - this.layoutControlItem23}); + this.layoutControlItem23, + this.layoutControlItem36}); 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); @@ -926,6 +1021,14 @@ this.txt_freceQty.TabIndex = 810; this.txt_freceQty.Tag = "readonly"; // + // txt_aboutGuid + // + this.txt_aboutGuid.Location = new System.Drawing.Point(800, 124); + this.txt_aboutGuid.Name = "txt_aboutGuid"; + this.txt_aboutGuid.Size = new System.Drawing.Size(183, 24); + this.txt_aboutGuid.StyleController = this.layoutMx1; + this.txt_aboutGuid.TabIndex = 816; + // // layoutControlItem17 // this.layoutControlItem17.Control = this.lbGuid; @@ -970,6 +1073,17 @@ this.layoutControlItem23.Text = "鍒ゅ畾缁撴灉"; this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18); // + // layoutControlItem36 + // + this.layoutControlItem36.Control = this.txt_aboutGuid; + this.layoutControlItem36.Location = new System.Drawing.Point(650, 112); + this.layoutControlItem36.Name = "layoutControlItem36"; + this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem36.Size = new System.Drawing.Size(325, 28); + this.layoutControlItem36.Text = "鐢熶骇閫�鏂欐槑缁咷UID"; + this.layoutControlItem36.TextSize = new System.Drawing.Size(126, 18); + // // Root // this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; @@ -992,38 +1106,38 @@ this.layoutControlItem28}); 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; + columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition15.Width = 100D; + columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition16.Width = 100D; + columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition17.Width = 100D; + columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition18.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; + columnDefinition15, + columnDefinition16, + columnDefinition17, + columnDefinition18}); + 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 = 100D; + rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition16.Height = 100D; + rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition1, - rowDefinition2, - rowDefinition3, - rowDefinition4, - rowDefinition5, - rowDefinition6}); + rowDefinition11, + rowDefinition12, + rowDefinition13, + rowDefinition14, + rowDefinition15, + rowDefinition16}); this.Root.Size = new System.Drawing.Size(1321, 188); this.Root.TextVisible = false; // @@ -1198,7 +1312,8 @@ this.xtraTabControl2.TabIndex = 3; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, - this.tabMxPage2}); + this.tabMxPage2, + this.tabMxPage3}); // // tabMxPage1 // @@ -1764,23 +1879,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; + columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition25.Width = 100D; + columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition26.Width = 100D; + columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition27.Width = 100D; + columnDefinition28.SizeType = System.Windows.Forms.SizeType.AutoSize; + columnDefinition28.Width = 110D; this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition5, - columnDefinition6, - columnDefinition7, - columnDefinition8}); - rowDefinition7.Height = 100D; - rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition25, + columnDefinition26, + columnDefinition27, + columnDefinition28}); + rowDefinition20.Height = 100D; + rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition7}); + rowDefinition20}); this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43); this.layoutControlGroup1.TextVisible = false; @@ -1842,6 +1957,521 @@ this.ucUpFileList1.pGuid = null; this.ucUpFileList1.Size = new System.Drawing.Size(1340, 459); this.ucUpFileList1.TabIndex = 0; + // + // tabMxPage3 + // + this.tabMxPage3.Controls.Add(this.split99); + this.tabMxPage3.Name = "tabMxPage3"; + this.tabMxPage3.Size = new System.Drawing.Size(1340, 459); + this.tabMxPage3.Text = "鎵撳嵃鏉$爜"; + // + // split99 + // + this.split99.Dock = System.Windows.Forms.DockStyle.Fill; + this.split99.Horizontal = false; + this.split99.Location = new System.Drawing.Point(0, 0); + this.split99.Name = "split99"; + // + // split99.Panel1 + // + this.split99.Panel1.Controls.Add(this.layout99); + this.split99.Panel1.Text = "Panel1"; + // + // split99.Panel2 + // + this.split99.Panel2.Controls.Add(this.gcMx8); + this.split99.Panel2.Text = "Panel2"; + this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; + this.split99.Size = new System.Drawing.Size(1340, 459); + this.split99.SplitterPosition = 103; + this.split99.TabIndex = 3; + // + // layout99 + // + this.layout99.Controls.Add(this.layoutControl1); + this.layout99.Controls.Add(this.radOut); + this.layout99.Controls.Add(this.ucBtnPrint1); + this.layout99.Controls.Add(this.lbMxGuid); + this.layout99.Controls.Add(this.txt_psnQty_1); + this.layout99.Controls.Add(this.txt_kQty); + this.layout99.Controls.Add(this.txtQuantity); + this.layout99.Controls.Add(this.txtYdy); + this.layout99.Dock = System.Windows.Forms.DockStyle.Fill; + this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem26}); + this.layout99.Location = new System.Drawing.Point(0, 0); + this.layout99.Name = "layout99"; + this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(237, 453, 812, 500); + this.layout99.Root = this.layoutControlGroup3; + this.layout99.Size = new System.Drawing.Size(1340, 103); + this.layout99.TabIndex = 0; + this.layout99.Text = "layoutControl1"; + // + // layoutControl1 + // + this.layoutControl1.Controls.Add(this.txt_iCount_1); + this.layoutControl1.Controls.Add(this.txt_yuliang_1); + this.layoutControl1.Location = new System.Drawing.Point(352, 47); + this.layoutControl1.Name = "layoutControl1"; + this.layoutControl1.Root = this.layoutControlGroup2; + this.layoutControl1.Size = new System.Drawing.Size(336, 31); + this.layoutControl1.TabIndex = 475; + this.layoutControl1.Text = "layoutControl1"; + // + // txt_iCount_1 + // + this.txt_iCount_1.Location = new System.Drawing.Point(104, 2); + this.txt_iCount_1.Name = "txt_iCount_1"; + this.txt_iCount_1.Properties.Appearance.Options.UseFont = true; + this.txt_iCount_1.Properties.ReadOnly = true; + this.txt_iCount_1.Size = new System.Drawing.Size(62, 24); + this.txt_iCount_1.StyleController = this.layoutControl1; + this.txt_iCount_1.TabIndex = 228; + // + // txt_yuliang_1 + // + this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2); + this.txt_yuliang_1.Name = "txt_yuliang_1"; + this.txt_yuliang_1.Properties.ReadOnly = true; + this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24); + this.txt_yuliang_1.StyleController = this.layoutControl1; + this.txt_yuliang_1.TabIndex = 229; + // + // layoutControlGroup2 + // + this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup2.GroupBordersVisible = false; + this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem30, + this.layoutControlItem31}); + this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; + this.layoutControlGroup2.Name = "layoutControlGroup2"; + columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition19.Width = 100D; + columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition20.Width = 100D; + this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition19, + columnDefinition20}); + rowDefinition17.Height = 100D; + rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent; + this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { + rowDefinition17}); + this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); + this.layoutControlGroup2.Size = new System.Drawing.Size(336, 31); + this.layoutControlGroup2.TextVisible = false; + // + // layoutControlItem30 + // + this.layoutControlItem30.Control = this.txt_iCount_1; + this.layoutControlItem30.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem30.Name = "layoutControlItem30"; + this.layoutControlItem30.Size = new System.Drawing.Size(168, 31); + this.layoutControlItem30.Text = "鎵撳嵃鏁村紶鏁板��"; + this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem31 + // + this.layoutControlItem31.Control = this.txt_yuliang_1; + this.layoutControlItem31.Location = new System.Drawing.Point(168, 0); + this.layoutControlItem31.Name = "layoutControlItem31"; + this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem31.Size = new System.Drawing.Size(168, 31); + this.layoutControlItem31.Text = "鎵撳嵃浣欐暟"; + this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18); + // + // radOut + // + this.radOut.Location = new System.Drawing.Point(1033, 10); + this.radOut.Margin = new System.Windows.Forms.Padding(0); + this.radOut.Name = "radOut"; + this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; + this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"), + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"), + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")}); + this.radOut.Size = new System.Drawing.Size(227, 28); + this.radOut.StyleController = this.layout99; + this.radOut.TabIndex = 474; + // + // ucBtnPrint1 + // + this.ucBtnPrint1.guidKey = null; + this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 47); + this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); + this.ucBtnPrint1.Name = "ucBtnPrint1"; + this.ucBtnPrint1.rptParameter = null; + this.ucBtnPrint1.Size = new System.Drawing.Size(336, 31); + this.ucBtnPrint1.TabIndex = 231; + // + // lbMxGuid + // + this.lbMxGuid.Location = new System.Drawing.Point(1032, 50); + this.lbMxGuid.Name = "lbMxGuid"; + this.lbMxGuid.Size = new System.Drawing.Size(58, 18); + this.lbMxGuid.StyleController = this.layout99; + this.lbMxGuid.TabIndex = 229; + this.lbMxGuid.Text = "lbMxGuid"; + this.lbMxGuid.Visible = false; + // + // txt_psnQty_1 + // + this.txt_psnQty_1.Location = new System.Drawing.Point(794, 47); + this.txt_psnQty_1.Name = "txt_psnQty_1"; + this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; + this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24); + this.txt_psnQty_1.StyleController = this.layout99; + this.txt_psnQty_1.TabIndex = 226; + // + // txt_kQty + // + this.txt_kQty.Location = new System.Drawing.Point(794, 12); + this.txt_kQty.Name = "txt_kQty"; + this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; + this.txt_kQty.Properties.Appearance.Options.UseFont = true; + this.txt_kQty.Properties.Appearance.Options.UseForeColor = true; + this.txt_kQty.Properties.ReadOnly = true; + this.txt_kQty.Size = new System.Drawing.Size(234, 24); + this.txt_kQty.StyleController = this.layout99; + this.txt_kQty.TabIndex = 224; + // + // txtQuantity + // + this.txtQuantity.Location = new System.Drawing.Point(114, 12); + this.txtQuantity.Name = "txtQuantity"; + this.txtQuantity.Properties.Appearance.Options.UseFont = true; + this.txtQuantity.Properties.ReadOnly = true; + this.txtQuantity.Size = new System.Drawing.Size(234, 24); + this.txtQuantity.StyleController = this.layout99; + this.txtQuantity.TabIndex = 220; + // + // txtYdy + // + this.txtYdy.Location = new System.Drawing.Point(454, 12); + this.txtYdy.Name = "txtYdy"; + this.txtYdy.Properties.Appearance.Options.UseFont = true; + this.txtYdy.Properties.ReadOnly = true; + this.txtYdy.Size = new System.Drawing.Size(234, 24); + this.txtYdy.StyleController = this.layout99; + this.txtYdy.TabIndex = 222; + // + // layoutControlItem26 + // + this.layoutControlItem26.Control = this.lbMxGuid; + this.layoutControlItem26.Location = new System.Drawing.Point(1020, 70); + this.layoutControlItem26.Name = "layoutControlItem26"; + this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem26.Size = new System.Drawing.Size(340, 35); + this.layoutControlItem26.Text = "lbMxGuid"; + this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem26.TextVisible = false; + // + // layoutControlGroup3 + // + this.layoutControlGroup3.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup3.GroupBordersVisible = false; + this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem29, + this.layoutControlItem32, + this.layoutControlItem33, + this.layoutControlItem34, + this.layoutControlItem13, + this.layoutControlItem18, + this.layoutControlItem24}); + this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; + this.layoutControlGroup3.Name = "Root"; + columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition21.Width = 100D; + columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition22.Width = 100D; + columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition23.Width = 100D; + columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition24.Width = 100D; + this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition21, + columnDefinition22, + columnDefinition23, + columnDefinition24}); + rowDefinition18.Height = 100D; + rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition19.Height = 100D; + rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent; + this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { + rowDefinition18, + rowDefinition19}); + this.layoutControlGroup3.Size = new System.Drawing.Size(1380, 90); + this.layoutControlGroup3.TextVisible = false; + // + // layoutControlItem29 + // + this.layoutControlItem29.Control = this.txt_kQty; + this.layoutControlItem29.Location = new System.Drawing.Point(680, 0); + this.layoutControlItem29.Name = "layoutControlItem24"; + this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem29.Size = new System.Drawing.Size(340, 35); + this.layoutControlItem29.Text = "鍙墦鍗版�绘暟"; + this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem32 + // + this.layoutControlItem32.Control = this.txt_psnQty_1; + this.layoutControlItem32.Location = new System.Drawing.Point(680, 35); + this.layoutControlItem32.Name = "layoutControlItem25"; + this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem32.Size = new System.Drawing.Size(340, 35); + this.layoutControlItem32.Text = "姣忓紶鏉$爜鏁伴噺"; + this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem33 + // + this.layoutControlItem33.Control = this.ucBtnPrint1; + this.layoutControlItem33.Location = new System.Drawing.Point(1020, 35); + this.layoutControlItem33.Name = "layoutControlItem27"; + this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem33.Size = new System.Drawing.Size(340, 35); + this.layoutControlItem33.Text = "鎵撳嵃鎸夐挳"; + this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem33.TextVisible = false; + // + // layoutControlItem34 + // + this.layoutControlItem34.Control = this.radOut; + this.layoutControlItem34.Location = new System.Drawing.Point(1020, 0); + this.layoutControlItem34.MaxSize = new System.Drawing.Size(230, 28); + this.layoutControlItem34.MinSize = new System.Drawing.Size(230, 28); + this.layoutControlItem34.Name = "layoutControlItem28"; + this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0); + this.layoutControlItem34.Size = new System.Drawing.Size(340, 35); + this.layoutControlItem34.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem34.Text = "鑷姩璁$畻"; + this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem34.TextVisible = false; + // + // layoutControlItem13 + // + this.layoutControlItem13.Control = this.txtQuantity; + this.layoutControlItem13.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.Size = new System.Drawing.Size(340, 35); + this.layoutControlItem13.Text = "鐢宠鎬婚噺"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem18 + // + this.layoutControlItem18.Control = this.txtYdy; + this.layoutControlItem18.Location = new System.Drawing.Point(340, 0); + this.layoutControlItem18.Name = "layoutControlItem18"; + this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem18.Size = new System.Drawing.Size(340, 35); + this.layoutControlItem18.Text = "宸叉墦鍗版�婚噺"; + this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem24 + // + this.layoutControlItem24.Control = this.layoutControl1; + this.layoutControlItem24.Location = new System.Drawing.Point(340, 35); + this.layoutControlItem24.Name = "layoutControlItem24"; + this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem24.Size = new System.Drawing.Size(340, 35); + this.layoutControlItem24.Text = "鑷姩璁$畻"; + this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem24.TextVisible = false; + // + // gcMx8 + // + this.gcMx8.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMx8.Location = new System.Drawing.Point(0, 0); + this.gcMx8.MainView = this.gvMx8; + this.gcMx8.Name = "gcMx8"; + this.gcMx8.Size = new System.Drawing.Size(1340, 344); + this.gcMx8.TabIndex = 2; + this.gcMx8.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gvMx8}); + // + // gvMx8 + // + this.gvMx8.Appearance.Row.Options.UseFont = true; + this.gvMx8.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn7, + this.gridColumn8, + this.gvMx1itemBarcode, + this.gridColumn9, + this.gridColumn10, + this.gridColumn11, + this.gvMx1quantity, + this.gridColumn12, + this.gvMx1createBy, + this.gvMx1lotDate, + this.gridColumn13, + this.gridColumn16, + this.gridColumn23, + this.gvBtnAlawys}); + this.gvMx8.GridControl = this.gcMx8; + this.gvMx8.Name = "gvMx8"; + this.gvMx8.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; + this.gvMx8.OptionsFind.ShowSearchNavButtons = false; + this.gvMx8.OptionsView.ShowGroupPanel = false; + // + // gridColumn7 + // + this.gridColumn7.AppearanceCell.Options.UseFont = true; + this.gridColumn7.Caption = "guid"; + this.gridColumn7.FieldName = "guid"; + this.gridColumn7.MinWidth = 50; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Tag = "query_a.guid"; + this.gridColumn7.Width = 94; + // + // gridColumn8 + // + this.gridColumn8.Caption = "鏄惁鍏ュ簱"; + this.gridColumn8.FieldName = "isRk"; + this.gridColumn8.MinWidth = 25; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 0; + this.gridColumn8.Width = 94; + // + // gvMx1itemBarcode + // + this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true; + this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜"; + this.gvMx1itemBarcode.FieldName = "itemBarcode"; + this.gvMx1itemBarcode.MinWidth = 300; + this.gvMx1itemBarcode.Name = "gvMx1itemBarcode"; + this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE"; + this.gvMx1itemBarcode.Visible = true; + this.gvMx1itemBarcode.VisibleIndex = 1; + this.gvMx1itemBarcode.Width = 300; + // + // gridColumn9 + // + this.gridColumn9.Caption = "鐗╂枡缂栫爜"; + this.gridColumn9.FieldName = "itemNo"; + this.gridColumn9.MinWidth = 25; + this.gridColumn9.Name = "gridColumn9"; + this.gridColumn9.Visible = true; + this.gridColumn9.VisibleIndex = 2; + this.gridColumn9.Width = 94; + // + // gridColumn10 + // + this.gridColumn10.Caption = "鐗╂枡鍚嶇О"; + this.gridColumn10.FieldName = "itemName"; + this.gridColumn10.MinWidth = 25; + this.gridColumn10.Name = "gridColumn10"; + this.gridColumn10.Visible = true; + this.gridColumn10.VisibleIndex = 3; + this.gridColumn10.Width = 94; + // + // gridColumn11 + // + this.gridColumn11.Caption = "瑙勬牸鍨嬪彿"; + this.gridColumn11.FieldName = "itemModel"; + this.gridColumn11.MinWidth = 25; + this.gridColumn11.Name = "gridColumn11"; + this.gridColumn11.Visible = true; + this.gridColumn11.VisibleIndex = 4; + this.gridColumn11.Width = 94; + // + // gvMx1quantity + // + this.gvMx1quantity.AppearanceCell.Options.UseFont = true; + this.gvMx1quantity.Caption = "鏁伴噺"; + this.gvMx1quantity.FieldName = "quantity"; + this.gvMx1quantity.MinWidth = 50; + this.gvMx1quantity.Name = "gvMx1quantity"; + this.gvMx1quantity.Tag = "query_a.QUANTITY"; + this.gvMx1quantity.Visible = true; + this.gvMx1quantity.VisibleIndex = 5; + this.gvMx1quantity.Width = 94; + // + // gridColumn12 + // + this.gridColumn12.Caption = "鍗曚綅"; + this.gridColumn12.FieldName = "dwName"; + this.gridColumn12.MinWidth = 25; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 6; + this.gridColumn12.Width = 94; + // + // gvMx1createBy + // + this.gvMx1createBy.AppearanceCell.Options.UseFont = true; + this.gvMx1createBy.Caption = "鍒涘缓浜�"; + this.gvMx1createBy.FieldName = "createBy"; + this.gvMx1createBy.MinWidth = 50; + this.gvMx1createBy.Name = "gvMx1createBy"; + this.gvMx1createBy.Tag = "query_a.CREATE_BY"; + this.gvMx1createBy.Visible = true; + this.gvMx1createBy.VisibleIndex = 7; + this.gvMx1createBy.Width = 94; + // + // gvMx1lotDate + // + this.gvMx1lotDate.AppearanceCell.Options.UseFont = true; + this.gvMx1lotDate.Caption = "鍒涘缓鏃ユ湡"; + this.gvMx1lotDate.FieldName = "createDate"; + this.gvMx1lotDate.MinWidth = 50; + this.gvMx1lotDate.Name = "gvMx1lotDate"; + this.gvMx1lotDate.Tag = "query_a.LOT_DATE"; + this.gvMx1lotDate.Visible = true; + this.gvMx1lotDate.VisibleIndex = 8; + this.gvMx1lotDate.Width = 94; + // + // gridColumn13 + // + this.gridColumn13.Caption = "鍏ュ簱浜�"; + this.gridColumn13.FieldName = "rkUser"; + this.gridColumn13.MinWidth = 25; + this.gridColumn13.Name = "gridColumn13"; + this.gridColumn13.Visible = true; + this.gridColumn13.VisibleIndex = 9; + this.gridColumn13.Width = 94; + // + // gridColumn16 + // + this.gridColumn16.Caption = "鍏ュ簱浣�"; + this.gridColumn16.FieldName = "rkPositon"; + this.gridColumn16.MinWidth = 25; + this.gridColumn16.Name = "gridColumn16"; + this.gridColumn16.Visible = true; + this.gridColumn16.VisibleIndex = 10; + this.gridColumn16.Width = 94; + // + // gridColumn23 + // + this.gridColumn23.Caption = "鍏ュ簱鏃ユ湡"; + this.gridColumn23.FieldName = "rkDate"; + this.gridColumn23.MinWidth = 25; + this.gridColumn23.Name = "gridColumn23"; + this.gridColumn23.Visible = true; + this.gridColumn23.VisibleIndex = 11; + this.gridColumn23.Width = 94; + // + // gvBtnAlawys + // + this.gvBtnAlawys.Caption = "绉诲嚭"; + repositoryItemButtonEdit2.AutoHeight = false; + editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2"; + repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.gvBtnAlawys.ColumnEdit = repositoryItemButtonEdit2; + this.gvBtnAlawys.MinWidth = 25; + this.gvBtnAlawys.Name = "gvBtnAlawys"; + this.gvBtnAlawys.Visible = true; + this.gvBtnAlawys.VisibleIndex = 12; + this.gvBtnAlawys.Width = 94; // // repositoryItemComboBox2 // @@ -1923,10 +2553,12 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); @@ -1978,6 +2610,39 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); this.tabMxPage2.ResumeLayout(false); + this.tabMxPage3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit(); + this.split99.Panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit(); + this.split99.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit(); + this.split99.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit(); + this.layout99.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); + this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(repositoryItemButtonEdit2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); @@ -2119,5 +2784,48 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; + private DevExpress.XtraTab.XtraTabPage tabMxPage3; + private DevExpress.XtraEditors.SplitContainerControl split99; + private DevExpress.XtraLayout.LayoutControl layout99; + private DevExpress.XtraLayout.LayoutControl layoutControl1; + private DevExpress.XtraEditors.TextEdit txt_iCount_1; + private DevExpress.XtraEditors.TextEdit txt_yuliang_1; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31; + private DevExpress.XtraEditors.RadioGroup radOut; + private UserControl.UcBtnPrint ucBtnPrint1; + private DevExpress.XtraEditors.LabelControl lbMxGuid; + private DevExpress.XtraEditors.TextEdit txt_psnQty_1; + private DevExpress.XtraEditors.TextEdit txt_kQty; + private DevExpress.XtraEditors.TextEdit txtQuantity; + private DevExpress.XtraEditors.TextEdit txtYdy; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34; + private DevExpress.XtraEditors.TextEdit txt_aboutGuid; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; + private DevExpress.XtraGrid.GridControl gcMx8; + private DevExpress.XtraGrid.Views.Grid.GridView gvMx8; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; + private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs index ba381bb..567b2a1 100644 --- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs +++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs @@ -52,6 +52,53 @@ xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged; gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged; btnIpt.Click += BtnIpt_Click; + + this.ucBtnPrint1.btnDesignClick += (s, e) => + { + ucBtnPrint1.rptParameter = "rpt_SCTL{}"; + }; + this.ucBtnPrint1.btnReportClick += (s, e) => + { + ucBtnPrint1.guidKey = ""; + string rowGuid = txt_aboutGuid.Text.Trim(); + ucBtnPrint1.guidKey = rowGuid; + if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); + txt_iCount_1.Focus(); + this.ucBtnPrint1.rptParameter = "return false"; + return; + } + if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�"); + txt_psnQty_1.Focus(); + this.ucBtnPrint1.rptParameter = "return false"; + return; + } + if (rowGuid.Length < 10) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�"); + this.ucBtnPrint1.rptParameter = "return false"; + return; + } + this.ucBtnPrint1.rptParameter = "rpt_SCTL{" + rowGuid.Trim() + + "," + "" + + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim()) + + "," + txt_iCount_1.Text.Trim() + + "," + txt_psnQty_1.Text.Trim() + + "}"; + }; + + //鑷姩璁$畻鎵撳嵃閲� + txt_psnQty_1.TextChanged += (s, e) => + { + Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1); + }; + radOut.SelectedIndexChanged += (s, e) => + { + Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1); + }; } @@ -425,6 +472,10 @@ gvList.Add(gvMx1); UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList); setEable(isEdit); + txtQuantity.Text = dy["fbatchQty"].ToString(); + txt_kQty.Text = dy["kdy"].ToString(); + txtYdy.Text = dy["ydy"].ToString(); + txt_psnQty_1.Text = dy["fbatchQty"].ToString(); JObject _job = JObject.Parse(strJson); JArray array = new JArray(); foreach (var a in _job["rtnData"]["list5"]) @@ -450,6 +501,27 @@ gvMx1.FocusedRowHandle = rowHandle + 1; } // MessageBox.Show(rowHandle.ToString() + "**" + guid5); + } + else + { + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + } + + + JArray array8 = new JArray(); + foreach (var a in _job["rtnData"]["barCodeList"]) + { + array8.Add(a); + } + DataTable dt8 = JsonConvert.DeserializeObject<DataTable>(array8.ToString()); + if (dt8.Rows.Count > 0) + { + gcMx8.DataSource = null; + gcMx8.BindingContext = new BindingContext(); + gcMx8.DataSource = dt8; + gcMx8.ForceInitialize(); + gvMx8.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx8); } else { @@ -574,5 +646,46 @@ } } + + + /// <summary> + /// 绉诲嚭鏉$爜 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void repDelCard_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + { + var rowhandle = gvMx2.FocusedRowHandle; + if (rowhandle < 0) + return; + if (e.Button.Index == 0) + { + var dr = gvMx2.GetDataRow(rowhandle); + var mxGuid = dr["guid"].ToString(); + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵")) + return; + var _obj = new + { + mxGuid = mxGuid, + inType = "dhtm" + }; + try + { + var strJson = UtilityHelper.HttpPost("", + "VArrivalBarcodeManager/DeleteBarcode", + JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + //if (_rtn.rtnCode > 0) getModel(lbGuid.Text); + } + MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + } } } \ No newline at end of file -- Gitblit v1.9.3