From 7b51679795865eac61cea7b42f0ec535983cb7e5 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期六, 08 三月 2025 08:13:57 +0800 Subject: [PATCH] 受托 --- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs | 366 ++++++++------ DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.Designer.cs | 10 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs | 333 ++++++------- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs | 9 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs | 15 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs | 696 +++++++++++----------------- 6 files changed, 667 insertions(+), 762 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs index fd40d89..93f932b 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs @@ -48,20 +48,20 @@ this.split1 = new DevExpress.XtraEditors.SplitContainerControl(); this.gcMain1 = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_isFinish = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_isOut = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_returnType = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_lastUpdateUser = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_lastUpdateTime = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_returnMethod = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_returnType = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -81,13 +81,13 @@ this.txt_isFinish = new DevExpress.XtraEditors.CheckEdit(); this.txt_lastUpdateUser = new DevExpress.XtraEditors.TextEdit(); this.txt_lastUpdateTime = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -95,8 +95,8 @@ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -113,12 +113,12 @@ this.gvMx1sqNum = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1ysNum = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1orderNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.picCheckBox = new System.Windows.Forms.PictureBox(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -148,13 +148,13 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateUser.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateTime.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); @@ -162,8 +162,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -248,20 +248,20 @@ this.gridView1.Appearance.Row.Options.UseFont = true; this.gridView1.ColumnPanelRowHeight = 50; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { - this.gridColumn1, this.gv_status, this.gv_isFinish, - this.gv_isOut, + this.gv_returnType, this.gv_billNo, this.gv_lastUpdateUser, this.gv_lastUpdateTime, this.gv_checkUser, this.gv_checkDate, this.gv_returnMethod, - this.gv_returnType, this.gv_depotId, this.gv_suppId, - this.gv_remark}); + this.gv_remark, + this.gridColumn1, + this.gridColumn7}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -269,60 +269,46 @@ this.gridView1.OptionsView.ShowAutoFilterRow = true; this.gridView1.OptionsView.ShowGroupPanel = false; // - // gridColumn1 - // - this.gridColumn1.Caption = "閫�璐х粍缁�"; - this.gridColumn1.FieldName = "receivingOrg"; - this.gridColumn1.Name = "gridColumn1"; - this.gridColumn1.Tag = "org.fnamber"; - this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 0; - this.gridColumn1.Width = 250; - // // gv_status // this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_status.AppearanceCell.Options.UseFont = true; - this.gv_status.Caption = "瀹℃牳鐘舵��"; - this.gv_status.FieldName = "status"; - this.gv_status.MaxWidth = 50; - this.gv_status.MinWidth = 50; + this.gv_status.Caption = "瀹℃牳鏍囪瘑"; + this.gv_status.FieldName = "isCheck"; + this.gv_status.MinWidth = 25; this.gv_status.Name = "gv_status"; this.gv_status.OptionsColumn.AllowEdit = false; this.gv_status.Tag = "query_a.STATUS"; this.gv_status.Visible = true; - this.gv_status.VisibleIndex = 1; + this.gv_status.VisibleIndex = 0; this.gv_status.Width = 50; // // gv_isFinish // this.gv_isFinish.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_isFinish.AppearanceCell.Options.UseFont = true; - this.gv_isFinish.Caption = "鏄惁瀹屾垚"; + this.gv_isFinish.Caption = "瀹屾垚鏍囪瘑"; this.gv_isFinish.FieldName = "isFinish"; - this.gv_isFinish.MaxWidth = 50; - this.gv_isFinish.MinWidth = 50; + this.gv_isFinish.MinWidth = 25; this.gv_isFinish.Name = "gv_isFinish"; this.gv_isFinish.OptionsColumn.AllowEdit = false; this.gv_isFinish.Tag = "query_a.IS_FINISH"; this.gv_isFinish.Visible = true; - this.gv_isFinish.VisibleIndex = 2; + this.gv_isFinish.VisibleIndex = 1; this.gv_isFinish.Width = 50; // - // gv_isOut + // gv_returnType // - this.gv_isOut.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_isOut.AppearanceCell.Options.UseFont = true; - this.gv_isOut.Caption = "濮斿鏍囪瘑"; - this.gv_isOut.FieldName = "isOut"; - this.gv_isOut.MaxWidth = 50; - this.gv_isOut.MinWidth = 50; - this.gv_isOut.Name = "gv_isOut"; - this.gv_isOut.OptionsColumn.AllowEdit = false; - this.gv_isOut.Tag = "query_a.IS_OUT"; - this.gv_isOut.Visible = true; - this.gv_isOut.VisibleIndex = 3; - this.gv_isOut.Width = 50; + this.gv_returnType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_returnType.AppearanceCell.Options.UseFont = true; + this.gv_returnType.Caption = "鏈夋棤婧愬崟"; + this.gv_returnType.FieldName = "fIsLink"; + this.gv_returnType.Name = "gv_returnType"; + this.gv_returnType.OptionsColumn.AllowEdit = false; + this.gv_returnType.Tag = "query_a.RETURN_TYPE"; + this.gv_returnType.Visible = true; + this.gv_returnType.VisibleIndex = 2; + this.gv_returnType.Width = 94; // // gv_billNo // @@ -334,7 +320,7 @@ this.gv_billNo.OptionsColumn.AllowEdit = false; this.gv_billNo.Tag = "query_a.BILL_NO"; this.gv_billNo.Visible = true; - this.gv_billNo.VisibleIndex = 4; + this.gv_billNo.VisibleIndex = 3; this.gv_billNo.Width = 120; // // gv_lastUpdateUser @@ -342,12 +328,12 @@ this.gv_lastUpdateUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_lastUpdateUser.AppearanceCell.Options.UseFont = true; this.gv_lastUpdateUser.Caption = "鏈�鍚庤窡鏂颁汉 "; - this.gv_lastUpdateUser.FieldName = "lastUpdateUser"; + this.gv_lastUpdateUser.FieldName = "lastupdateBy"; this.gv_lastUpdateUser.Name = "gv_lastUpdateUser"; this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false; this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER"; this.gv_lastUpdateUser.Visible = true; - this.gv_lastUpdateUser.VisibleIndex = 5; + this.gv_lastUpdateUser.VisibleIndex = 4; this.gv_lastUpdateUser.Width = 94; // // gv_lastUpdateTime @@ -355,12 +341,12 @@ this.gv_lastUpdateTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true; this.gv_lastUpdateTime.Caption = "鏈�鍚庝慨鏀规椂闂� "; - this.gv_lastUpdateTime.FieldName = "lastUpdateTime"; + this.gv_lastUpdateTime.FieldName = "lastupdateDate"; this.gv_lastUpdateTime.Name = "gv_lastUpdateTime"; this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false; this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME"; this.gv_lastUpdateTime.Visible = true; - this.gv_lastUpdateTime.VisibleIndex = 6; + this.gv_lastUpdateTime.VisibleIndex = 5; this.gv_lastUpdateTime.Width = 180; // // gv_checkUser @@ -373,7 +359,7 @@ this.gv_checkUser.OptionsColumn.AllowEdit = false; this.gv_checkUser.Tag = "query_a.CHECK_USER"; this.gv_checkUser.Visible = true; - this.gv_checkUser.VisibleIndex = 7; + this.gv_checkUser.VisibleIndex = 6; this.gv_checkUser.Width = 94; // // gv_checkDate @@ -386,7 +372,7 @@ this.gv_checkDate.OptionsColumn.AllowEdit = false; this.gv_checkDate.Tag = "query_a.CHECK_DATE"; this.gv_checkDate.Visible = true; - this.gv_checkDate.VisibleIndex = 8; + this.gv_checkDate.VisibleIndex = 7; this.gv_checkDate.Width = 94; // // gv_returnMethod @@ -394,51 +380,38 @@ this.gv_returnMethod.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_returnMethod.AppearanceCell.Options.UseFont = true; this.gv_returnMethod.Caption = "閫�鏂欐柟寮� "; - this.gv_returnMethod.FieldName = "returnMethod"; + this.gv_returnMethod.FieldName = "fReturnStyle"; this.gv_returnMethod.Name = "gv_returnMethod"; this.gv_returnMethod.OptionsColumn.AllowEdit = false; this.gv_returnMethod.Tag = "query_a.RETURN_METHOD"; this.gv_returnMethod.Visible = true; - this.gv_returnMethod.VisibleIndex = 9; + this.gv_returnMethod.VisibleIndex = 8; this.gv_returnMethod.Width = 94; - // - // gv_returnType - // - this.gv_returnType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_returnType.AppearanceCell.Options.UseFont = true; - this.gv_returnType.Caption = "閫�鏂欑被鍨� "; - this.gv_returnType.FieldName = "returnType"; - this.gv_returnType.Name = "gv_returnType"; - this.gv_returnType.OptionsColumn.AllowEdit = false; - this.gv_returnType.Tag = "query_a.RETURN_TYPE"; - this.gv_returnType.Visible = true; - this.gv_returnType.VisibleIndex = 10; - this.gv_returnType.Width = 94; // // gv_depotId // this.gv_depotId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_depotId.AppearanceCell.Options.UseFont = true; - this.gv_depotId.Caption = "浠撳簱"; + this.gv_depotId.Caption = "浠撳簱鍚嶇О"; this.gv_depotId.FieldName = "dptName"; this.gv_depotId.Name = "gv_depotId"; this.gv_depotId.OptionsColumn.AllowEdit = false; this.gv_depotId.Tag = "query_a.DEPOT_ID"; this.gv_depotId.Visible = true; - this.gv_depotId.VisibleIndex = 11; + this.gv_depotId.VisibleIndex = 9; this.gv_depotId.Width = 94; // // gv_suppId // this.gv_suppId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_suppId.AppearanceCell.Options.UseFont = true; - this.gv_suppId.Caption = "渚涘簲鍟�"; - this.gv_suppId.FieldName = "supName"; + this.gv_suppId.Caption = "瀹㈡埛鍚嶇О"; + this.gv_suppId.FieldName = "cusName"; this.gv_suppId.Name = "gv_suppId"; this.gv_suppId.OptionsColumn.AllowEdit = false; this.gv_suppId.Tag = "query_a.SUPP_ID"; this.gv_suppId.Visible = true; - this.gv_suppId.VisibleIndex = 12; + this.gv_suppId.VisibleIndex = 10; this.gv_suppId.Width = 94; // // gv_remark @@ -451,8 +424,26 @@ this.gv_remark.OptionsColumn.AllowEdit = false; this.gv_remark.Tag = "query_a.REMARK"; this.gv_remark.Visible = true; - this.gv_remark.VisibleIndex = 13; + this.gv_remark.VisibleIndex = 12; this.gv_remark.Width = 94; + // + // gridColumn1 + // + this.gridColumn1.Caption = "搴撳瓨缁勭粐"; + this.gridColumn1.FieldName = "receivingOrg"; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Tag = "org.fnamber"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 11; + this.gridColumn1.Width = 250; + // + // gridColumn7 + // + this.gridColumn7.Caption = "涓婚敭Guid"; + this.gridColumn7.FieldName = "guid"; + this.gridColumn7.MinWidth = 25; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Width = 94; // // pageBar1 // @@ -490,7 +481,7 @@ this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.Size = new System.Drawing.Size(1126, 570); - this.splitMx1.SplitterPosition = 154; + this.splitMx1.SplitterPosition = 143; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -511,31 +502,34 @@ this.layoutMx1.Controls.Add(this.txt_lastUpdateUser); this.layoutMx1.Controls.Add(this.txt_lastUpdateTime); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem13}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; - this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(832, 224, 812, 500); + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(940, 409, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1126, 154); + this.layoutMx1.Size = new System.Drawing.Size(1126, 143); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_fIsLink // - this.txt_fIsLink.Location = new System.Drawing.Point(385, 120); + this.txt_fIsLink.EditValue = "1"; + this.txt_fIsLink.Location = new System.Drawing.Point(385, 76); this.txt_fIsLink.Margin = new System.Windows.Forms.Padding(0); this.txt_fIsLink.Name = "txt_fIsLink"; this.txt_fIsLink.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("1", "鏈夋簮鍗�"), + new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�", false)}); this.txt_fIsLink.Properties.Padding = new System.Windows.Forms.Padding(0); - this.txt_fIsLink.Size = new System.Drawing.Size(165, 32); + this.txt_fIsLink.Size = new System.Drawing.Size(165, 28); this.txt_fIsLink.StyleController = this.layoutMx1; this.txt_fIsLink.TabIndex = 533; // // txt_fCustId // this.txt_fCustId.IsReadly = false; - this.txt_fCustId.Location = new System.Drawing.Point(385, 48); + this.txt_fCustId.Location = new System.Drawing.Point(385, 44); this.txt_fCustId.Name = "txt_fCustId"; this.txt_fCustId.Size = new System.Drawing.Size(165, 28); this.txt_fCustId.TabIndex = 532; @@ -543,7 +537,7 @@ // btnSelect // this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16; - this.btnSelect.Location = new System.Drawing.Point(12, 120); + this.btnSelect.Location = new System.Drawing.Point(12, 108); this.btnSelect.Name = "btnSelect"; this.btnSelect.Size = new System.Drawing.Size(116, 27); this.btnSelect.StyleController = this.layoutMx1; @@ -552,9 +546,9 @@ // // lbGuid // - this.lbGuid.Location = new System.Drawing.Point(825, 120); + this.lbGuid.Location = new System.Drawing.Point(825, 103); this.lbGuid.Name = "lbGuid"; - this.lbGuid.Size = new System.Drawing.Size(268, 32); + this.lbGuid.Size = new System.Drawing.Size(268, 28); this.lbGuid.TabIndex = 1; this.lbGuid.Text = "lbGuid"; this.lbGuid.Visible = false; @@ -562,7 +556,7 @@ // txt_fStockOrgId // this.txt_fStockOrgId.IsReadly = false; - this.txt_fStockOrgId.Location = new System.Drawing.Point(114, 48); + this.txt_fStockOrgId.Location = new System.Drawing.Point(114, 44); this.txt_fStockOrgId.Name = "txt_fStockOrgId"; this.txt_fStockOrgId.Size = new System.Drawing.Size(165, 28); this.txt_fStockOrgId.TabIndex = 526; @@ -596,7 +590,7 @@ // // txt_checkDate // - this.txt_checkDate.Location = new System.Drawing.Point(927, 48); + this.txt_checkDate.Location = new System.Drawing.Point(927, 44); this.txt_checkDate.Name = "txt_checkDate"; this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_checkDate.Properties.Appearance.Options.UseFont = true; @@ -608,7 +602,7 @@ // txt_fStockId // this.txt_fStockId.IsReadly = false; - this.txt_fStockId.Location = new System.Drawing.Point(114, 84); + this.txt_fStockId.Location = new System.Drawing.Point(114, 76); this.txt_fStockId.Margin = new System.Windows.Forms.Padding(0); this.txt_fStockId.Name = "txt_fStockId"; this.txt_fStockId.Size = new System.Drawing.Size(165, 28); @@ -616,11 +610,11 @@ // // txt_remark // - this.txt_remark.Location = new System.Drawing.Point(385, 84); + this.txt_remark.Location = new System.Drawing.Point(385, 108); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_remark.Properties.Appearance.Options.UseFont = true; - this.txt_remark.Size = new System.Drawing.Size(165, 28); + this.txt_remark.Size = new System.Drawing.Size(436, 28); this.txt_remark.StyleController = this.layoutMx1; this.txt_remark.TabIndex = 252; // @@ -637,7 +631,7 @@ // // txt_status // - this.txt_status.Location = new System.Drawing.Point(825, 84); + this.txt_status.Location = new System.Drawing.Point(825, 76); this.txt_status.Name = "txt_status"; this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑"; this.txt_status.Size = new System.Drawing.Size(268, 24); @@ -647,7 +641,7 @@ // // txt_isFinish // - this.txt_isFinish.Location = new System.Drawing.Point(554, 84); + this.txt_isFinish.Location = new System.Drawing.Point(554, 76); this.txt_isFinish.Name = "txt_isFinish"; this.txt_isFinish.Properties.Caption = "瀹岀粨鏍囪瘑"; this.txt_isFinish.Size = new System.Drawing.Size(267, 24); @@ -666,12 +660,24 @@ // // txt_lastUpdateTime // - this.txt_lastUpdateTime.Location = new System.Drawing.Point(656, 48); + this.txt_lastUpdateTime.Location = new System.Drawing.Point(656, 44); this.txt_lastUpdateTime.Name = "txt_lastUpdateTime"; this.txt_lastUpdateTime.Size = new System.Drawing.Size(165, 24); this.txt_lastUpdateTime.StyleController = this.layoutMx1; this.txt_lastUpdateTime.TabIndex = 531; this.txt_lastUpdateTime.Tag = "readonly"; + // + // layoutControlItem13 + // + this.layoutControlItem13.Control = this.lbGuid; + this.layoutControlItem13.Location = new System.Drawing.Point(813, 96); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem13.Size = new System.Drawing.Size(272, 32); + this.layoutControlItem13.Text = "lbGuid"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem13.TextVisible = false; // // Root // @@ -683,7 +689,6 @@ this.layoutControlItem3, this.layoutControlItem9, this.layoutControlItem10, - this.layoutControlItem13, this.layoutControlItem14, this.layoutControlItem15, this.layoutControlItem16, @@ -691,8 +696,8 @@ this.layoutControlItem11, this.layoutControlItem5, this.layoutControlItem4, - this.layoutControlItem7, - this.layoutControlItem6}); + this.layoutControlItem6, + this.layoutControlItem7}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -721,7 +726,7 @@ rowDefinition2, rowDefinition3, rowDefinition4}); - this.Root.Size = new System.Drawing.Size(1105, 164); + this.Root.Size = new System.Drawing.Size(1105, 148); this.Root.TextVisible = false; // // layoutControlItem1 @@ -729,27 +734,27 @@ 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, 36); + this.layoutControlItem1.Size = new System.Drawing.Size(271, 32); this.layoutControlItem1.Text = "鐢宠鍗曞彿"; this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_fStockOrgId; - this.layoutControlItem2.Location = new System.Drawing.Point(0, 36); + this.layoutControlItem2.Location = new System.Drawing.Point(0, 32); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem2.Size = new System.Drawing.Size(271, 32); this.layoutControlItem2.Text = "閫夋嫨缁勭粐"; this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_fStockId; - this.layoutControlItem3.Location = new System.Drawing.Point(0, 72); + this.layoutControlItem3.Location = new System.Drawing.Point(0, 64); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem3.Size = new System.Drawing.Size(271, 32); this.layoutControlItem3.Text = "閫夋嫨浠撳簱"; this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); // @@ -759,32 +764,20 @@ this.layoutControlItem9.Location = new System.Drawing.Point(813, 0); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem9.Size = new System.Drawing.Size(272, 36); + this.layoutControlItem9.Size = new System.Drawing.Size(272, 32); 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, 36); + this.layoutControlItem10.Location = new System.Drawing.Point(813, 32); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem10.Size = new System.Drawing.Size(272, 36); + this.layoutControlItem10.Size = new System.Drawing.Size(272, 32); this.layoutControlItem10.Text = "瀹℃牳鏃堕棿"; this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem13 - // - this.layoutControlItem13.Control = this.lbGuid; - this.layoutControlItem13.Location = new System.Drawing.Point(813, 108); - this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(272, 36); - this.layoutControlItem13.Text = "lbGuid"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem13.TextVisible = false; // // layoutControlItem14 // @@ -792,30 +785,30 @@ this.layoutControlItem14.Location = new System.Drawing.Point(542, 0); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem14.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem14.Size = new System.Drawing.Size(271, 32); 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, 36); + this.layoutControlItem15.Location = new System.Drawing.Point(542, 32); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem15.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem15.Size = new System.Drawing.Size(271, 32); this.layoutControlItem15.Text = "鏈�鍚庢洿鏂版椂闂�"; this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.btnSelect; - this.layoutControlItem16.Location = new System.Drawing.Point(0, 108); + this.layoutControlItem16.Location = new System.Drawing.Point(0, 96); this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31); this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem16.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem16.Size = new System.Drawing.Size(271, 32); this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem16.Text = "閫�璐ф槑缁�"; this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0); @@ -824,11 +817,11 @@ // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_isFinish; - this.layoutControlItem12.Location = new System.Drawing.Point(542, 72); + this.layoutControlItem12.Location = new System.Drawing.Point(542, 64); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem12.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem12.Size = new System.Drawing.Size(271, 32); this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑"; this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem12.TextVisible = false; @@ -836,11 +829,11 @@ // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_status; - this.layoutControlItem11.Location = new System.Drawing.Point(813, 72); + this.layoutControlItem11.Location = new System.Drawing.Point(813, 64); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(272, 36); + this.layoutControlItem11.Size = new System.Drawing.Size(272, 32); this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑"; this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem11.TextVisible = false; @@ -851,42 +844,45 @@ this.layoutControlItem5.Location = new System.Drawing.Point(271, 0); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem5.Size = new System.Drawing.Size(271, 32); this.layoutControlItem5.Text = "閫�鏂欐柟寮�"; this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_fCustId; - this.layoutControlItem4.Location = new System.Drawing.Point(271, 36); + this.layoutControlItem4.Location = new System.Drawing.Point(271, 32); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem4.Size = new System.Drawing.Size(271, 32); this.layoutControlItem4.Text = "閫夋嫨瀹㈡埛"; this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem7 - // - this.layoutControlItem7.Control = this.txt_remark; - this.layoutControlItem7.Location = new System.Drawing.Point(271, 72); - this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(271, 36); - this.layoutControlItem7.Text = "閫�璐у娉�"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_fIsLink; - this.layoutControlItem6.Location = new System.Drawing.Point(271, 108); + this.layoutControlItem6.Location = new System.Drawing.Point(271, 64); + this.layoutControlItem6.MinSize = new System.Drawing.Size(246, 30); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem6.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem6.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem6.Text = "鏈夋棤婧愬崟"; this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem7 + // + this.layoutControlItem7.Control = this.txt_remark; + this.layoutControlItem7.Location = new System.Drawing.Point(271, 96); + this.layoutControlItem7.Name = "layoutControlItem7"; + this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem7.Size = new System.Drawing.Size(542, 32); + this.layoutControlItem7.Text = "閫�璐у娉�"; + this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); // // tabMx // @@ -894,7 +890,7 @@ this.tabMx.Location = new System.Drawing.Point(0, 0); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; - this.tabMx.Size = new System.Drawing.Size(1126, 404); + this.tabMx.Size = new System.Drawing.Size(1126, 415); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -903,7 +899,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1124, 372); + this.tabMxPage1.Size = new System.Drawing.Size(1124, 383); this.tabMxPage1.Text = "鐢宠鏄庣粏"; // // gcMx1 @@ -915,7 +911,7 @@ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1, this.repositoryItemComboBox1}); - this.gcMx1.Size = new System.Drawing.Size(1124, 372); + this.gcMx1.Size = new System.Drawing.Size(1124, 383); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -935,8 +931,8 @@ this.gvMx1sqNum, this.gvMx1ysNum, this.gvMx1remark, - this.gvMx1orderNo, this.gridColumn6, + this.gridColumn8, this.gvMxDel}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; @@ -984,7 +980,7 @@ this.gvMx1invBillNo.Name = "gvMx1invBillNo"; this.gvMx1invBillNo.Tag = "query_a.INV_BILL_NO"; this.gvMx1invBillNo.Visible = true; - this.gvMx1invBillNo.VisibleIndex = 1; + this.gvMx1invBillNo.VisibleIndex = 0; this.gvMx1invBillNo.Width = 94; // // gvMx1itemId @@ -997,7 +993,7 @@ this.gvMx1itemId.Name = "gvMx1itemId"; this.gvMx1itemId.Tag = "query_a.ITEM_ID"; this.gvMx1itemId.Visible = true; - this.gvMx1itemId.VisibleIndex = 0; + this.gvMx1itemId.VisibleIndex = 1; this.gvMx1itemId.Width = 94; // // gridColumn2 @@ -1037,7 +1033,7 @@ this.gridColumn4.MinWidth = 25; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 6; + this.gridColumn4.VisibleIndex = 5; this.gridColumn4.Width = 94; // // gvMx1sqNum @@ -1054,7 +1050,7 @@ this.gvMx1sqNum.Name = "gvMx1sqNum"; this.gvMx1sqNum.Tag = "yz_quantity_0_edit"; this.gvMx1sqNum.Visible = true; - this.gvMx1sqNum.VisibleIndex = 5; + this.gvMx1sqNum.VisibleIndex = 6; this.gvMx1sqNum.Width = 94; // // gvMx1ysNum @@ -1084,19 +1080,8 @@ this.gvMx1remark.Name = "gvMx1remark"; this.gvMx1remark.Tag = "edit"; this.gvMx1remark.Visible = true; - this.gvMx1remark.VisibleIndex = 9; + this.gvMx1remark.VisibleIndex = 8; this.gvMx1remark.Width = 94; - // - // gvMx1orderNo - // - this.gvMx1orderNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1orderNo.AppearanceCell.Options.UseFont = true; - this.gvMx1orderNo.Caption = "搴忓彿"; - this.gvMx1orderNo.FieldName = "fIdx"; - this.gvMx1orderNo.MinWidth = 50; - this.gvMx1orderNo.Name = "gvMx1orderNo"; - this.gvMx1orderNo.Tag = "query_a.ORDER_NO"; - this.gvMx1orderNo.Width = 94; // // gridColumn6 // @@ -1111,7 +1096,7 @@ this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Tag = "edit"; this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 8; + this.gridColumn6.VisibleIndex = 9; this.gridColumn6.Width = 94; // // repositoryItemComboBox1 @@ -1142,7 +1127,7 @@ this.gvMxDel.MinWidth = 25; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 10; + this.gvMxDel.VisibleIndex = 11; this.gvMxDel.Width = 94; // // repositoryItemButtonEdit1 @@ -1166,6 +1151,16 @@ this.picCheckBox.TabIndex = 8; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; + // + // gridColumn8 + // + this.gridColumn8.Caption = "娆″簭"; + this.gridColumn8.FieldName = "fidx"; + this.gridColumn8.MinWidth = 25; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 10; + this.gridColumn8.Width = 94; // // Frm_MesShouTui // @@ -1206,13 +1201,13 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateUser.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateTime.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); @@ -1220,8 +1215,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1244,7 +1239,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private DevExpress.XtraGrid.Columns.GridColumn gv_status; private DevExpress.XtraGrid.Columns.GridColumn gv_isFinish; - private DevExpress.XtraGrid.Columns.GridColumn gv_isOut; private DevExpress.XtraGrid.Columns.GridColumn gv_billNo; private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateUser; private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateTime; @@ -1297,7 +1291,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMx1sqNum; private DevExpress.XtraGrid.Columns.GridColumn gvMx1ysNum; private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1orderNo; private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; @@ -1306,10 +1299,12 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraEditors.RadioGroup txt_fIsLink; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs index e03800a..aabf5f7 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs @@ -86,7 +86,7 @@ _row["wlmc"] = dym.itemName; _row["wlgg"] = dym.itemModel; _row["dwName"] = dym.dwName; - _row["fQty"] = dym.rksl; + _row["fQty"] = dym.kt; _row["sQty"] = 0; _row["itemId"] = dym.itemId; _Table.Rows.Add(_row); @@ -95,6 +95,7 @@ gcMx1.DataSource = _Table; gcMx1.ForceInitialize(); gvMx1.CloseEditor(); + gvMx1.PostEditor(); gvMx1.UpdateCurrentRow(); } catch (Exception ex) @@ -308,7 +309,7 @@ var _ckId = txt_fStockId.GetId(); var _khId = txt_fCustId.GetId(); string _orgId = txt_fStockOrgId.GetId(); - + int _fIsLink= txt_fIsLink.SelectedIndex==0?1:0; if (string.IsNullOrEmpty(_orgId)) { MsgHelper.Warning("璇烽�夋嫨缁勭粐锛�"); @@ -340,12 +341,14 @@ Remark = txt_remark.Text.Trim(), //澶囨敞 CusId = int.Parse(_khId), DepotId = int.Parse(_ckId), - FIsLink = txt_fIsLink.SelectedIndex == 0 , + FIsLink = _fIsLink,//鏈夋棤婧愬崟 FReturnStyle = txt_fReturnStyle.Text,//閫�鏂欐柟寮� list = new List<dynamic>(), - }; + }; gvMx1.PostEditor(); gvMx1.CloseEditor(); gvMx1.UpdateCurrentRow(); + + if (gvMx1.DataRowCount <= 0) { MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�"); @@ -363,9 +366,9 @@ MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�"); return; } - if (string.IsNullOrEmpty(_msl)) + if (string.IsNullOrEmpty(row["fStockStatusId"].ToString()) || row["fStockStatusId"].ToString()=="璇烽�夋嫨") { - MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�"); + MsgHelper.ShowError("璇烽�夋嫨搴撳瓨鐘舵�侊紒"); return; } _obj.list.Add(new diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs index 51ea280..97213f4 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs @@ -53,18 +53,18 @@ this.gcMain1 = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gv_qt015 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_qt014 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_qtck = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_qt005 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_qt001 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_qt016 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_qt002 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_qt010 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv18 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); @@ -82,19 +82,21 @@ this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); this.txt_guid = new DevExpress.XtraEditors.TextEdit(); + this.txt_isFinish = new DevExpress.XtraEditors.CheckEdit(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -108,6 +110,7 @@ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1qd002 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1qd003 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1qd004 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -116,9 +119,9 @@ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1qd009 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); - this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.panelMx1 = new DevExpress.XtraEditors.PanelControl(); this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint(); this.lbMxGuid = new DevExpress.XtraEditors.LabelControl(); @@ -180,19 +183,21 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -289,18 +294,18 @@ this.gridView1.ColumnPanelRowHeight = 50; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gv_qt015, - this.gv_qt014, + this.gridColumn21, this.gv_qtck, + this.gridColumn14, + this.gridColumn17, + this.gridColumn18, + this.gridColumn19, this.gv_qt005, this.gv_qt001, this.gv_qt016, this.gv_qt002, this.gv_qt010, this.gridColumn13, - this.gridColumn14, - this.gridColumn17, - this.gridColumn18, - this.gridColumn19, this.gv18}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; @@ -315,8 +320,7 @@ this.gv_qt015.AppearanceCell.Options.UseFont = true; this.gv_qt015.Caption = "瀹℃牳鐘舵�� "; this.gv_qt015.FieldName = "isCheck"; - this.gv_qt015.MaxWidth = 50; - this.gv_qt015.MinWidth = 50; + this.gv_qt015.MinWidth = 25; this.gv_qt015.Name = "gv_qt015"; this.gv_qt015.OptionsColumn.AllowEdit = false; this.gv_qt015.Tag = "query_a.qt015"; @@ -324,20 +328,15 @@ this.gv_qt015.VisibleIndex = 0; this.gv_qt015.Width = 50; // - // gv_qt014 + // gridColumn21 // - this.gv_qt014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_qt014.AppearanceCell.Options.UseFont = true; - this.gv_qt014.Caption = "瀹岀粨鏍囪瘑 "; - this.gv_qt014.FieldName = "isFinish"; - this.gv_qt014.MaxWidth = 50; - this.gv_qt014.MinWidth = 50; - this.gv_qt014.Name = "gv_qt014"; - this.gv_qt014.OptionsColumn.AllowEdit = false; - this.gv_qt014.Tag = "query_a.qt014"; - this.gv_qt014.Visible = true; - this.gv_qt014.VisibleIndex = 1; - this.gv_qt014.Width = 50; + this.gridColumn21.Caption = "瀹岀粨鏍囪瘑"; + this.gridColumn21.FieldName = "isFinish"; + this.gridColumn21.MinWidth = 25; + this.gridColumn21.Name = "gridColumn21"; + this.gridColumn21.Visible = true; + this.gridColumn21.VisibleIndex = 1; + this.gridColumn21.Width = 94; // // gv_qtck // @@ -353,6 +352,46 @@ this.gv_qtck.VisibleIndex = 2; this.gv_qtck.Width = 180; // + // gridColumn14 + // + this.gridColumn14.Caption = "瀹㈡埛ID"; + this.gridColumn14.FieldName = "fCustId"; + this.gridColumn14.MinWidth = 25; + this.gridColumn14.Name = "gridColumn14"; + this.gridColumn14.Visible = true; + this.gridColumn14.VisibleIndex = 3; + this.gridColumn14.Width = 94; + // + // gridColumn17 + // + this.gridColumn17.Caption = "瀹㈡埛鍚嶇О"; + this.gridColumn17.FieldName = "fCustName"; + this.gridColumn17.MinWidth = 25; + this.gridColumn17.Name = "gridColumn17"; + this.gridColumn17.Visible = true; + this.gridColumn17.VisibleIndex = 4; + this.gridColumn17.Width = 94; + // + // gridColumn18 + // + this.gridColumn18.Caption = "浠撳簱ID"; + this.gridColumn18.FieldName = "fStockOrgId"; + this.gridColumn18.MinWidth = 25; + this.gridColumn18.Name = "gridColumn18"; + this.gridColumn18.Visible = true; + this.gridColumn18.VisibleIndex = 5; + this.gridColumn18.Width = 94; + // + // gridColumn19 + // + this.gridColumn19.Caption = "浠撳簱鍚嶇О"; + this.gridColumn19.FieldName = "fStockOrgName"; + this.gridColumn19.MinWidth = 25; + this.gridColumn19.Name = "gridColumn19"; + this.gridColumn19.Visible = true; + this.gridColumn19.VisibleIndex = 6; + this.gridColumn19.Width = 94; + // // gv_qt005 // this.gv_qt005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); @@ -364,7 +403,7 @@ this.gv_qt005.OptionsColumn.AllowEdit = false; this.gv_qt005.Tag = "query_a.qt005"; this.gv_qt005.Visible = true; - this.gv_qt005.VisibleIndex = 3; + this.gv_qt005.VisibleIndex = 7; this.gv_qt005.Width = 94; // // gv_qt001 @@ -378,7 +417,7 @@ this.gv_qt001.OptionsColumn.AllowEdit = false; this.gv_qt001.Tag = "query_a.qt001"; this.gv_qt001.Visible = true; - this.gv_qt001.VisibleIndex = 4; + this.gv_qt001.VisibleIndex = 8; this.gv_qt001.Width = 200; // // gv_qt016 @@ -392,7 +431,7 @@ this.gv_qt016.OptionsColumn.AllowEdit = false; this.gv_qt016.Tag = "query_a.qt016"; this.gv_qt016.Visible = true; - this.gv_qt016.VisibleIndex = 5; + this.gv_qt016.VisibleIndex = 9; this.gv_qt016.Width = 94; // // gv_qt002 @@ -406,7 +445,7 @@ this.gv_qt002.OptionsColumn.AllowEdit = false; this.gv_qt002.Tag = "query_a.qt002"; this.gv_qt002.Visible = true; - this.gv_qt002.VisibleIndex = 6; + this.gv_qt002.VisibleIndex = 10; this.gv_qt002.Width = 180; // // gv_qt010 @@ -420,7 +459,7 @@ this.gv_qt010.OptionsColumn.AllowEdit = false; this.gv_qt010.Tag = "query_a.qt010"; this.gv_qt010.Visible = true; - this.gv_qt010.VisibleIndex = 7; + this.gv_qt010.VisibleIndex = 11; this.gv_qt010.Width = 94; // // gridColumn13 @@ -430,48 +469,8 @@ this.gridColumn13.MinWidth = 25; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Visible = true; - this.gridColumn13.VisibleIndex = 8; + this.gridColumn13.VisibleIndex = 12; this.gridColumn13.Width = 94; - // - // gridColumn14 - // - this.gridColumn14.Caption = "瀹㈡埛ID"; - this.gridColumn14.FieldName = "fCustId"; - this.gridColumn14.MinWidth = 25; - this.gridColumn14.Name = "gridColumn14"; - this.gridColumn14.Visible = true; - this.gridColumn14.VisibleIndex = 9; - this.gridColumn14.Width = 94; - // - // gridColumn17 - // - this.gridColumn17.Caption = "瀹㈡埛鍚嶇О"; - this.gridColumn17.FieldName = "fCustName"; - this.gridColumn17.MinWidth = 25; - this.gridColumn17.Name = "gridColumn17"; - this.gridColumn17.Visible = true; - this.gridColumn17.VisibleIndex = 11; - this.gridColumn17.Width = 94; - // - // gridColumn18 - // - this.gridColumn18.Caption = "浠撳簱ID"; - this.gridColumn18.FieldName = "fStockOrgId"; - this.gridColumn18.MinWidth = 25; - this.gridColumn18.Name = "gridColumn18"; - this.gridColumn18.Visible = true; - this.gridColumn18.VisibleIndex = 12; - this.gridColumn18.Width = 94; - // - // gridColumn19 - // - this.gridColumn19.Caption = "浠撳簱鍚嶇О"; - this.gridColumn19.FieldName = "fStockOrgName"; - this.gridColumn19.MinWidth = 25; - this.gridColumn19.Name = "gridColumn19"; - this.gridColumn19.Visible = true; - this.gridColumn19.VisibleIndex = 13; - this.gridColumn19.Width = 94; // // gv18 // @@ -479,8 +478,6 @@ this.gv18.FieldName = "guid"; this.gv18.MinWidth = 25; this.gv18.Name = "gv18"; - this.gv18.Visible = true; - this.gv18.VisibleIndex = 10; this.gv18.Width = 94; // // pageBar1 @@ -519,7 +516,7 @@ this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.Size = new System.Drawing.Size(1167, 570); - this.splitMx1.SplitterPosition = 109; + this.splitMx1.SplitterPosition = 104; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -536,46 +533,50 @@ this.layoutMx1.Controls.Add(this.txt_createBy); this.layoutMx1.Controls.Add(this.txt_createDate); this.layoutMx1.Controls.Add(this.txt_guid); + this.layoutMx1.Controls.Add(this.txt_isFinish); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem2, + this.layoutControlItem12}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(567, 356, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1167, 109); + this.layoutMx1.Size = new System.Drawing.Size(1167, 104); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_fCustId // this.txt_fCustId.IsReadly = false; - this.txt_fCustId.Location = new System.Drawing.Point(84, 76); + this.txt_fCustId.Location = new System.Drawing.Point(370, 44); this.txt_fCustId.Name = "txt_fCustId"; - this.txt_fCustId.Size = new System.Drawing.Size(210, 28); + this.txt_fCustId.Size = new System.Drawing.Size(211, 28); this.txt_fCustId.TabIndex = 333; // // lbGuid // - this.lbGuid.Location = new System.Drawing.Point(585, 76); + this.lbGuid.Location = new System.Drawing.Point(574, 76); this.lbGuid.Name = "lbGuid"; - this.lbGuid.Size = new System.Drawing.Size(283, 28); + this.lbGuid.Size = new System.Drawing.Size(277, 28); this.lbGuid.TabIndex = 1; this.lbGuid.Text = "lbGuid"; this.lbGuid.Visible = false; // // txt_remark // - this.txt_remark.Location = new System.Drawing.Point(370, 76); + this.txt_remark.Location = new System.Drawing.Point(84, 76); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_remark.Properties.Appearance.Options.UseFont = true; - this.txt_remark.Size = new System.Drawing.Size(211, 28); + this.txt_remark.Size = new System.Drawing.Size(497, 28); this.txt_remark.StyleController = this.layoutMx1; this.txt_remark.TabIndex = 240; // // txt_fStockId // this.txt_fStockId.IsReadly = false; - this.txt_fStockId.Location = new System.Drawing.Point(370, 44); + this.txt_fStockId.Location = new System.Drawing.Point(370, 12); this.txt_fStockId.Margin = new System.Windows.Forms.Padding(0); this.txt_fStockId.Name = "txt_fStockId"; this.txt_fStockId.Size = new System.Drawing.Size(211, 28); @@ -652,12 +653,44 @@ // // txt_guid // - this.txt_guid.Location = new System.Drawing.Point(370, 12); + this.txt_guid.Location = new System.Drawing.Point(365, 12); this.txt_guid.Name = "txt_guid"; - this.txt_guid.Size = new System.Drawing.Size(211, 24); + this.txt_guid.Size = new System.Drawing.Size(205, 24); this.txt_guid.StyleController = this.layoutMx1; this.txt_guid.TabIndex = 334; this.txt_guid.Tag = "readonly"; + // + // txt_isFinish + // + this.txt_isFinish.Location = new System.Drawing.Point(585, 76); + this.txt_isFinish.Name = "txt_isFinish"; + this.txt_isFinish.Properties.Caption = "瀹岀粨鐘舵��"; + this.txt_isFinish.Size = new System.Drawing.Size(283, 24); + this.txt_isFinish.StyleController = this.layoutMx1; + this.txt_isFinish.TabIndex = 335; + this.txt_isFinish.Tag = "readonly"; + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txt_guid; + this.layoutControlItem2.Location = new System.Drawing.Point(281, 0); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem2.Size = new System.Drawing.Size(281, 32); + this.layoutControlItem2.Text = "涓婚敭Guid"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.lbGuid; + this.layoutControlItem12.Location = new System.Drawing.Point(562, 64); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem12.Size = new System.Drawing.Size(281, 32); + this.layoutControlItem12.Text = "lbGuid"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem12.TextVisible = false; // // Root // @@ -669,13 +702,12 @@ this.layoutControlItem9, this.layoutControlItem10, this.layoutControlItem11, - this.layoutControlItem6, this.layoutControlItem14, this.layoutControlItem15, this.layoutControlItem8, - this.layoutControlItem13, - this.layoutControlItem12, - this.layoutControlItem2}); + this.layoutControlItem3, + this.layoutControlItem6, + this.layoutControlItem13}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -756,16 +788,6 @@ this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem11.TextVisible = false; // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txt_fCustId; - this.layoutControlItem6.Location = new System.Drawing.Point(0, 64); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem6.Size = new System.Drawing.Size(286, 32); - this.layoutControlItem6.Text = "閫夋嫨瀹㈡埛"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); - // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_createBy; @@ -791,46 +813,46 @@ // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_fStockId; - this.layoutControlItem8.Location = new System.Drawing.Point(286, 32); + this.layoutControlItem8.Location = new System.Drawing.Point(286, 0); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem8.Size = new System.Drawing.Size(287, 32); this.layoutControlItem8.Text = "鏀舵枡浠撳簱"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txt_isFinish; + this.layoutControlItem3.Location = new System.Drawing.Point(573, 64); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem3.Size = new System.Drawing.Size(287, 32); + this.layoutControlItem3.Text = "瀹岀粨鏍囪瘑"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem3.TextVisible = false; + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.txt_fCustId; + this.layoutControlItem6.Location = new System.Drawing.Point(286, 32); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem6.Size = new System.Drawing.Size(287, 32); + this.layoutControlItem6.Text = "閫夋嫨瀹㈡埛"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); + // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_remark; - this.layoutControlItem13.Location = new System.Drawing.Point(286, 64); + this.layoutControlItem13.Location = new System.Drawing.Point(0, 64); this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem13.Size = new System.Drawing.Size(287, 32); + this.layoutControlItem13.Size = new System.Drawing.Size(573, 32); this.layoutControlItem13.Text = "鍏ュ簱鍘熷洜"; this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem12 - // - this.layoutControlItem12.Control = this.lbGuid; - this.layoutControlItem12.Location = new System.Drawing.Point(573, 64); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem12.Size = new System.Drawing.Size(287, 32); - this.layoutControlItem12.Text = "lbGuid"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem12.TextVisible = false; - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.txt_guid; - this.layoutControlItem2.Location = new System.Drawing.Point(286, 0); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(287, 32); - this.layoutControlItem2.Text = "涓婚敭Guid"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // tabMx // @@ -838,7 +860,7 @@ this.tabMx.Location = new System.Drawing.Point(0, 0); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; - this.tabMx.Size = new System.Drawing.Size(1167, 449); + this.tabMx.Size = new System.Drawing.Size(1167, 454); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, @@ -849,7 +871,7 @@ this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Controls.Add(this.panelMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1165, 417); + this.tabMxPage1.Size = new System.Drawing.Size(1165, 422); this.tabMxPage1.Text = "鐗╂枡鏄庣粏"; // // gcMx1 @@ -861,7 +883,7 @@ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1, this.repositoryItemSearchLookUpEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1165, 315); + this.gcMx1.Size = new System.Drawing.Size(1165, 320); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -871,6 +893,7 @@ this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gvMx1guid, this.gridColumn1, + this.gridColumn12, this.gvMx1qd002, this.gvMx1qd003, this.gvMx1qd004, @@ -879,8 +902,8 @@ this.gridColumn15, this.gridColumn16, this.gvMx1qd009, - this.gvMxDel, - this.gridColumn12}); + this.gridColumn20, + this.gvMxDel}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -991,6 +1014,16 @@ this.gridColumn11.VisibleIndex = 4; this.gridColumn11.Width = 120; // + // gridColumn12 + // + this.gridColumn12.Caption = "鐗╂枡ID"; + this.gridColumn12.FieldName = "itemId"; + this.gridColumn12.MinWidth = 25; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 1; + this.gridColumn12.Width = 94; + // // gvMx1qd002 // this.gvMx1qd002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); @@ -1003,7 +1036,7 @@ this.gvMx1qd002.OptionsColumn.ReadOnly = true; this.gvMx1qd002.Tag = "query_a.qd002"; this.gvMx1qd002.Visible = true; - this.gvMx1qd002.VisibleIndex = 1; + this.gvMx1qd002.VisibleIndex = 2; this.gvMx1qd002.Width = 150; // // gvMx1qd003 @@ -1018,7 +1051,7 @@ this.gvMx1qd003.OptionsColumn.ReadOnly = true; this.gvMx1qd003.Tag = "query_a.qd003"; this.gvMx1qd003.Visible = true; - this.gvMx1qd003.VisibleIndex = 2; + this.gvMx1qd003.VisibleIndex = 3; this.gvMx1qd003.Width = 150; // // gvMx1qd004 @@ -1033,7 +1066,7 @@ this.gvMx1qd004.OptionsColumn.ReadOnly = true; this.gvMx1qd004.Tag = "query_a.qd004"; this.gvMx1qd004.Visible = true; - this.gvMx1qd004.VisibleIndex = 3; + this.gvMx1qd004.VisibleIndex = 4; this.gvMx1qd004.Width = 250; // // gvMx1qd007 @@ -1050,7 +1083,7 @@ this.gvMx1qd007.Name = "gvMx1qd007"; this.gvMx1qd007.Tag = "edit"; this.gvMx1qd007.Visible = true; - this.gvMx1qd007.VisibleIndex = 4; + this.gvMx1qd007.VisibleIndex = 5; this.gvMx1qd007.Width = 94; // // gvMx1qd010 @@ -1067,7 +1100,7 @@ this.gvMx1qd010.Name = "gvMx1qd010"; this.gvMx1qd010.Tag = "edit"; this.gvMx1qd010.Visible = true; - this.gvMx1qd010.VisibleIndex = 5; + this.gvMx1qd010.VisibleIndex = 6; this.gvMx1qd010.Width = 250; // // gridColumn15 @@ -1077,7 +1110,7 @@ this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; - this.gridColumn15.VisibleIndex = 6; + this.gridColumn15.VisibleIndex = 7; this.gridColumn15.Width = 94; // // gridColumn16 @@ -1087,7 +1120,7 @@ this.gridColumn16.MinWidth = 25; this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.Visible = true; - this.gridColumn16.VisibleIndex = 7; + this.gridColumn16.VisibleIndex = 8; this.gridColumn16.Width = 94; // // gvMx1qd009 @@ -1102,8 +1135,18 @@ this.gvMx1qd009.OptionsColumn.ReadOnly = true; this.gvMx1qd009.Tag = "query_a.qd009"; this.gvMx1qd009.Visible = true; - this.gvMx1qd009.VisibleIndex = 8; + this.gvMx1qd009.VisibleIndex = 9; this.gvMx1qd009.Width = 94; + // + // gridColumn20 + // + this.gridColumn20.Caption = "娆″簭"; + this.gridColumn20.FieldName = "fidx"; + this.gridColumn20.MinWidth = 25; + this.gridColumn20.Name = "gridColumn20"; + this.gridColumn20.Visible = true; + this.gridColumn20.VisibleIndex = 10; + this.gridColumn20.Width = 94; // // gvMxDel // @@ -1112,7 +1155,7 @@ this.gvMxDel.MinWidth = 25; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 9; + this.gvMxDel.VisibleIndex = 11; this.gvMxDel.Width = 94; // // repositoryItemButtonEdit1 @@ -1125,14 +1168,6 @@ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); - // - // gridColumn12 - // - this.gridColumn12.Caption = "鐗╂枡ID"; - this.gridColumn12.FieldName = "itemId"; - this.gridColumn12.MinWidth = 25; - this.gridColumn12.Name = "gridColumn12"; - this.gridColumn12.Width = 94; // // panelMx1 // @@ -1326,7 +1361,7 @@ // this.xtraTabPage3.Controls.Add(this.gcMx2); this.xtraTabPage3.Name = "xtraTabPage3"; - this.xtraTabPage3.Size = new System.Drawing.Size(1165, 417); + this.xtraTabPage3.Size = new System.Drawing.Size(1165, 422); this.xtraTabPage3.Text = "宸叉墦鍗版潯鐮佹槑缁�"; // // gcMx2 @@ -1337,7 +1372,7 @@ this.gcMx2.Name = "gcMx2"; this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit2}); - this.gcMx2.Size = new System.Drawing.Size(1165, 417); + this.gcMx2.Size = new System.Drawing.Size(1165, 422); this.gcMx2.TabIndex = 2; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -1533,19 +1568,21 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1583,7 +1620,6 @@ private DevExpress.XtraGrid.GridControl gcMain1; private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private DevExpress.XtraGrid.Columns.GridColumn gv_qt015; - private DevExpress.XtraGrid.Columns.GridColumn gv_qt014; private DevExpress.XtraGrid.Columns.GridColumn gv_qtck; private DevExpress.XtraGrid.Columns.GridColumn gv_qt005; private DevExpress.XtraGrid.Columns.GridColumn gv_qt001; @@ -1668,12 +1704,9 @@ private DevExpress.XtraEditors.TextEdit txt_createBy; private DevExpress.XtraEditors.TextEdit txt_createDate; private UserControl.UcLookCustomer txt_fCustId; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraEditors.TextEdit txt_guid; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraGrid.Columns.GridColumn gv18; @@ -1681,5 +1714,12 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; + private DevExpress.XtraEditors.CheckEdit txt_isFinish; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs index beadcfe..e74954e 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs @@ -47,7 +47,6 @@ }); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; - //閫夋嫨搴撳瓨缁勭粐锛堝彉鏄庣粏涓殑鐗╂枡鍜屽彉璐т富锛� this.txt_fStockOrgId.EditChanged += (s, e) => { @@ -308,10 +307,10 @@ txt_fStockId.Focus(); return; } - if (string.IsNullOrEmpty(kcCk)) + if (string.IsNullOrEmpty(kh)) { Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨瀹㈡埛锛�"); - txt_fStockId.Focus(); + txt_fCustId.Focus(); return; } var _obj = new @@ -499,6 +498,8 @@ gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"]); gvMx1.SetFocusedRowCellValue("kcDw", SelectedDataRow["dwName"]); gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]); + gvMx1.PostEditor(); + gvMx1.UpdateCurrentRow(); } private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) @@ -624,7 +625,7 @@ DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle); lbMxGuid.Text = row["guid"].ToString(); ucBtnPrint1.guidKey = row["guid"].ToString(); - txtWlid.Text = row["itemId"].ToString(); + txtWlid.Text = row["itemNo"].ToString(); txtWlgg.Text = row["itemModel"].ToString(); txtWlmc.Text = row["itemName"].ToString(); txtQuantity.Text = row["sqsl"].ToString();//鐢宠鎬婚噺 diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs index eae338b..e4f1057 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs @@ -29,15 +29,14 @@ /// </summary> private void InitializeComponent() { - 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.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 rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -60,10 +59,9 @@ this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.bandedGridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.bandedGridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -71,18 +69,14 @@ this.lbGuid = new System.Windows.Forms.Label(); this.txt_ckName = new DevExpress.XtraEditors.TextEdit(); this.txt_remark = new DevExpress.XtraEditors.TextEdit(); - this.txt_hz = new DevExpress.XtraEditors.TextEdit(); this.txt_checkUser = new DevExpress.XtraEditors.TextEdit(); this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); - this.txt_lyfx = new DevExpress.XtraEditors.TextEdit(); - this.txt_hzlx = new DevExpress.XtraEditors.TextEdit(); - this.txt_gysName = new DevExpress.XtraEditors.TextEdit(); + this.txt_khName = new DevExpress.XtraEditors.TextEdit(); this.txt_billNo = new DevExpress.XtraEditors.TextEdit(); - this.txt_abtNo = new DevExpress.XtraEditors.TextEdit(); - this.txt_djlx = new DevExpress.XtraEditors.TextEdit(); + this.txt_taskNo = new DevExpress.XtraEditors.TextEdit(); + this.txt_inType = new DevExpress.XtraEditors.TextEdit(); this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); - this.txt_dptName = new DevExpress.XtraEditors.TextEdit(); - this.txt_kcOrg = new DevExpress.XtraEditors.TextEdit(); + this.txt_rkOrg = new DevExpress.XtraEditors.TextEdit(); this.txt_checkDate = new DevExpress.XtraEditors.TextEdit(); this.txt_status = new DevExpress.XtraEditors.CheckEdit(); this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit(); @@ -94,21 +88,9 @@ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); @@ -134,6 +116,14 @@ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -155,18 +145,14 @@ this.layoutMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_hz.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_lyfx.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_hzlx.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_khName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_abtNo.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_djlx.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_inType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_rkOrg.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit(); @@ -178,21 +164,9 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -202,6 +176,14 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -291,10 +273,9 @@ this.gv_checkUser, this.gv_checkDate, this.bandedGridColumn3, - this.bandedGridColumn5, - this.gv_guid, this.gridColumn7, - this.gridColumn8}); + this.gridColumn8, + this.gv_guid}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -469,7 +450,7 @@ // bandedGridColumn4 // this.bandedGridColumn4.Caption = "鍗曟嵁绫诲瀷"; - this.bandedGridColumn4.FieldName = "djlx"; + this.bandedGridColumn4.FieldName = "inType"; this.bandedGridColumn4.MinWidth = 25; this.bandedGridColumn4.Name = "bandedGridColumn4"; this.bandedGridColumn4.Visible = true; @@ -506,7 +487,7 @@ // // bandedGridColumn3 // - this.bandedGridColumn3.Caption = "鍏ュ簱缁勭粐"; + this.bandedGridColumn3.Caption = "搴撳瓨缁勭粐"; this.bandedGridColumn3.FieldName = "rkOrg"; this.bandedGridColumn3.MinWidth = 25; this.bandedGridColumn3.Name = "bandedGridColumn3"; @@ -514,15 +495,25 @@ this.bandedGridColumn3.VisibleIndex = 15; this.bandedGridColumn3.Width = 94; // - // bandedGridColumn5 + // gridColumn7 // - this.bandedGridColumn5.Caption = "搴撳瓨鏂瑰悜"; - this.bandedGridColumn5.FieldName = "kcfx"; - this.bandedGridColumn5.MinWidth = 25; - this.bandedGridColumn5.Name = "bandedGridColumn5"; - this.bandedGridColumn5.Visible = true; - this.bandedGridColumn5.VisibleIndex = 16; - this.bandedGridColumn5.Width = 94; + this.gridColumn7.Caption = "瀹㈡埛ID"; + this.gridColumn7.FieldName = "khId"; + this.gridColumn7.MinWidth = 25; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 16; + this.gridColumn7.Width = 94; + // + // gridColumn8 + // + this.gridColumn8.Caption = "瀹㈡埛鍚嶇О"; + this.gridColumn8.FieldName = "khNo"; + this.gridColumn8.MinWidth = 25; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 17; + this.gridColumn8.Width = 94; // // gv_guid // @@ -534,29 +525,7 @@ this.gv_guid.Name = "gv_guid"; this.gv_guid.OptionsColumn.AllowEdit = false; this.gv_guid.Tag = "query_a.GUID"; - this.gv_guid.Visible = true; - this.gv_guid.VisibleIndex = 17; this.gv_guid.Width = 94; - // - // gridColumn7 - // - this.gridColumn7.Caption = "璐т富"; - this.gridColumn7.FieldName = "hz"; - this.gridColumn7.MinWidth = 25; - this.gridColumn7.Name = "gridColumn7"; - this.gridColumn7.Visible = true; - this.gridColumn7.VisibleIndex = 18; - this.gridColumn7.Width = 94; - // - // gridColumn8 - // - this.gridColumn8.Caption = "璐т富绫诲瀷"; - this.gridColumn8.FieldName = "hzlx"; - this.gridColumn8.MinWidth = 25; - this.gridColumn8.Name = "gridColumn8"; - this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 19; - this.gridColumn8.Width = 94; // // pageBar1 // @@ -594,7 +563,7 @@ this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.Size = new System.Drawing.Size(1346, 570); - this.splitMx1.SplitterPosition = 176; + this.splitMx1.SplitterPosition = 142; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -602,120 +571,88 @@ this.layoutMx1.Controls.Add(this.lbGuid); this.layoutMx1.Controls.Add(this.txt_ckName); this.layoutMx1.Controls.Add(this.txt_remark); - this.layoutMx1.Controls.Add(this.txt_hz); this.layoutMx1.Controls.Add(this.txt_checkUser); this.layoutMx1.Controls.Add(this.txt_createDate); - this.layoutMx1.Controls.Add(this.txt_lyfx); - this.layoutMx1.Controls.Add(this.txt_hzlx); - this.layoutMx1.Controls.Add(this.txt_gysName); + this.layoutMx1.Controls.Add(this.txt_khName); this.layoutMx1.Controls.Add(this.txt_billNo); - this.layoutMx1.Controls.Add(this.txt_abtNo); - this.layoutMx1.Controls.Add(this.txt_djlx); + this.layoutMx1.Controls.Add(this.txt_taskNo); + this.layoutMx1.Controls.Add(this.txt_inType); this.layoutMx1.Controls.Add(this.txt_createBy); - this.layoutMx1.Controls.Add(this.txt_dptName); - this.layoutMx1.Controls.Add(this.txt_kcOrg); + this.layoutMx1.Controls.Add(this.txt_rkOrg); this.layoutMx1.Controls.Add(this.txt_checkDate); this.layoutMx1.Controls.Add(this.txt_status); this.layoutMx1.Controls.Add(this.txt_lastupdateBy); this.layoutMx1.Controls.Add(this.txt_lastupdateDate); this.layoutMx1.Controls.Add(this.txt_reason); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem19}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(425, 342, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1346, 176); + this.layoutMx1.Size = new System.Drawing.Size(1346, 142); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // lbGuid // this.lbGuid.Font = new System.Drawing.Font("Tahoma", 10F); - this.lbGuid.Location = new System.Drawing.Point(1005, 108); + this.lbGuid.Location = new System.Drawing.Point(990, 108); this.lbGuid.Name = "lbGuid"; - this.lbGuid.Size = new System.Drawing.Size(329, 28); + this.lbGuid.Size = new System.Drawing.Size(323, 28); this.lbGuid.TabIndex = 612; this.lbGuid.Text = "lbGuid"; // // txt_ckName // - this.txt_ckName.Location = new System.Drawing.Point(445, 108); + this.txt_ckName.Location = new System.Drawing.Point(440, 76); this.txt_ckName.Name = "txt_ckName"; this.txt_ckName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_ckName.Properties.Appearance.Options.UseFont = true; - this.txt_ckName.Size = new System.Drawing.Size(225, 28); + this.txt_ckName.Size = new System.Drawing.Size(220, 28); this.txt_ckName.StyleController = this.layoutMx1; this.txt_ckName.TabIndex = 609; // // txt_remark // - this.txt_remark.Location = new System.Drawing.Point(114, 140); + this.txt_remark.Location = new System.Drawing.Point(114, 76); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_remark.Properties.Appearance.Options.UseFont = true; - this.txt_remark.Size = new System.Drawing.Size(225, 28); + this.txt_remark.Size = new System.Drawing.Size(220, 28); this.txt_remark.StyleController = this.layoutMx1; this.txt_remark.TabIndex = 240; // - // txt_hz - // - this.txt_hz.Location = new System.Drawing.Point(114, 108); - this.txt_hz.Name = "txt_hz"; - this.txt_hz.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_hz.Properties.Appearance.Options.UseFont = true; - this.txt_hz.Size = new System.Drawing.Size(225, 28); - this.txt_hz.StyleController = this.layoutMx1; - this.txt_hz.TabIndex = 602; - // // txt_checkUser // - this.txt_checkUser.Location = new System.Drawing.Point(1107, 12); + this.txt_checkUser.Location = new System.Drawing.Point(1092, 12); this.txt_checkUser.Name = "txt_checkUser"; this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_checkUser.Properties.Appearance.Options.UseFont = true; - this.txt_checkUser.Size = new System.Drawing.Size(227, 28); + this.txt_checkUser.Size = new System.Drawing.Size(221, 28); this.txt_checkUser.StyleController = this.layoutMx1; this.txt_checkUser.TabIndex = 608; // // txt_createDate // - this.txt_createDate.Location = new System.Drawing.Point(776, 108); + this.txt_createDate.Location = new System.Drawing.Point(766, 76); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createDate.Properties.Appearance.Options.UseFont = true; - this.txt_createDate.Size = new System.Drawing.Size(225, 28); + this.txt_createDate.Size = new System.Drawing.Size(220, 28); this.txt_createDate.StyleController = this.layoutMx1; this.txt_createDate.TabIndex = 222; // - // txt_lyfx + // txt_khName // - this.txt_lyfx.Location = new System.Drawing.Point(776, 44); - this.txt_lyfx.Name = "txt_lyfx"; - this.txt_lyfx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_lyfx.Properties.Appearance.Options.UseFont = true; - this.txt_lyfx.Size = new System.Drawing.Size(225, 28); - this.txt_lyfx.StyleController = this.layoutMx1; - this.txt_lyfx.TabIndex = 604; - // - // txt_hzlx - // - this.txt_hzlx.Location = new System.Drawing.Point(114, 76); - this.txt_hzlx.Name = "txt_hzlx"; - this.txt_hzlx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_hzlx.Properties.Appearance.Options.UseFont = true; - this.txt_hzlx.Size = new System.Drawing.Size(225, 28); - this.txt_hzlx.StyleController = this.layoutMx1; - this.txt_hzlx.TabIndex = 600; - // - // txt_gysName - // - this.txt_gysName.Location = new System.Drawing.Point(445, 76); - this.txt_gysName.Name = "txt_gysName"; - this.txt_gysName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_gysName.Properties.Appearance.Options.UseFont = true; - this.txt_gysName.Size = new System.Drawing.Size(225, 28); - this.txt_gysName.StyleController = this.layoutMx1; - this.txt_gysName.TabIndex = 595; + this.txt_khName.Location = new System.Drawing.Point(440, 44); + this.txt_khName.Name = "txt_khName"; + this.txt_khName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_khName.Properties.Appearance.Options.UseFont = true; + this.txt_khName.Size = new System.Drawing.Size(220, 28); + this.txt_khName.StyleController = this.layoutMx1; + this.txt_khName.TabIndex = 595; // // txt_billNo // @@ -723,106 +660,96 @@ this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_billNo.Properties.Appearance.Options.UseFont = true; - this.txt_billNo.Size = new System.Drawing.Size(225, 28); + this.txt_billNo.Size = new System.Drawing.Size(220, 28); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 211; // - // txt_abtNo + // txt_taskNo // - this.txt_abtNo.Location = new System.Drawing.Point(445, 12); - this.txt_abtNo.Name = "txt_abtNo"; - this.txt_abtNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_abtNo.Properties.Appearance.Options.UseFont = true; - this.txt_abtNo.Size = new System.Drawing.Size(225, 28); - this.txt_abtNo.StyleController = this.layoutMx1; - this.txt_abtNo.TabIndex = 507; + this.txt_taskNo.Location = new System.Drawing.Point(440, 12); + this.txt_taskNo.Name = "txt_taskNo"; + this.txt_taskNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_taskNo.Properties.Appearance.Options.UseFont = true; + this.txt_taskNo.Size = new System.Drawing.Size(220, 28); + this.txt_taskNo.StyleController = this.layoutMx1; + this.txt_taskNo.TabIndex = 507; // - // txt_djlx + // txt_inType // - this.txt_djlx.Location = new System.Drawing.Point(776, 12); - this.txt_djlx.Name = "txt_djlx"; - this.txt_djlx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_djlx.Properties.Appearance.Options.UseFont = true; - this.txt_djlx.Size = new System.Drawing.Size(225, 28); - this.txt_djlx.StyleController = this.layoutMx1; - this.txt_djlx.TabIndex = 598; + this.txt_inType.Location = new System.Drawing.Point(766, 12); + this.txt_inType.Name = "txt_inType"; + this.txt_inType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_inType.Properties.Appearance.Options.UseFont = true; + this.txt_inType.Size = new System.Drawing.Size(220, 28); + this.txt_inType.StyleController = this.layoutMx1; + this.txt_inType.TabIndex = 598; // // txt_createBy // - this.txt_createBy.Location = new System.Drawing.Point(776, 76); + this.txt_createBy.Location = new System.Drawing.Point(766, 44); this.txt_createBy.Name = "txt_createBy"; this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createBy.Properties.Appearance.Options.UseFont = true; - this.txt_createBy.Size = new System.Drawing.Size(225, 28); + this.txt_createBy.Size = new System.Drawing.Size(220, 28); this.txt_createBy.StyleController = this.layoutMx1; this.txt_createBy.TabIndex = 219; // - // txt_dptName + // txt_rkOrg // - this.txt_dptName.Location = new System.Drawing.Point(445, 44); - this.txt_dptName.Name = "txt_dptName"; - this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_dptName.Properties.Appearance.Options.UseFont = true; - this.txt_dptName.Size = new System.Drawing.Size(225, 28); - this.txt_dptName.StyleController = this.layoutMx1; - this.txt_dptName.TabIndex = 596; - // - // txt_kcOrg - // - this.txt_kcOrg.Location = new System.Drawing.Point(114, 44); - this.txt_kcOrg.Name = "txt_kcOrg"; - this.txt_kcOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_kcOrg.Properties.Appearance.Options.UseFont = true; - this.txt_kcOrg.Size = new System.Drawing.Size(225, 28); - this.txt_kcOrg.StyleController = this.layoutMx1; - this.txt_kcOrg.TabIndex = 593; + this.txt_rkOrg.Location = new System.Drawing.Point(114, 44); + this.txt_rkOrg.Name = "txt_rkOrg"; + this.txt_rkOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_rkOrg.Properties.Appearance.Options.UseFont = true; + this.txt_rkOrg.Size = new System.Drawing.Size(220, 28); + this.txt_rkOrg.StyleController = this.layoutMx1; + this.txt_rkOrg.TabIndex = 593; // // txt_checkDate // - this.txt_checkDate.Location = new System.Drawing.Point(1107, 44); + this.txt_checkDate.Location = new System.Drawing.Point(1092, 44); this.txt_checkDate.Name = "txt_checkDate"; this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_checkDate.Properties.Appearance.Options.UseFont = true; - this.txt_checkDate.Size = new System.Drawing.Size(227, 28); + this.txt_checkDate.Size = new System.Drawing.Size(221, 28); this.txt_checkDate.StyleController = this.layoutMx1; this.txt_checkDate.TabIndex = 587; // // txt_status // - this.txt_status.Location = new System.Drawing.Point(1005, 76); + this.txt_status.Location = new System.Drawing.Point(990, 76); this.txt_status.Name = "txt_status"; this.txt_status.Properties.Caption = "瀹℃牳鐘舵��"; - this.txt_status.Size = new System.Drawing.Size(329, 24); + this.txt_status.Size = new System.Drawing.Size(323, 24); this.txt_status.StyleController = this.layoutMx1; this.txt_status.TabIndex = 609; // // txt_lastupdateBy // - this.txt_lastupdateBy.Location = new System.Drawing.Point(445, 140); + this.txt_lastupdateBy.Location = new System.Drawing.Point(766, 108); this.txt_lastupdateBy.Name = "txt_lastupdateBy"; this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true; - this.txt_lastupdateBy.Size = new System.Drawing.Size(225, 28); + this.txt_lastupdateBy.Size = new System.Drawing.Size(220, 28); this.txt_lastupdateBy.StyleController = this.layoutMx1; this.txt_lastupdateBy.TabIndex = 610; // // txt_lastupdateDate // - this.txt_lastupdateDate.Location = new System.Drawing.Point(776, 140); + this.txt_lastupdateDate.Location = new System.Drawing.Point(1092, 108); this.txt_lastupdateDate.Name = "txt_lastupdateDate"; this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true; - this.txt_lastupdateDate.Size = new System.Drawing.Size(225, 28); + this.txt_lastupdateDate.Size = new System.Drawing.Size(221, 28); this.txt_lastupdateDate.StyleController = this.layoutMx1; this.txt_lastupdateDate.TabIndex = 611; // // txt_reason // - this.txt_reason.Location = new System.Drawing.Point(1107, 140); + this.txt_reason.Location = new System.Drawing.Point(114, 108); this.txt_reason.Name = "txt_reason"; this.txt_reason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_reason.Properties.Appearance.Options.UseFont = true; - this.txt_reason.Size = new System.Drawing.Size(227, 28); + this.txt_reason.Size = new System.Drawing.Size(546, 28); this.txt_reason.StyleController = this.layoutMx1; this.txt_reason.TabIndex = 613; // @@ -836,53 +763,45 @@ this.layoutControlItem3, this.layoutControlItem4, this.layoutControlItem5, - this.layoutControlItem6, - this.layoutControlItem7, this.layoutControlItem8, - this.layoutControlItem9, - this.layoutControlItem10, - this.layoutControlItem11, this.layoutControlItem12, - this.layoutControlItem13, + this.layoutControlItem10, this.layoutControlItem14, + this.layoutControlItem11, this.layoutControlItem15, this.layoutControlItem16, - this.layoutControlItem17, + this.layoutControlItem20, this.layoutControlItem18, - this.layoutControlItem19, - this.layoutControlItem20}); + this.layoutControlItem17}); 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; + columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5.Width = 100D; + columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition6.Width = 100D; + columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition7.Width = 100D; + columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition8.Width = 100D; this.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; + columnDefinition5, + columnDefinition6, + columnDefinition7, + columnDefinition8}); rowDefinition5.Height = 100D; rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + 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; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition1, - rowDefinition2, - rowDefinition3, - rowDefinition4, - rowDefinition5}); - this.Root.Size = new System.Drawing.Size(1346, 180); + rowDefinition5, + rowDefinition6, + rowDefinition7, + rowDefinition8}); + this.Root.Size = new System.Drawing.Size(1325, 148); this.Root.TextVisible = false; // // layoutControlItem1 @@ -890,213 +809,84 @@ 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(331, 32); + this.layoutControlItem1.Size = new System.Drawing.Size(326, 32); this.layoutControlItem1.Text = "鍏ュ簱鍗曞彿"; this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem2 // - this.layoutControlItem2.Control = this.txt_abtNo; - this.layoutControlItem2.Location = new System.Drawing.Point(331, 0); + this.layoutControlItem2.Control = this.txt_taskNo; + this.layoutControlItem2.Location = new System.Drawing.Point(326, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(331, 32); + this.layoutControlItem2.Size = new System.Drawing.Size(326, 32); this.layoutControlItem2.Text = "鐢宠鍗曞彿"; this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem3 // - this.layoutControlItem3.Control = this.txt_djlx; - this.layoutControlItem3.Location = new System.Drawing.Point(662, 0); + this.layoutControlItem3.Control = this.txt_inType; + this.layoutControlItem3.Location = new System.Drawing.Point(652, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(331, 32); + this.layoutControlItem3.Size = new System.Drawing.Size(326, 32); this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷"; this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_checkUser; - this.layoutControlItem4.Location = new System.Drawing.Point(993, 0); + this.layoutControlItem4.Location = new System.Drawing.Point(978, 0); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem4.Size = new System.Drawing.Size(333, 32); + this.layoutControlItem4.Size = new System.Drawing.Size(327, 32); this.layoutControlItem4.Text = "瀹℃牳浜�"; this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem5 // - this.layoutControlItem5.Control = this.txt_kcOrg; + this.layoutControlItem5.Control = this.txt_rkOrg; this.layoutControlItem5.Location = new System.Drawing.Point(0, 32); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(331, 32); + this.layoutControlItem5.Size = new System.Drawing.Size(326, 32); this.layoutControlItem5.Text = "搴撳瓨缁勭粐"; this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txt_dptName; - this.layoutControlItem6.Location = new System.Drawing.Point(331, 32); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(331, 32); - this.layoutControlItem6.Text = "閮ㄩ棬"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem7 - // - this.layoutControlItem7.Control = this.txt_lyfx; - this.layoutControlItem7.Location = new System.Drawing.Point(662, 32); - this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem7.Size = new System.Drawing.Size(331, 32); - this.layoutControlItem7.Text = "搴撳瓨鏂瑰悜"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_checkDate; - this.layoutControlItem8.Location = new System.Drawing.Point(993, 32); + this.layoutControlItem8.Location = new System.Drawing.Point(978, 32); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem8.Size = new System.Drawing.Size(333, 32); + this.layoutControlItem8.Size = new System.Drawing.Size(327, 32); this.layoutControlItem8.Text = "瀹℃牳鏃ユ湡"; this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem9 - // - this.layoutControlItem9.Control = this.txt_hzlx; - this.layoutControlItem9.Location = new System.Drawing.Point(0, 64); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem9.Size = new System.Drawing.Size(331, 32); - this.layoutControlItem9.Text = "璐т富绫诲瀷"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem10 - // - this.layoutControlItem10.Control = this.txt_gysName; - this.layoutControlItem10.Location = new System.Drawing.Point(331, 64); - this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem10.Size = new System.Drawing.Size(331, 32); - this.layoutControlItem10.Text = "渚涘簲鍟�"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem11 - // - this.layoutControlItem11.Control = this.txt_createBy; - this.layoutControlItem11.Location = new System.Drawing.Point(662, 64); - this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(331, 32); - this.layoutControlItem11.Text = "鍒涘缓浜�"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_status; - this.layoutControlItem12.Location = new System.Drawing.Point(993, 64); + this.layoutControlItem12.Location = new System.Drawing.Point(978, 64); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem12.Size = new System.Drawing.Size(333, 32); + this.layoutControlItem12.Size = new System.Drawing.Size(327, 32); this.layoutControlItem12.Text = "瀹℃牳鐘舵��"; this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem12.TextVisible = false; // - // layoutControlItem13 - // - this.layoutControlItem13.Control = this.txt_hz; - this.layoutControlItem13.Location = new System.Drawing.Point(0, 96); - this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(331, 32); - this.layoutControlItem13.Text = "璐т富"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem14 - // - this.layoutControlItem14.Control = this.txt_ckName; - this.layoutControlItem14.Location = new System.Drawing.Point(331, 96); - this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem14.Size = new System.Drawing.Size(331, 32); - this.layoutControlItem14.Text = "浠撳簱鍚嶇О"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem15 - // - this.layoutControlItem15.Control = this.txt_createDate; - this.layoutControlItem15.Location = new System.Drawing.Point(662, 96); - this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem15.Size = new System.Drawing.Size(331, 32); - this.layoutControlItem15.Text = "鍒涘缓鏃堕棿"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem16 - // - this.layoutControlItem16.Control = this.txt_remark; - this.layoutControlItem16.Location = new System.Drawing.Point(0, 128); - this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem16.Size = new System.Drawing.Size(331, 32); - this.layoutControlItem16.Text = "澶囨敞"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem17 - // - this.layoutControlItem17.Control = this.txt_lastupdateBy; - this.layoutControlItem17.Location = new System.Drawing.Point(331, 128); - this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem17.Size = new System.Drawing.Size(331, 32); - this.layoutControlItem17.Text = "鏈�鍚庢洿鏂颁汉"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem18 - // - this.layoutControlItem18.Control = this.txt_lastupdateDate; - this.layoutControlItem18.Location = new System.Drawing.Point(662, 128); - this.layoutControlItem18.Name = "layoutControlItem18"; - this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem18.Size = new System.Drawing.Size(331, 32); - this.layoutControlItem18.Text = "鏈�鍚庢洿鏂版椂闂�"; - this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18); - // // layoutControlItem19 // this.layoutControlItem19.Control = this.lbGuid; - this.layoutControlItem19.Location = new System.Drawing.Point(993, 96); + this.layoutControlItem19.Location = new System.Drawing.Point(978, 96); this.layoutControlItem19.Name = "layoutControlItem19"; this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem19.Size = new System.Drawing.Size(333, 32); + this.layoutControlItem19.Size = new System.Drawing.Size(327, 32); this.layoutControlItem19.Text = "lbGuid"; this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem19.TextVisible = false; - // - // layoutControlItem20 - // - this.layoutControlItem20.Control = this.txt_reason; - this.layoutControlItem20.Location = new System.Drawing.Point(993, 128); - this.layoutControlItem20.Name = "layoutControlItem20"; - this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem20.Size = new System.Drawing.Size(333, 32); - this.layoutControlItem20.Text = "鍘熷洜"; - this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18); // // tabMx // @@ -1104,7 +894,7 @@ this.tabMx.Location = new System.Drawing.Point(0, 0); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; - this.tabMx.Size = new System.Drawing.Size(1346, 382); + this.tabMx.Size = new System.Drawing.Size(1346, 416); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage2, @@ -1114,7 +904,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx2); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1344, 350); + this.tabMxPage1.Size = new System.Drawing.Size(1344, 384); this.tabMxPage1.Text = "鍏ュ簱鏉$爜"; // // gcMx2 @@ -1123,7 +913,7 @@ this.gcMx2.Location = new System.Drawing.Point(0, 0); this.gcMx2.MainView = this.gvMx2; this.gcMx2.Name = "gcMx2"; - this.gcMx2.Size = new System.Drawing.Size(1344, 350); + this.gcMx2.Size = new System.Drawing.Size(1344, 384); this.gcMx2.TabIndex = 0; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -1279,7 +1069,7 @@ // this.tabMxPage2.Controls.Add(this.gcMx1); this.tabMxPage2.Name = "tabMxPage2"; - this.tabMxPage2.Size = new System.Drawing.Size(1344, 350); + this.tabMxPage2.Size = new System.Drawing.Size(1344, 384); this.tabMxPage2.Text = "鐗╂枡鏄庣粏"; // // gcMx1 @@ -1288,7 +1078,7 @@ this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; - this.gcMx1.Size = new System.Drawing.Size(1344, 350); + this.gcMx1.Size = new System.Drawing.Size(1344, 384); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1403,6 +1193,93 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // + // layoutControlItem10 + // + this.layoutControlItem10.Control = this.txt_khName; + this.layoutControlItem10.Location = new System.Drawing.Point(326, 32); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem10.Size = new System.Drawing.Size(326, 32); + this.layoutControlItem10.Text = "瀹㈡埛鍚嶇О"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem14 + // + this.layoutControlItem14.Control = this.txt_ckName; + this.layoutControlItem14.Location = new System.Drawing.Point(326, 64); + this.layoutControlItem14.Name = "layoutControlItem14"; + this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem14.Size = new System.Drawing.Size(326, 32); + this.layoutControlItem14.Text = "浠撳簱鍚嶇О"; + this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem11 + // + this.layoutControlItem11.Control = this.txt_createBy; + this.layoutControlItem11.Location = new System.Drawing.Point(652, 32); + this.layoutControlItem11.Name = "layoutControlItem11"; + this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem11.Size = new System.Drawing.Size(326, 32); + this.layoutControlItem11.Text = "鍒涘缓浜�"; + this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.txt_createDate; + this.layoutControlItem15.Location = new System.Drawing.Point(652, 64); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem15.Size = new System.Drawing.Size(326, 32); + this.layoutControlItem15.Text = "鍒涘缓鏃堕棿"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem16 + // + this.layoutControlItem16.Control = this.txt_remark; + this.layoutControlItem16.Location = new System.Drawing.Point(0, 64); + this.layoutControlItem16.Name = "layoutControlItem16"; + this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem16.Size = new System.Drawing.Size(326, 32); + this.layoutControlItem16.Text = "澶囨敞"; + this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem20 + // + this.layoutControlItem20.Control = this.txt_reason; + this.layoutControlItem20.Location = new System.Drawing.Point(0, 96); + this.layoutControlItem20.Name = "layoutControlItem20"; + this.layoutControlItem20.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem20.Size = new System.Drawing.Size(652, 32); + this.layoutControlItem20.Text = "鍘熷洜"; + this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem18 + // + this.layoutControlItem18.Control = this.txt_lastupdateDate; + this.layoutControlItem18.Location = new System.Drawing.Point(978, 96); + this.layoutControlItem18.Name = "layoutControlItem18"; + this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem18.Size = new System.Drawing.Size(327, 32); + this.layoutControlItem18.Text = "鏈�鍚庢洿鏂版椂闂�"; + this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem17 + // + this.layoutControlItem17.Control = this.txt_lastupdateBy; + this.layoutControlItem17.Location = new System.Drawing.Point(652, 96); + this.layoutControlItem17.Name = "layoutControlItem17"; + this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem17.Size = new System.Drawing.Size(326, 32); + this.layoutControlItem17.Text = "鏈�鍚庢洿鏂颁汉"; + this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); + // // Frm_MesShouTuoDj // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1434,18 +1311,14 @@ this.layoutMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_hz.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_lyfx.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_hzlx.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_khName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_abtNo.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_djlx.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_inType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_rkOrg.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit(); @@ -1457,21 +1330,9 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1481,6 +1342,14 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); this.ResumeLayout(false); } @@ -1508,10 +1377,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser; private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate; private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn3; - private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gv_guid; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; private UserControls.Data.UcPageBar pageBar1; private DevExpress.XtraTab.XtraTabPage xtraTabPage2; private DevExpress.XtraEditors.SplitContainerControl splitMx1; @@ -1519,15 +1385,11 @@ private DevExpress.XtraLayout.LayoutControlGroup Root; private DevExpress.XtraEditors.TextEdit txt_ckName; private DevExpress.XtraEditors.TextEdit txt_checkUser; - private DevExpress.XtraEditors.TextEdit txt_lyfx; - private DevExpress.XtraEditors.TextEdit txt_hz; - private DevExpress.XtraEditors.TextEdit txt_hzlx; - private DevExpress.XtraEditors.TextEdit txt_djlx; - private DevExpress.XtraEditors.TextEdit txt_dptName; - private DevExpress.XtraEditors.TextEdit txt_gysName; - private DevExpress.XtraEditors.TextEdit txt_kcOrg; + private DevExpress.XtraEditors.TextEdit txt_inType; + private DevExpress.XtraEditors.TextEdit txt_khName; + private DevExpress.XtraEditors.TextEdit txt_rkOrg; private DevExpress.XtraEditors.TextEdit txt_checkDate; - private DevExpress.XtraEditors.TextEdit txt_abtNo; + private DevExpress.XtraEditors.TextEdit txt_taskNo; private DevExpress.XtraEditors.TextEdit txt_remark; private DevExpress.XtraEditors.TextEdit txt_createDate; private DevExpress.XtraEditors.TextEdit txt_createBy; @@ -1537,23 +1399,12 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraEditors.CheckEdit txt_status; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private System.Windows.Forms.Label lbGuid; private DevExpress.XtraEditors.TextEdit txt_lastupdateBy; private DevExpress.XtraEditors.TextEdit txt_lastupdateDate; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; private DevExpress.XtraTab.XtraTabControl tabMx; private DevExpress.XtraTab.XtraTabPage tabMxPage1; @@ -1580,6 +1431,15 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraEditors.TextEdit txt_reason; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.Designer.cs index 761b2b5..db3f386 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.Designer.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.Designer.cs @@ -213,7 +213,11 @@ // gv_purchaseUnit // this.gv_purchaseUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_purchaseUnit.AppearanceCell.ForeColor = System.Drawing.Color.Blue; this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true; + this.gv_purchaseUnit.AppearanceCell.Options.UseForeColor = true; + this.gv_purchaseUnit.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gv_purchaseUnit.AppearanceHeader.Options.UseForeColor = true; this.gv_purchaseUnit.Caption = "鍙��鏁伴噺"; this.gv_purchaseUnit.FieldName = "kt"; this.gv_purchaseUnit.MaxWidth = 50; @@ -222,6 +226,8 @@ this.gv_purchaseUnit.OptionsColumn.AllowEdit = false; this.gv_purchaseUnit.OptionsColumn.ReadOnly = true; this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT"; + this.gv_purchaseUnit.Visible = true; + this.gv_purchaseUnit.VisibleIndex = 8; this.gv_purchaseUnit.Width = 50; // // gridColumn10 @@ -230,7 +236,7 @@ this.gridColumn10.FieldName = "khName"; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; - this.gridColumn10.VisibleIndex = 8; + this.gridColumn10.VisibleIndex = 9; this.gridColumn10.Width = 125; // // gridColumn2 @@ -239,7 +245,7 @@ this.gridColumn2.FieldName = "receivingOrg"; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 9; + this.gridColumn2.VisibleIndex = 10; this.gridColumn2.Width = 250; // // gridColumn1 -- Gitblit v1.9.3