From cf7744e9f271b675181f622f3e16b2fa5e85e7a1 Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期六, 09 八月 2025 17:42:27 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 263 +++++++++++++++++++++++++++------------------------- 1 files changed, 138 insertions(+), 125 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs index 0380645..062cfef 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs @@ -66,6 +66,12 @@ DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Womdaa)); + 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(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -105,6 +111,7 @@ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -214,19 +221,17 @@ this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn63 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn64 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn65 = new DevExpress.XtraGrid.Columns.GridColumn(); this.xtraTabPage8 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx8 = new DevExpress.XtraGrid.GridControl(); this.gvMx8 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2status = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn56 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx2tlQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn57 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn58 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn59 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn60 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn61 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -328,7 +333,8 @@ this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage(); this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint(); this.tips = new DevExpress.Utils.ToolTipController(this.components); - this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.rptTuoBanNbz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -493,6 +499,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit(); this.xtraTabPage5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -1006,6 +1013,16 @@ this.gridColumn25.Visible = true; this.gridColumn25.VisibleIndex = 28; this.gridColumn25.Width = 94; + // + // gridColumn52 + // + this.gridColumn52.Caption = "鐢熶骇绫诲瀷"; + this.gridColumn52.FieldName = "daa025"; + this.gridColumn52.MinWidth = 25; + this.gridColumn52.Name = "gridColumn52"; + this.gridColumn52.Visible = true; + this.gridColumn52.VisibleIndex = 9; + this.gridColumn52.Width = 94; // // pageBar1 // @@ -2270,7 +2287,10 @@ this.gvMx7.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gvMx1daa002, this.gvMx1daa010, - this.gvMx1daa004}); + this.gvMx1daa004, + this.gridColumn63, + this.gridColumn64, + this.gridColumn65}); this.gvMx7.GridControl = this.gcMx7; this.gvMx7.Name = "gvMx7"; this.gvMx7.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; @@ -2285,7 +2305,7 @@ this.gvMx1daa002.MinWidth = 50; this.gvMx1daa002.Name = "gvMx1daa002"; this.gvMx1daa002.OptionsColumn.ReadOnly = true; - this.gvMx1daa002.Tag = "edit"; + this.gvMx1daa002.Tag = "query_a.daa010"; this.gvMx1daa002.Visible = true; this.gvMx1daa002.VisibleIndex = 0; this.gvMx1daa002.Width = 54; @@ -2311,10 +2331,46 @@ this.gvMx1daa004.MinWidth = 150; this.gvMx1daa004.Name = "gvMx1daa004"; this.gvMx1daa004.OptionsColumn.ReadOnly = true; - this.gvMx1daa004.Tag = "edit"; + this.gvMx1daa004.Tag = "query_a.daa010"; this.gvMx1daa004.Visible = true; this.gvMx1daa004.VisibleIndex = 2; this.gvMx1daa004.Width = 150; + // + // gridColumn63 + // + this.gridColumn63.Caption = "鏄惁鍙繑宸�"; + this.gridColumn63.FieldName = "isBack"; + this.gridColumn63.MinWidth = 25; + this.gridColumn63.Name = "gridColumn63"; + this.gridColumn63.OptionsColumn.ReadOnly = true; + this.gridColumn63.Tag = "query_a.daa010"; + this.gridColumn63.Visible = true; + this.gridColumn63.VisibleIndex = 3; + this.gridColumn63.Width = 94; + // + // gridColumn64 + // + this.gridColumn64.Caption = "鏄惁杩旇拷婧爜"; + this.gridColumn64.FieldName = "isZsm"; + this.gridColumn64.MinWidth = 25; + this.gridColumn64.Name = "gridColumn64"; + this.gridColumn64.OptionsColumn.ReadOnly = true; + this.gridColumn64.Tag = "query_a.daa010"; + this.gridColumn64.Visible = true; + this.gridColumn64.VisibleIndex = 4; + this.gridColumn64.Width = 94; + // + // gridColumn65 + // + this.gridColumn65.Caption = "鏄惁杩旀墭鏉跨爜"; + this.gridColumn65.FieldName = "isTbm"; + this.gridColumn65.MinWidth = 25; + this.gridColumn65.Name = "gridColumn65"; + this.gridColumn65.OptionsColumn.ReadOnly = true; + this.gridColumn65.Tag = "query_a.daa010"; + this.gridColumn65.Visible = true; + this.gridColumn65.VisibleIndex = 5; + this.gridColumn65.Width = 94; // // xtraTabPage8 // @@ -2343,13 +2399,8 @@ this.gridColumn53, this.gvMx2status, this.gvMx2pbillNo, - this.gvMx2itemNo, - this.gridColumn54, - this.gridColumn55, this.gridColumn56, - this.gvMx2tlQty, this.gridColumn57, - this.gridColumn58, this.gridColumn59, this.gridColumn60, this.gridColumn61, @@ -2394,38 +2445,6 @@ this.gvMx2pbillNo.VisibleIndex = 1; this.gvMx2pbillNo.Width = 94; // - // gvMx2itemNo - // - this.gvMx2itemNo.AppearanceCell.Options.UseFont = true; - this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜"; - this.gvMx2itemNo.FieldName = "itemNo"; - this.gvMx2itemNo.Name = "gvMx2itemNo"; - this.gvMx2itemNo.OptionsColumn.ReadOnly = true; - this.gvMx2itemNo.Tag = "query_a.item_no"; - this.gvMx2itemNo.Visible = true; - this.gvMx2itemNo.VisibleIndex = 2; - this.gvMx2itemNo.Width = 94; - // - // gridColumn54 - // - this.gridColumn54.Caption = "鐗╂枡鍚嶇О"; - this.gridColumn54.FieldName = "itemName"; - this.gridColumn54.Name = "gridColumn54"; - this.gridColumn54.OptionsColumn.ReadOnly = true; - this.gridColumn54.Visible = true; - this.gridColumn54.VisibleIndex = 3; - this.gridColumn54.Width = 94; - // - // gridColumn55 - // - this.gridColumn55.Caption = "瑙勬牸鍨嬪彿"; - this.gridColumn55.FieldName = "itemModel"; - this.gridColumn55.Name = "gridColumn55"; - this.gridColumn55.OptionsColumn.ReadOnly = true; - this.gridColumn55.Visible = true; - this.gridColumn55.VisibleIndex = 4; - this.gridColumn55.Width = 94; - // // gridColumn56 // this.gridColumn56.Caption = "鏁伴噺"; @@ -2434,20 +2453,8 @@ this.gridColumn56.Name = "gridColumn56"; this.gridColumn56.OptionsColumn.ReadOnly = true; this.gridColumn56.Visible = true; - this.gridColumn56.VisibleIndex = 6; + this.gridColumn56.VisibleIndex = 2; this.gridColumn56.Width = 94; - // - // gvMx2tlQty - // - this.gvMx2tlQty.AppearanceCell.Options.UseFont = true; - this.gvMx2tlQty.Caption = "鍗曚綅"; - this.gvMx2tlQty.FieldName = "dwName"; - this.gvMx2tlQty.Name = "gvMx2tlQty"; - this.gvMx2tlQty.OptionsColumn.ReadOnly = true; - this.gvMx2tlQty.Tag = "query_a.tl_qty"; - this.gvMx2tlQty.Visible = true; - this.gvMx2tlQty.VisibleIndex = 5; - this.gvMx2tlQty.Width = 94; // // gridColumn57 // @@ -2457,17 +2464,8 @@ this.gridColumn57.Name = "gridColumn57"; this.gridColumn57.OptionsColumn.ReadOnly = true; this.gridColumn57.Visible = true; - this.gridColumn57.VisibleIndex = 7; + this.gridColumn57.VisibleIndex = 3; this.gridColumn57.Width = 94; - // - // gridColumn58 - // - this.gridColumn58.Caption = "涓嶈壇鎻忚堪"; - this.gridColumn58.FieldName = "badDescription"; - this.gridColumn58.MinWidth = 25; - this.gridColumn58.Name = "gridColumn58"; - this.gridColumn58.OptionsColumn.ReadOnly = true; - this.gridColumn58.Width = 94; // // gridColumn59 // @@ -2477,7 +2475,7 @@ this.gridColumn59.Name = "gridColumn59"; this.gridColumn59.OptionsColumn.ReadOnly = true; this.gridColumn59.Visible = true; - this.gridColumn59.VisibleIndex = 8; + this.gridColumn59.VisibleIndex = 4; this.gridColumn59.Width = 94; // // gridColumn60 @@ -2488,7 +2486,7 @@ this.gridColumn60.Name = "gridColumn60"; this.gridColumn60.OptionsColumn.ReadOnly = true; this.gridColumn60.Visible = true; - this.gridColumn60.VisibleIndex = 9; + this.gridColumn60.VisibleIndex = 5; this.gridColumn60.Width = 94; // // gridColumn61 @@ -2499,18 +2497,18 @@ this.gridColumn61.Name = "gridColumn61"; this.gridColumn61.OptionsColumn.ReadOnly = true; this.gridColumn61.Visible = true; - this.gridColumn61.VisibleIndex = 10; + this.gridColumn61.VisibleIndex = 6; this.gridColumn61.Width = 94; // // gridColumn62 // this.gridColumn62.Caption = "鏁版嵁鐘舵��"; - this.gridColumn62.FieldName = "barCodeStatusTxt"; + this.gridColumn62.FieldName = "barCodeRemark"; this.gridColumn62.MinWidth = 25; this.gridColumn62.Name = "gridColumn62"; this.gridColumn62.OptionsColumn.ReadOnly = true; this.gridColumn62.Visible = true; - this.gridColumn62.VisibleIndex = 11; + this.gridColumn62.VisibleIndex = 7; this.gridColumn62.Width = 94; // // tabMxPage2 @@ -2564,11 +2562,11 @@ // this.layShuLiang.Controls.Add(this.txt_iCount_1); this.layShuLiang.Controls.Add(this.txt_yuliang_1); - this.layShuLiang.Location = new System.Drawing.Point(662, 44); + this.layShuLiang.Location = new System.Drawing.Point(654, 44); this.layShuLiang.Name = "layShuLiang"; this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500); this.layShuLiang.Root = this.layoutControlGroup3; - this.layShuLiang.Size = new System.Drawing.Size(321, 28); + this.layShuLiang.Size = new System.Drawing.Size(317, 28); this.layShuLiang.TabIndex = 475; this.layShuLiang.Text = "dataLayoutControl1"; // @@ -2577,16 +2575,16 @@ this.txt_iCount_1.Location = new System.Drawing.Point(89, 2); this.txt_iCount_1.Name = "txt_iCount_1"; this.txt_iCount_1.Properties.ReadOnly = true; - this.txt_iCount_1.Size = new System.Drawing.Size(69, 24); + this.txt_iCount_1.Size = new System.Drawing.Size(67, 24); this.txt_iCount_1.StyleController = this.layShuLiang; this.txt_iCount_1.TabIndex = 5; // // txt_yuliang_1 // - this.txt_yuliang_1.Location = new System.Drawing.Point(249, 2); + this.txt_yuliang_1.Location = new System.Drawing.Point(247, 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(70, 24); + this.txt_yuliang_1.Size = new System.Drawing.Size(68, 24); this.txt_yuliang_1.StyleController = this.layShuLiang; this.txt_yuliang_1.TabIndex = 6; // @@ -2611,7 +2609,7 @@ this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition7}); this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28); + this.layoutControlGroup3.Size = new System.Drawing.Size(317, 28); this.layoutControlGroup3.TextVisible = false; // // layoutControlItem25 @@ -2619,7 +2617,7 @@ this.layoutControlItem25.Control = this.txt_iCount_1; this.layoutControlItem25.Location = new System.Drawing.Point(0, 0); this.layoutControlItem25.Name = "layoutControlItem25"; - this.layoutControlItem25.Size = new System.Drawing.Size(160, 28); + this.layoutControlItem25.Size = new System.Drawing.Size(158, 28); this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�"; this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18); // @@ -2627,16 +2625,16 @@ // this.layoutControlItem39.Control = this.txt_yuliang_1; this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟"; - this.layoutControlItem39.Location = new System.Drawing.Point(160, 0); + this.layoutControlItem39.Location = new System.Drawing.Point(158, 0); this.layoutControlItem39.Name = "layoutControlItem39"; this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem39.Size = new System.Drawing.Size(161, 28); + this.layoutControlItem39.Size = new System.Drawing.Size(159, 28); this.layoutControlItem39.Text = "鎵撳嵃浣欐暟"; this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18); // // radOut // - this.radOut.Location = new System.Drawing.Point(985, 10); + this.radOut.Location = new System.Drawing.Point(973, 10); this.radOut.Margin = new System.Windows.Forms.Padding(0); this.radOut.Name = "radOut"; this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; @@ -2645,7 +2643,7 @@ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"), new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")}); this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0); - this.radOut.Size = new System.Drawing.Size(325, 32); + this.radOut.Size = new System.Drawing.Size(321, 32); this.radOut.StyleController = this.layoutMx99; this.radOut.TabIndex = 473; // @@ -2653,29 +2651,29 @@ // this.ucBtnPrint1.allClickKey = null; this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(985, 42); + this.ucBtnPrint1.Location = new System.Drawing.Point(973, 42); this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint1.Name = "ucBtnPrint1"; this.ucBtnPrint1.rptParameter = null; - this.ucBtnPrint1.Size = new System.Drawing.Size(325, 32); + this.ucBtnPrint1.Size = new System.Drawing.Size(321, 32); this.ucBtnPrint1.TabIndex = 464; // // txt_psnQty_1 // - this.txt_psnQty_1.Location = new System.Drawing.Point(749, 12); + this.txt_psnQty_1.Location = new System.Drawing.Point(741, 12); 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.Size = new System.Drawing.Size(230, 24); this.txt_psnQty_1.StyleController = this.layoutMx99; this.txt_psnQty_1.TabIndex = 330; this.txt_psnQty_1.Tag = "readOnly-1"; // // txt_printRemark // - this.txt_printRemark.Location = new System.Drawing.Point(424, 44); + this.txt_printRemark.Location = new System.Drawing.Point(420, 44); this.txt_printRemark.Name = "txt_printRemark"; this.txt_printRemark.Properties.Appearance.Options.UseFont = true; - this.txt_printRemark.Size = new System.Drawing.Size(234, 24); + this.txt_printRemark.Size = new System.Drawing.Size(230, 24); this.txt_printRemark.StyleController = this.layoutMx99; this.txt_printRemark.TabIndex = 334; this.txt_printRemark.Tag = "readOnly-1"; @@ -2683,11 +2681,11 @@ // txt_kQty // this.txt_kQty.EditValue = ""; - this.txt_kQty.Location = new System.Drawing.Point(424, 12); + this.txt_kQty.Location = new System.Drawing.Point(420, 12); this.txt_kQty.Name = "txt_kQty"; this.txt_kQty.Properties.Appearance.Options.UseFont = 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(230, 24); this.txt_kQty.StyleController = this.layoutMx99; this.txt_kQty.TabIndex = 472; this.txt_kQty.Tag = "readonly"; @@ -2698,7 +2696,7 @@ this.txt_yQty.Name = "txt_yQty"; this.txt_yQty.Properties.Appearance.Options.UseFont = true; this.txt_yQty.Properties.ReadOnly = true; - this.txt_yQty.Size = new System.Drawing.Size(234, 24); + this.txt_yQty.Size = new System.Drawing.Size(230, 24); this.txt_yQty.StyleController = this.layoutMx99; this.txt_yQty.TabIndex = 470; this.txt_yQty.Tag = "readonly"; @@ -2708,7 +2706,7 @@ this.txt_zQty.Location = new System.Drawing.Point(99, 12); this.txt_zQty.Name = "txt_zQty"; this.txt_zQty.Properties.ReadOnly = true; - this.txt_zQty.Size = new System.Drawing.Size(234, 24); + this.txt_zQty.Size = new System.Drawing.Size(230, 24); this.txt_zQty.StyleController = this.layoutMx99; this.txt_zQty.TabIndex = 474; // @@ -2736,7 +2734,7 @@ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition10.Width = 100D; columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize; - columnDefinition11.Width = 328D; + columnDefinition11.Width = 323D; this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition7, columnDefinition8, @@ -2750,7 +2748,7 @@ this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition8, rowDefinition9}); - this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84); + this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem23 @@ -2758,21 +2756,21 @@ this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true; this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.layoutControlItem23.Control = this.txt_kQty; - this.layoutControlItem23.Location = new System.Drawing.Point(325, 0); + this.layoutControlItem23.Location = new System.Drawing.Point(321, 0); this.layoutControlItem23.Name = "layoutControlItem23"; this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem23.Size = new System.Drawing.Size(325, 32); + this.layoutControlItem23.Size = new System.Drawing.Size(321, 32); this.layoutControlItem23.Text = "鍙墦鍗版暟閲�"; this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem35 // this.layoutControlItem35.Control = this.radOut; - this.layoutControlItem35.Location = new System.Drawing.Point(975, 0); + this.layoutControlItem35.Location = new System.Drawing.Point(963, 0); this.layoutControlItem35.Name = "layoutControlItem35"; this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlItem35.Size = new System.Drawing.Size(325, 32); + this.layoutControlItem35.Size = new System.Drawing.Size(321, 32); this.layoutControlItem35.Text = "鑷姩璁$畻"; this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem35.TextVisible = false; @@ -2782,12 +2780,12 @@ this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true; this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.layoutControlItem26.Control = this.ucBtnPrint1; - this.layoutControlItem26.Location = new System.Drawing.Point(975, 32); + this.layoutControlItem26.Location = new System.Drawing.Point(963, 32); this.layoutControlItem26.Name = "layoutControlItem26"; this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlItem26.Size = new System.Drawing.Size(325, 32); + this.layoutControlItem26.Size = new System.Drawing.Size(321, 32); this.layoutControlItem26.Text = "鎵樻澘鎵撳嵃"; this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem26.TextVisible = false; @@ -2800,18 +2798,18 @@ this.layoutControlItem22.Location = new System.Drawing.Point(0, 32); this.layoutControlItem22.Name = "layoutControlItem22"; this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem22.Size = new System.Drawing.Size(325, 32); + this.layoutControlItem22.Size = new System.Drawing.Size(321, 32); this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�"; this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem21 // this.layoutControlItem21.Control = this.txt_printRemark; - this.layoutControlItem21.Location = new System.Drawing.Point(325, 32); + this.layoutControlItem21.Location = new System.Drawing.Point(321, 32); this.layoutControlItem21.Name = "layoutControlItem21"; this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem21.Size = new System.Drawing.Size(325, 32); + this.layoutControlItem21.Size = new System.Drawing.Size(321, 32); this.layoutControlItem21.Text = "鎵撳嵃澶囨敞"; this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18); // @@ -2821,21 +2819,21 @@ this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.layoutControlItem24.Control = this.txt_psnQty_1; this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�"; - this.layoutControlItem24.Location = new System.Drawing.Point(650, 0); + this.layoutControlItem24.Location = new System.Drawing.Point(642, 0); this.layoutControlItem24.Name = "layoutControlItem24"; this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem24.Size = new System.Drawing.Size(325, 32); + this.layoutControlItem24.Size = new System.Drawing.Size(321, 32); this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�"; this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem38 // this.layoutControlItem38.Control = this.layShuLiang; - this.layoutControlItem38.Location = new System.Drawing.Point(650, 32); + this.layoutControlItem38.Location = new System.Drawing.Point(642, 32); this.layoutControlItem38.Name = "layoutControlItem38"; this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem38.Size = new System.Drawing.Size(325, 32); + this.layoutControlItem38.Size = new System.Drawing.Size(321, 32); this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺"; this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem38.TextVisible = false; @@ -2845,7 +2843,7 @@ this.layoutControlItem36.Control = this.txt_zQty; this.layoutControlItem36.Location = new System.Drawing.Point(0, 0); this.layoutControlItem36.Name = "layoutControlItem36"; - this.layoutControlItem36.Size = new System.Drawing.Size(325, 32); + this.layoutControlItem36.Size = new System.Drawing.Size(321, 32); this.layoutControlItem36.Text = "宸ュ崟鎬婚噺"; this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18); // @@ -2855,6 +2853,8 @@ 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.rptTuoBanNbz}); this.gcMx2.Size = new System.Drawing.Size(1648, 377); this.gcMx2.TabIndex = 0; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -2879,7 +2879,8 @@ this.gvMx2createDate, this.gridColumn30, this.gridColumn31, - this.gridColumn32}); + this.gridColumn32, + this.gridColumn54}); this.gvMx2.GridControl = this.gcMx2; this.gvMx2.Name = "gvMx2"; this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -3744,15 +3745,26 @@ this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32); this.ucBtnPrint101.TabIndex = 0; // - // gridColumn52 + // gridColumn54 // - this.gridColumn52.Caption = "鐢熶骇绫诲瀷"; - this.gridColumn52.FieldName = "daa025"; - this.gridColumn52.MinWidth = 25; - this.gridColumn52.Name = "gridColumn52"; - this.gridColumn52.Visible = true; - this.gridColumn52.VisibleIndex = 9; - this.gridColumn52.Width = 94; + this.gridColumn54.Caption = "鍙樻洿鍐呭寘瑁呮暟閲�"; + this.gridColumn54.ColumnEdit = this.rptTuoBanNbz; + this.gridColumn54.MinWidth = 25; + this.gridColumn54.Name = "gridColumn54"; + this.gridColumn54.Visible = true; + this.gridColumn54.VisibleIndex = 12; + this.gridColumn54.Width = 94; + // + // rptTuoBanNbz + // + this.rptTuoBanNbz.AutoHeight = false; + editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image"))); + editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + this.rptTuoBanNbz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍙樻洿鍐呭寘瑁呮暟閲�", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.rptTuoBanNbz.Name = "rptTuoBanNbz"; + this.rptTuoBanNbz.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.rptTuoBanNbz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptTuoBanNbz_ButtonClick); // // Frm_Womdaa // @@ -3927,6 +3939,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit(); this.xtraTabPage5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).EndInit(); this.ResumeLayout(false); } @@ -4176,13 +4189,8 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn53; private DevExpress.XtraGrid.Columns.GridColumn gvMx2status; private DevExpress.XtraGrid.Columns.GridColumn gvMx2pbillNo; - private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn54; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn55; private DevExpress.XtraGrid.Columns.GridColumn gridColumn56; - private DevExpress.XtraGrid.Columns.GridColumn gvMx2tlQty; private DevExpress.XtraGrid.Columns.GridColumn gridColumn57; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn58; private DevExpress.XtraGrid.Columns.GridColumn gridColumn59; private DevExpress.XtraGrid.Columns.GridColumn gridColumn60; private DevExpress.XtraGrid.Columns.GridColumn gridColumn61; @@ -4194,5 +4202,10 @@ private DevExpress.XtraEditors.ComboBoxEdit txt_daa025; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; private DevExpress.XtraGrid.Columns.GridColumn gridColumn52; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn63; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn64; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn65; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn54; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptTuoBanNbz; } } \ No newline at end of file -- Gitblit v1.9.3