From a75a2d05afbd147ecb44fc1b520180424b99c910 Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期六, 23 八月 2025 10:21:11 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs | 208 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 123 insertions(+), 85 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs index ecf5a63..07a9b14 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs @@ -57,14 +57,15 @@ this.gv_returnType = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); + this.txt_returnType = new Gs.DevApp.UserControl.UcDictionaryComBox(); this.btnSelect = new DevExpress.XtraEditors.SimpleButton(); this.lbGuid = new System.Windows.Forms.Label(); this.txt_thOrgId = new Gs.DevApp.UserControl.UcLookOrg(); - this.txt_returnType = new DevExpress.XtraEditors.ComboBoxEdit(); this.txt_billNo = new DevExpress.XtraEditors.TextEdit(); this.txt_checkDate = new DevExpress.XtraEditors.TextEdit(); this.txt_depotId = new Gs.DevApp.UserControl.UcLookCk(); @@ -84,10 +85,10 @@ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -106,8 +107,11 @@ this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -127,7 +131,6 @@ this.splitMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); this.layoutMx1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txt_returnType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit(); @@ -146,10 +149,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -242,7 +245,9 @@ this.gv_checkDate, this.gv_returnType, this.gv_depotId, - this.gv_remark}); + this.gv_remark, + this.gridColumn1, + this.gridColumn8}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -360,6 +365,14 @@ this.gv_remark.VisibleIndex = 8; this.gv_remark.Width = 94; // + // gridColumn1 + // + this.gridColumn1.Caption = "涓婚敭"; + this.gridColumn1.FieldName = "guid"; + this.gridColumn1.MinWidth = 25; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Width = 94; + // // pageBar1 // this.pageBar1.CurrentPage = 1; @@ -402,10 +415,10 @@ // // layoutMx1 // + this.layoutMx1.Controls.Add(this.txt_returnType); this.layoutMx1.Controls.Add(this.btnSelect); this.layoutMx1.Controls.Add(this.lbGuid); this.layoutMx1.Controls.Add(this.txt_thOrgId); - this.layoutMx1.Controls.Add(this.txt_returnType); this.layoutMx1.Controls.Add(this.txt_billNo); this.layoutMx1.Controls.Add(this.txt_checkDate); this.layoutMx1.Controls.Add(this.txt_depotId); @@ -426,6 +439,15 @@ this.layoutMx1.Size = new System.Drawing.Size(1126, 108); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; + // + // txt_returnType + // + this.txt_returnType.Location = new System.Drawing.Point(390, 12); + this.txt_returnType.Name = "txt_returnType"; + this.txt_returnType.Size = new System.Drawing.Size(170, 24); + this.txt_returnType.TabIndex = 533; + this.txt_returnType.TextTxt = ""; + this.txt_returnType.WhereTxt = "a.s_type=\'鐢熶骇閫�搴撳師鍥燶' and a.pid<>\'00000000-0000-0000-0000-000000000000\'"; // // btnSelect // @@ -451,44 +473,25 @@ this.txt_thOrgId.IsReadly = false; this.txt_thOrgId.Location = new System.Drawing.Point(114, 43); this.txt_thOrgId.Name = "txt_thOrgId"; - this.txt_thOrgId.Size = new System.Drawing.Size(165, 24); + this.txt_thOrgId.Size = new System.Drawing.Size(170, 24); this.txt_thOrgId.TabIndex = 526; - // - // txt_returnType - // - this.txt_returnType.EditValue = "-璇烽�夋嫨-"; - this.txt_returnType.Location = new System.Drawing.Point(385, 12); - this.txt_returnType.Name = "txt_returnType"; - this.txt_returnType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txt_returnType.Properties.Items.AddRange(new object[] { - "-璇烽�夋嫨-", - "TKYY01_SYS(璁㈠崟鏈夎)", - "TKYY02_SYS(鏁伴噺鏈夎)", - "TKYY03_SYS(缂栫爜鏈夎)", - "TKYY04_SYS(璐ㄩ噺闂)", - "TKYY05_SYS(鍖呰璋冩暣)"}); - this.txt_returnType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.txt_returnType.Size = new System.Drawing.Size(165, 24); - this.txt_returnType.StyleController = this.layoutMx1; - this.txt_returnType.TabIndex = 521; // // txt_billNo // this.txt_billNo.Location = new System.Drawing.Point(114, 12); this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Options.UseFont = true; - this.txt_billNo.Size = new System.Drawing.Size(165, 24); + this.txt_billNo.Size = new System.Drawing.Size(170, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 211; this.txt_billNo.Tag = "readonly"; // // txt_checkDate // - this.txt_checkDate.Location = new System.Drawing.Point(927, 43); + this.txt_checkDate.Location = new System.Drawing.Point(942, 43); this.txt_checkDate.Name = "txt_checkDate"; this.txt_checkDate.Properties.Appearance.Options.UseFont = true; - this.txt_checkDate.Size = new System.Drawing.Size(166, 24); + this.txt_checkDate.Size = new System.Drawing.Size(172, 24); this.txt_checkDate.StyleController = this.layoutMx1; this.txt_checkDate.TabIndex = 226; this.txt_checkDate.Tag = "readonly"; @@ -496,55 +499,55 @@ // txt_depotId // this.txt_depotId.IsReadly = false; - this.txt_depotId.Location = new System.Drawing.Point(385, 43); + this.txt_depotId.Location = new System.Drawing.Point(390, 43); this.txt_depotId.Margin = new System.Windows.Forms.Padding(0); this.txt_depotId.Name = "txt_depotId"; - this.txt_depotId.Size = new System.Drawing.Size(165, 24); + this.txt_depotId.Size = new System.Drawing.Size(170, 24); this.txt_depotId.TabIndex = 260; // // txt_remark // - this.txt_remark.Location = new System.Drawing.Point(385, 74); + this.txt_remark.Location = new System.Drawing.Point(390, 74); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Options.UseFont = true; - this.txt_remark.Size = new System.Drawing.Size(436, 24); + this.txt_remark.Size = new System.Drawing.Size(446, 24); this.txt_remark.StyleController = this.layoutMx1; this.txt_remark.TabIndex = 252; // // txt_checkUser // - this.txt_checkUser.Location = new System.Drawing.Point(927, 12); + this.txt_checkUser.Location = new System.Drawing.Point(942, 12); this.txt_checkUser.Name = "txt_checkUser"; this.txt_checkUser.Properties.Appearance.Options.UseFont = true; - this.txt_checkUser.Size = new System.Drawing.Size(166, 24); + this.txt_checkUser.Size = new System.Drawing.Size(172, 24); this.txt_checkUser.StyleController = this.layoutMx1; this.txt_checkUser.TabIndex = 222; this.txt_checkUser.Tag = "readonly"; // // txt_status // - this.txt_status.Location = new System.Drawing.Point(825, 74); + this.txt_status.Location = new System.Drawing.Point(840, 74); this.txt_status.Name = "txt_status"; this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑"; - this.txt_status.Size = new System.Drawing.Size(268, 24); + this.txt_status.Size = new System.Drawing.Size(274, 24); this.txt_status.StyleController = this.layoutMx1; this.txt_status.TabIndex = 528; this.txt_status.Tag = "readonly"; // // txt_lastUpdateUser // - this.txt_lastUpdateUser.Location = new System.Drawing.Point(656, 12); + this.txt_lastUpdateUser.Location = new System.Drawing.Point(666, 12); this.txt_lastUpdateUser.Name = "txt_lastUpdateUser"; - this.txt_lastUpdateUser.Size = new System.Drawing.Size(165, 24); + this.txt_lastUpdateUser.Size = new System.Drawing.Size(170, 24); this.txt_lastUpdateUser.StyleController = this.layoutMx1; this.txt_lastUpdateUser.TabIndex = 530; this.txt_lastUpdateUser.Tag = "readonly"; // // txt_lastUpdateTime // - this.txt_lastUpdateTime.Location = new System.Drawing.Point(656, 43); + this.txt_lastUpdateTime.Location = new System.Drawing.Point(666, 43); this.txt_lastUpdateTime.Name = "txt_lastUpdateTime"; - this.txt_lastUpdateTime.Size = new System.Drawing.Size(165, 24); + this.txt_lastUpdateTime.Size = new System.Drawing.Size(170, 24); this.txt_lastUpdateTime.StyleController = this.layoutMx1; this.txt_lastUpdateTime.TabIndex = 531; this.txt_lastUpdateTime.Tag = "readonly"; @@ -592,10 +595,10 @@ this.layoutControlItem14, this.layoutControlItem15, this.layoutControlItem11, - this.layoutControlItem6, this.layoutControlItem3, this.layoutControlItem7, - this.layoutControlItem16}); + this.layoutControlItem16, + this.layoutControlItem4}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -621,7 +624,7 @@ rowDefinition1, rowDefinition2, rowDefinition3}); - this.Root.Size = new System.Drawing.Size(1105, 113); + this.Root.Size = new System.Drawing.Size(1126, 113); this.Root.TextVisible = false; // // layoutControlItem1 @@ -629,7 +632,7 @@ this.layoutControlItem1.Control = this.txt_billNo; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(271, 31); + this.layoutControlItem1.Size = new System.Drawing.Size(276, 31); this.layoutControlItem1.Text = "鐢宠鍗曞彿"; this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); // @@ -639,94 +642,84 @@ this.layoutControlItem2.Location = new System.Drawing.Point(0, 31); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(271, 31); + this.layoutControlItem2.Size = new System.Drawing.Size(276, 31); this.layoutControlItem2.Text = "閫夋嫨缁勭粐"; this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem9 // this.layoutControlItem9.Control = this.txt_checkUser; - this.layoutControlItem9.Location = new System.Drawing.Point(813, 0); + this.layoutControlItem9.Location = new System.Drawing.Point(828, 0); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem9.Size = new System.Drawing.Size(272, 31); + this.layoutControlItem9.Size = new System.Drawing.Size(278, 31); this.layoutControlItem9.Text = "瀹℃牳浜哄憳"; this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_checkDate; - this.layoutControlItem10.Location = new System.Drawing.Point(813, 31); + this.layoutControlItem10.Location = new System.Drawing.Point(828, 31); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem10.Size = new System.Drawing.Size(272, 31); + this.layoutControlItem10.Size = new System.Drawing.Size(278, 31); this.layoutControlItem10.Text = "瀹℃牳鏃堕棿"; this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_lastUpdateUser; - this.layoutControlItem14.Location = new System.Drawing.Point(542, 0); + this.layoutControlItem14.Location = new System.Drawing.Point(552, 0); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem14.Size = new System.Drawing.Size(271, 31); + this.layoutControlItem14.Size = new System.Drawing.Size(276, 31); this.layoutControlItem14.Text = "鏈�鍚庢洿鏂颁汉鍛�"; this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_lastUpdateTime; - this.layoutControlItem15.Location = new System.Drawing.Point(542, 31); + this.layoutControlItem15.Location = new System.Drawing.Point(552, 31); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem15.Size = new System.Drawing.Size(271, 31); + this.layoutControlItem15.Size = new System.Drawing.Size(276, 31); this.layoutControlItem15.Text = "鏈�鍚庢洿鏂版椂闂�"; this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_status; - this.layoutControlItem11.Location = new System.Drawing.Point(813, 62); + this.layoutControlItem11.Location = new System.Drawing.Point(828, 62); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(272, 31); + this.layoutControlItem11.Size = new System.Drawing.Size(278, 31); this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑"; this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem11.TextVisible = false; // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txt_returnType; - this.layoutControlItem6.Location = new System.Drawing.Point(271, 0); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(271, 31); - this.layoutControlItem6.Text = "閫�搴撳師鍥�"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); - // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_depotId; - this.layoutControlItem3.Location = new System.Drawing.Point(271, 31); + this.layoutControlItem3.Location = new System.Drawing.Point(276, 31); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem3.Size = new System.Drawing.Size(271, 31); + this.layoutControlItem3.Size = new System.Drawing.Size(276, 31); this.layoutControlItem3.Text = "閫夋嫨浠撳簱"; this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_remark; - this.layoutControlItem7.Location = new System.Drawing.Point(271, 62); + this.layoutControlItem7.Location = new System.Drawing.Point(276, 62); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(542, 31); + this.layoutControlItem7.Size = new System.Drawing.Size(552, 31); this.layoutControlItem7.Text = "鐢宠澶囨敞"; this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); // @@ -738,11 +731,21 @@ this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem16.Size = new System.Drawing.Size(271, 31); + this.layoutControlItem16.Size = new System.Drawing.Size(276, 31); this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem16.Text = "閫�璐ф槑缁�"; this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem16.TextVisible = false; + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txt_returnType; + this.layoutControlItem4.Location = new System.Drawing.Point(276, 0); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem4.Size = new System.Drawing.Size(276, 31); + this.layoutControlItem4.Text = "閫�搴撳師鍥�"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); // // tabMx // @@ -790,7 +793,9 @@ this.gvMx1sqNum, this.gvMx1ysNum, this.gvMx1remark, - this.gvMxDel}); + this.gvMxDel, + this.gridColumn6, + this.gridColumn7}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -834,7 +839,7 @@ this.gvMx1ebeln.Name = "gvMx1ebeln"; this.gvMx1ebeln.Tag = "query_a.EBELN"; this.gvMx1ebeln.Visible = true; - this.gvMx1ebeln.VisibleIndex = 0; + this.gvMx1ebeln.VisibleIndex = 2; this.gvMx1ebeln.Width = 94; // // gvMx1itemId @@ -854,7 +859,7 @@ this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 1; + this.gridColumn2.VisibleIndex = 3; this.gridColumn2.Width = 94; // // gridColumn5 @@ -864,7 +869,7 @@ this.gridColumn5.MinWidth = 25; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 2; + this.gridColumn5.VisibleIndex = 4; this.gridColumn5.Width = 94; // // gridColumn3 @@ -874,7 +879,7 @@ this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 3; + this.gridColumn3.VisibleIndex = 5; this.gridColumn3.Width = 94; // // gridColumn4 @@ -884,7 +889,7 @@ this.gridColumn4.MinWidth = 25; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 4; + this.gridColumn4.VisibleIndex = 6; this.gridColumn4.Width = 94; // // gvMx1sqNum @@ -900,7 +905,7 @@ this.gvMx1sqNum.Name = "gvMx1sqNum"; this.gvMx1sqNum.Tag = "yz_quantity_0_edit"; this.gvMx1sqNum.Visible = true; - this.gvMx1sqNum.VisibleIndex = 5; + this.gvMx1sqNum.VisibleIndex = 7; this.gvMx1sqNum.Width = 94; // // gvMx1ysNum @@ -912,7 +917,7 @@ this.gvMx1ysNum.Name = "gvMx1ysNum"; this.gvMx1ysNum.Tag = "query_a.YS_NUM"; this.gvMx1ysNum.Visible = true; - this.gvMx1ysNum.VisibleIndex = 6; + this.gvMx1ysNum.VisibleIndex = 8; this.gvMx1ysNum.Width = 94; // // gvMx1remark @@ -928,7 +933,7 @@ this.gvMx1remark.Name = "gvMx1remark"; this.gvMx1remark.Tag = "edit"; this.gvMx1remark.Visible = true; - this.gvMx1remark.VisibleIndex = 7; + this.gvMx1remark.VisibleIndex = 9; this.gvMx1remark.Width = 94; // // gvMxDel @@ -938,7 +943,7 @@ this.gvMxDel.MinWidth = 25; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 8; + this.gvMxDel.VisibleIndex = 10; this.gvMxDel.Width = 94; // // repositoryItemButtonEdit1 @@ -952,6 +957,26 @@ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); // + // gridColumn6 + // + this.gridColumn6.Caption = "宸ュ崟鍙�"; + this.gridColumn6.FieldName = "daa001"; + this.gridColumn6.MinWidth = 25; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 0; + this.gridColumn6.Width = 94; + // + // gridColumn7 + // + this.gridColumn7.Caption = "浠诲姟鍗曞彿"; + this.gridColumn7.FieldName = "daa021"; + this.gridColumn7.MinWidth = 25; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 1; + this.gridColumn7.Width = 94; + // // picCheckBox // this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; @@ -962,6 +987,16 @@ this.picCheckBox.TabIndex = 8; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; + // + // gridColumn8 + // + this.gridColumn8.Caption = "閫�璐х粍缁�"; + this.gridColumn8.FieldName = "receivingOrg"; + this.gridColumn8.MinWidth = 25; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 9; + this.gridColumn8.Width = 94; // // Frm_MesSctkSq // @@ -992,7 +1027,6 @@ this.splitMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit(); this.layoutMx1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.txt_returnType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); @@ -1011,10 +1045,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1049,7 +1083,6 @@ private DevExpress.XtraLayout.LayoutControlGroup Root; private UserControl.UcLookOrg txt_thOrgId; private DevExpress.XtraEditors.SimpleButton btnSelect; - private DevExpress.XtraEditors.ComboBoxEdit txt_returnType; private UserControl.UcLookCk txt_depotId; private System.Windows.Forms.Label lbGuid; private DevExpress.XtraEditors.TextEdit txt_remark; @@ -1088,9 +1121,14 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; private DevExpress.Utils.ToolTipController tips; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private UserControl.UcDictionaryComBox txt_returnType; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; } } \ No newline at end of file -- Gitblit v1.9.3