From e55375b7e21c648b08257312e88a9848996d82b7 Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期日, 03 八月 2025 16:48:43 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs | 505 ++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 327 insertions(+), 178 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs index c239cdd..7bb7bb2 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs @@ -37,6 +37,7 @@ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraGrid.GridLevelNode gridLevelNode1 = new DevExpress.XtraGrid.GridLevelNode(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -53,6 +54,9 @@ this.gv_purchaseDept = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_purchaser = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvcol6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -69,8 +73,11 @@ this.txt_mrmodeTxt = new DevExpress.XtraEditors.TextEdit(); this.txt_itemModel = new DevExpress.XtraEditors.TextEdit(); this.txt_erpCheckBy = new DevExpress.XtraEditors.TextEdit(); - this.btnZsm = new DevExpress.XtraEditors.SimpleButton(); this.txt_aboutGuid = new DevExpress.XtraEditors.TextEdit(); + this.txt_lineName = new DevExpress.XtraEditors.TextEdit(); + this.txt_workNo = new DevExpress.XtraEditors.TextEdit(); + this.txt_msg = new DevExpress.XtraEditors.TextEdit(); + this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.txt_daa00111111 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -83,6 +90,11 @@ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -103,7 +115,6 @@ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -111,17 +122,17 @@ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tips = new DevExpress.Utils.ToolTipController(this.components); - this.txt_lineName = new DevExpress.XtraEditors.TextEdit(); - this.txt_workNo = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txt_msg = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); + this.picCheckBox = new System.Windows.Forms.PictureBox(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); + this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); + this.gcMx7 = new DevExpress.XtraGrid.GridControl(); + this.gvMx7 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn63 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn64 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn65 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -152,6 +163,10 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa00111111)).BeginInit(); @@ -164,6 +179,11 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -172,17 +192,11 @@ this.tabMxPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); + this.xtraTabPage3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx7)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -270,7 +284,10 @@ this.bandedGridColumn2, this.gv_purchaseDept, this.gv_purchaser, - this.gvcol6}); + this.gvcol6, + this.gridColumn10, + this.gridColumn11, + this.gridColumn13}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -302,7 +319,7 @@ this.gv_documentStatus.OptionsColumn.AllowEdit = false; this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS"; this.gv_documentStatus.Visible = true; - this.gv_documentStatus.VisibleIndex = 1; + this.gv_documentStatus.VisibleIndex = 4; this.gv_documentStatus.Width = 70; // // gv_documentType @@ -315,7 +332,7 @@ this.gv_documentType.OptionsColumn.AllowEdit = false; this.gv_documentType.Tag = "query_a.DOCUMENT_TYPE"; this.gv_documentType.Visible = true; - this.gv_documentType.VisibleIndex = 2; + this.gv_documentType.VisibleIndex = 5; this.gv_documentType.Width = 80; // // gv_businessType @@ -328,7 +345,7 @@ this.gv_businessType.OptionsColumn.AllowEdit = false; this.gv_businessType.Tag = "query_a.BUSINESS_TYPE"; this.gv_businessType.Visible = true; - this.gv_businessType.VisibleIndex = 3; + this.gv_businessType.VisibleIndex = 6; this.gv_businessType.Width = 80; // // bandedGridColumn1 @@ -340,7 +357,7 @@ this.bandedGridColumn1.OptionsColumn.AllowEdit = false; this.bandedGridColumn1.Tag = "query_a.suppName"; this.bandedGridColumn1.Visible = true; - this.bandedGridColumn1.VisibleIndex = 4; + this.bandedGridColumn1.VisibleIndex = 7; this.bandedGridColumn1.Width = 134; // // gv_closeStatus @@ -353,7 +370,7 @@ this.gv_closeStatus.OptionsColumn.AllowEdit = false; this.gv_closeStatus.Tag = "query_a.CLOSE_STATUS"; this.gv_closeStatus.Visible = true; - this.gv_closeStatus.VisibleIndex = 5; + this.gv_closeStatus.VisibleIndex = 8; this.gv_closeStatus.Width = 80; // // bandedGridColumn2 @@ -365,7 +382,7 @@ this.bandedGridColumn2.OptionsColumn.AllowEdit = false; this.bandedGridColumn2.Tag = "query_a.departmentname"; this.bandedGridColumn2.Visible = true; - this.bandedGridColumn2.VisibleIndex = 6; + this.bandedGridColumn2.VisibleIndex = 9; this.bandedGridColumn2.Width = 80; // // gv_purchaseDept @@ -378,7 +395,7 @@ this.gv_purchaseDept.OptionsColumn.AllowEdit = false; this.gv_purchaseDept.Tag = "query_a.PURCHASE_DEPT"; this.gv_purchaseDept.Visible = true; - this.gv_purchaseDept.VisibleIndex = 7; + this.gv_purchaseDept.VisibleIndex = 10; this.gv_purchaseDept.Width = 50; // // gv_purchaser @@ -391,7 +408,7 @@ this.gv_purchaser.OptionsColumn.AllowEdit = false; this.gv_purchaser.Tag = "query_a.PURCHASER"; this.gv_purchaser.Visible = true; - this.gv_purchaser.VisibleIndex = 8; + this.gv_purchaser.VisibleIndex = 11; this.gv_purchaser.Width = 60; // // gvcol6 @@ -401,6 +418,36 @@ this.gvcol6.MinWidth = 25; this.gvcol6.Name = "gvcol6"; this.gvcol6.Width = 94; + // + // gridColumn10 + // + this.gridColumn10.Caption = "瀹℃牳鐘舵��"; + this.gridColumn10.FieldName = "fgCheckStatusChk"; + this.gridColumn10.MinWidth = 25; + this.gridColumn10.Name = "gridColumn10"; + this.gridColumn10.Visible = true; + this.gridColumn10.VisibleIndex = 1; + this.gridColumn10.Width = 94; + // + // gridColumn11 + // + this.gridColumn11.Caption = "瀹℃牳浜�"; + this.gridColumn11.FieldName = "fgCheckBy"; + this.gridColumn11.MinWidth = 25; + this.gridColumn11.Name = "gridColumn11"; + this.gridColumn11.Visible = true; + this.gridColumn11.VisibleIndex = 2; + this.gridColumn11.Width = 94; + // + // gridColumn13 + // + this.gridColumn13.Caption = "瀹℃牳鏃堕棿"; + this.gridColumn13.FieldName = "fgCheckDatet"; + this.gridColumn13.MinWidth = 25; + this.gridColumn13.Name = "gridColumn13"; + this.gridColumn13.Visible = true; + this.gridColumn13.VisibleIndex = 3; + this.gridColumn13.Width = 94; // // pageBar1 // @@ -456,7 +503,6 @@ this.layoutMx1.Controls.Add(this.txt_mrmodeTxt); this.layoutMx1.Controls.Add(this.txt_itemModel); this.layoutMx1.Controls.Add(this.txt_erpCheckBy); - this.layoutMx1.Controls.Add(this.btnZsm); this.layoutMx1.Controls.Add(this.txt_aboutGuid); this.layoutMx1.Controls.Add(this.txt_lineName); this.layoutMx1.Controls.Add(this.txt_workNo); @@ -469,7 +515,7 @@ this.txt_daa00111111}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; - this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(591, 520, 812, 500); + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(239, 530, 812, 500); this.layoutMx1.Root = this.Root; this.layoutMx1.Size = new System.Drawing.Size(1363, 150); this.layoutMx1.TabIndex = 0; @@ -479,11 +525,11 @@ // this.ucBtnPrint98.allClickKey = null; this.ucBtnPrint98.guidKey = null; - this.ucBtnPrint98.Location = new System.Drawing.Point(1002, 111); + this.ucBtnPrint98.Location = new System.Drawing.Point(672, 109); this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint98.Name = "ucBtnPrint98"; this.ucBtnPrint98.rptParameter = null; - this.ucBtnPrint98.Size = new System.Drawing.Size(328, 29); + this.ucBtnPrint98.Size = new System.Drawing.Size(326, 29); this.ucBtnPrint98.TabIndex = 9; // // lbGuid @@ -496,7 +542,7 @@ // // txt_releaseNo // - this.txt_releaseNo.Location = new System.Drawing.Point(99, 12); + this.txt_releaseNo.Location = new System.Drawing.Point(99, 10); this.txt_releaseNo.Name = "txt_releaseNo"; this.txt_releaseNo.Properties.Appearance.Options.UseFont = true; this.txt_releaseNo.Size = new System.Drawing.Size(239, 24); @@ -513,7 +559,7 @@ // // txt_itemName // - this.txt_itemName.Location = new System.Drawing.Point(759, 12); + this.txt_itemName.Location = new System.Drawing.Point(759, 10); this.txt_itemName.Name = "txt_itemName"; this.txt_itemName.Size = new System.Drawing.Size(239, 24); this.txt_itemName.StyleController = this.layoutMx1; @@ -521,7 +567,7 @@ // // txt_itemNo2 // - this.txt_itemNo2.Location = new System.Drawing.Point(429, 12); + this.txt_itemNo2.Location = new System.Drawing.Point(429, 10); this.txt_itemNo2.Name = "txt_itemNo2"; this.txt_itemNo2.Size = new System.Drawing.Size(239, 24); this.txt_itemNo2.StyleController = this.layoutMx1; @@ -529,7 +575,7 @@ // // txt_createBy // - this.txt_createBy.Location = new System.Drawing.Point(759, 45); + this.txt_createBy.Location = new System.Drawing.Point(759, 43); this.txt_createBy.Name = "txt_createBy"; this.txt_createBy.Size = new System.Drawing.Size(239, 24); this.txt_createBy.StyleController = this.layoutMx1; @@ -537,7 +583,7 @@ // // txt_createDate // - this.txt_createDate.Location = new System.Drawing.Point(1089, 45); + this.txt_createDate.Location = new System.Drawing.Point(1089, 43); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Size = new System.Drawing.Size(241, 24); this.txt_createDate.StyleController = this.layoutMx1; @@ -545,7 +591,7 @@ // // txt_fbatchQty // - this.txt_fbatchQty.Location = new System.Drawing.Point(99, 45); + this.txt_fbatchQty.Location = new System.Drawing.Point(99, 43); this.txt_fbatchQty.Name = "txt_fbatchQty"; this.txt_fbatchQty.Size = new System.Drawing.Size(239, 24); this.txt_fbatchQty.StyleController = this.layoutMx1; @@ -553,7 +599,7 @@ // // txt_mrmodeTxt // - this.txt_mrmodeTxt.Location = new System.Drawing.Point(429, 111); + this.txt_mrmodeTxt.Location = new System.Drawing.Point(429, 109); this.txt_mrmodeTxt.Name = "txt_mrmodeTxt"; this.txt_mrmodeTxt.Size = new System.Drawing.Size(239, 24); this.txt_mrmodeTxt.StyleController = this.layoutMx1; @@ -561,7 +607,7 @@ // // txt_itemModel // - this.txt_itemModel.Location = new System.Drawing.Point(1089, 12); + this.txt_itemModel.Location = new System.Drawing.Point(1089, 10); this.txt_itemModel.Name = "txt_itemModel"; this.txt_itemModel.Size = new System.Drawing.Size(241, 24); this.txt_itemModel.StyleController = this.layoutMx1; @@ -569,21 +615,11 @@ // // txt_erpCheckBy // - this.txt_erpCheckBy.Location = new System.Drawing.Point(99, 78); + this.txt_erpCheckBy.Location = new System.Drawing.Point(99, 76); this.txt_erpCheckBy.Name = "txt_erpCheckBy"; this.txt_erpCheckBy.Size = new System.Drawing.Size(239, 24); this.txt_erpCheckBy.StyleController = this.layoutMx1; this.txt_erpCheckBy.TabIndex = 241; - // - // btnZsm - // - this.btnZsm.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.insert_16x16; - this.btnZsm.Location = new System.Drawing.Point(672, 111); - this.btnZsm.Name = "btnZsm"; - this.btnZsm.Size = new System.Drawing.Size(116, 27); - this.btnZsm.StyleController = this.layoutMx1; - this.btnZsm.TabIndex = 242; - this.btnZsm.Text = "鐢熸垚杩芥函鐮�"; // // txt_aboutGuid // @@ -592,6 +628,38 @@ this.txt_aboutGuid.Size = new System.Drawing.Size(245, 24); this.txt_aboutGuid.StyleController = this.layoutMx1; this.txt_aboutGuid.TabIndex = 243; + // + // txt_lineName + // + this.txt_lineName.Location = new System.Drawing.Point(429, 43); + this.txt_lineName.Name = "txt_lineName"; + this.txt_lineName.Size = new System.Drawing.Size(239, 24); + this.txt_lineName.StyleController = this.layoutMx1; + this.txt_lineName.TabIndex = 244; + // + // txt_workNo + // + this.txt_workNo.Location = new System.Drawing.Point(99, 109); + this.txt_workNo.Name = "txt_workNo"; + this.txt_workNo.Size = new System.Drawing.Size(239, 24); + this.txt_workNo.StyleController = this.layoutMx1; + this.txt_workNo.TabIndex = 245; + // + // txt_msg + // + this.txt_msg.Location = new System.Drawing.Point(759, 76); + this.txt_msg.Name = "txt_msg"; + this.txt_msg.Size = new System.Drawing.Size(571, 24); + this.txt_msg.StyleController = this.layoutMx1; + this.txt_msg.TabIndex = 246; + // + // txt_fngHandle + // + this.txt_fngHandle.Location = new System.Drawing.Point(429, 76); + this.txt_fngHandle.Name = "txt_fngHandle"; + this.txt_fngHandle.Size = new System.Drawing.Size(239, 24); + this.txt_fngHandle.StyleController = this.layoutMx1; + this.txt_fngHandle.TabIndex = 247; // // layoutControlItem3 // @@ -639,12 +707,11 @@ this.layoutControlItem11, this.layoutControlItem14, this.layoutControlItem15, - this.layoutControlItem8, - this.layoutControlItem13, this.layoutControlItem10, this.layoutControlItem12, this.layoutControlItem17, - this.layoutControlItem16}); + this.layoutControlItem16, + this.layoutControlItem13}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent; @@ -757,6 +824,61 @@ this.layoutControlItem14.Text = "宸茶繑宸ユ暟閲�"; this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18); // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.txt_workNo; + this.layoutControlItem15.Location = new System.Drawing.Point(0, 99); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem15.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem15.Text = "宸ュ崟鍗曞彿"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem10 + // + this.layoutControlItem10.Control = this.txt_mrmodeTxt; + this.layoutControlItem10.Location = new System.Drawing.Point(330, 99); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem10.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem10.Text = "杩斿伐宸ュ簭"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.txt_lineName; + this.layoutControlItem12.Location = new System.Drawing.Point(330, 33); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem12.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem12.Text = "浜х嚎"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem17 + // + this.layoutControlItem17.Control = this.txt_fngHandle; + this.layoutControlItem17.Location = new System.Drawing.Point(330, 66); + this.layoutControlItem17.Name = "layoutControlItem17"; + this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem17.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem17.Text = "澶勭疆缁撴灉"; + this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem16 + // + this.layoutControlItem16.Control = this.txt_msg; + this.layoutControlItem16.Location = new System.Drawing.Point(660, 66); + this.layoutControlItem16.Name = "layoutControlItem16"; + this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem16.Size = new System.Drawing.Size(662, 33); + this.layoutControlItem16.Text = "杩濊绫诲埆"; + this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18); + // // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; @@ -767,7 +889,8 @@ this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, - this.tabMxPage2}); + this.tabMxPage2, + this.xtraTabPage3}); // // tabMxPage1 // @@ -908,7 +1031,6 @@ this.gridColumn16, this.gridColumn17, this.gridColumn22, - this.gridColumn47, this.gridColumn12, this.gridColumn5, this.gridColumn6, @@ -985,20 +1107,10 @@ this.gridColumn22.VisibleIndex = 3; this.gridColumn22.Width = 37; // - // gridColumn47 - // - this.gridColumn47.Caption = "鏃х殑杩芥函鐮�"; - this.gridColumn47.FieldName = "barCodeOld"; - this.gridColumn47.MinWidth = 25; - this.gridColumn47.Name = "gridColumn47"; - this.gridColumn47.Visible = true; - this.gridColumn47.VisibleIndex = 1; - this.gridColumn47.Width = 67; - // // gridColumn12 // this.gridColumn12.Caption = "缁戝畾鏃堕棿"; - this.gridColumn12.FieldName = "dhdh"; + this.gridColumn12.FieldName = "bdDateTime"; this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Visible = true; @@ -1008,7 +1120,7 @@ // gridColumn5 // this.gridColumn5.Caption = "缁戝畾浜�"; - this.gridColumn5.FieldName = "bdDateTime"; + this.gridColumn5.FieldName = "bdUserBy"; this.gridColumn5.MinWidth = 25; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; @@ -1055,125 +1167,149 @@ this.gridColumn9.VisibleIndex = 11; this.gridColumn9.Width = 94; // - // txt_lineName + // picCheckBox // - this.txt_lineName.Location = new System.Drawing.Point(429, 45); - this.txt_lineName.Name = "txt_lineName"; - this.txt_lineName.Size = new System.Drawing.Size(239, 24); - this.txt_lineName.StyleController = this.layoutMx1; - this.txt_lineName.TabIndex = 244; - // - // txt_workNo - // - this.txt_workNo.Location = new System.Drawing.Point(99, 111); - this.txt_workNo.Name = "txt_workNo"; - this.txt_workNo.Size = new System.Drawing.Size(239, 24); - this.txt_workNo.StyleController = this.layoutMx1; - this.txt_workNo.TabIndex = 245; - // - // layoutControlItem15 - // - this.layoutControlItem15.Control = this.txt_workNo; - this.layoutControlItem15.Location = new System.Drawing.Point(0, 99); - this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem15.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem15.Text = "宸ュ崟鍗曞彿"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18); - // - // txt_msg - // - this.txt_msg.Location = new System.Drawing.Point(759, 78); - this.txt_msg.Name = "txt_msg"; - this.txt_msg.Size = new System.Drawing.Size(571, 24); - this.txt_msg.StyleController = this.layoutMx1; - this.txt_msg.TabIndex = 246; - // - // layoutControlItem8 - // - this.layoutControlItem8.Control = this.btnZsm; - this.layoutControlItem8.Location = new System.Drawing.Point(660, 99); - this.layoutControlItem8.MaxSize = new System.Drawing.Size(120, 31); - this.layoutControlItem8.MinSize = new System.Drawing.Size(86, 31); - this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem8.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem8.Text = "鐢熸垚杩芥函鐮�"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem8.TextVisible = false; + this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; + this.picCheckBox.Location = new System.Drawing.Point(1133, 30); + this.picCheckBox.Name = "picCheckBox"; + this.picCheckBox.Size = new System.Drawing.Size(100, 50); + this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.picCheckBox.TabIndex = 9; + this.picCheckBox.TabStop = false; + this.picCheckBox.Visible = false; // // layoutControlItem13 // this.layoutControlItem13.Control = this.ucBtnPrint98; - this.layoutControlItem13.Location = new System.Drawing.Point(990, 99); + this.layoutControlItem13.Location = new System.Drawing.Point(660, 99); this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(332, 33); + this.layoutControlItem13.Size = new System.Drawing.Size(330, 33); this.layoutControlItem13.Text = "纭畾鎵撳嵃"; this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem13.TextVisible = false; // - // txt_fngHandle + // xtraTabPage3 // - this.txt_fngHandle.Location = new System.Drawing.Point(429, 78); - this.txt_fngHandle.Name = "txt_fngHandle"; - this.txt_fngHandle.Size = new System.Drawing.Size(239, 24); - this.txt_fngHandle.StyleController = this.layoutMx1; - this.txt_fngHandle.TabIndex = 247; + this.xtraTabPage3.Controls.Add(this.gcMx7); + this.xtraTabPage3.Name = "xtraTabPage3"; + this.xtraTabPage3.Size = new System.Drawing.Size(1361, 376); + this.xtraTabPage3.Text = "璇ュ伐鍗曠殑宸ュ簭鏄庣粏"; // - // layoutControlItem10 + // gcMx7 // - this.layoutControlItem10.Control = this.txt_mrmodeTxt; - this.layoutControlItem10.Location = new System.Drawing.Point(330, 99); - this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem10.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem10.Text = "杩斿伐宸ュ簭"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18); + this.gcMx7.Dock = System.Windows.Forms.DockStyle.Fill; + gridLevelNode1.RelationName = "Level1"; + this.gcMx7.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] { + gridLevelNode1}); + this.gcMx7.Location = new System.Drawing.Point(0, 0); + this.gcMx7.MainView = this.gvMx7; + this.gcMx7.Name = "gcMx7"; + this.gcMx7.Size = new System.Drawing.Size(1361, 376); + this.gcMx7.TabIndex = 2; + this.gcMx7.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gvMx7}); // - // layoutControlItem12 + // gvMx7 // - this.layoutControlItem12.Control = this.txt_lineName; - this.layoutControlItem12.Location = new System.Drawing.Point(330, 33); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem12.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem12.Text = "浜х嚎"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18); + this.gvMx7.Appearance.HeaderPanel.Options.UseTextOptions = true; + this.gvMx7.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; + this.gvMx7.ColumnPanelRowHeight = 50; + this.gvMx7.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gvMx1daa002, + this.gvMx1daa010, + this.gvMx1daa004, + this.gridColumn63, + this.gridColumn64, + this.gridColumn65}); + this.gvMx7.GridControl = this.gcMx7; + this.gvMx7.Name = "gvMx7"; + this.gvMx7.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; + this.gvMx7.OptionsFind.ShowSearchNavButtons = false; + this.gvMx7.OptionsView.ShowGroupPanel = false; // - // layoutControlItem17 + // gvMx1daa002 // - this.layoutControlItem17.Control = this.txt_fngHandle; - this.layoutControlItem17.Location = new System.Drawing.Point(330, 66); - this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem17.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem17.Text = "澶勭疆缁撴灉"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18); + this.gvMx1daa002.AppearanceCell.Options.UseFont = true; + this.gvMx1daa002.Caption = "搴忓彿"; + this.gvMx1daa002.FieldName = "fSeq"; + this.gvMx1daa002.MinWidth = 50; + this.gvMx1daa002.Name = "gvMx1daa002"; + this.gvMx1daa002.OptionsColumn.ReadOnly = true; + this.gvMx1daa002.Tag = "query_a.daa010"; + this.gvMx1daa002.Visible = true; + this.gvMx1daa002.VisibleIndex = 0; + this.gvMx1daa002.Width = 54; // - // layoutControlItem16 + // gvMx1daa010 // - this.layoutControlItem16.Control = this.txt_msg; - this.layoutControlItem16.Location = new System.Drawing.Point(660, 66); - this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem16.Size = new System.Drawing.Size(662, 33); - this.layoutControlItem16.Text = "杩濊绫诲埆"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18); + this.gvMx1daa010.AppearanceCell.Options.UseFont = true; + this.gvMx1daa010.Caption = "宸ュ簭"; + this.gvMx1daa010.FieldName = "processNo"; + this.gvMx1daa010.MinWidth = 50; + this.gvMx1daa010.Name = "gvMx1daa010"; + this.gvMx1daa010.OptionsColumn.ReadOnly = true; + this.gvMx1daa010.Tag = "query_a.daa010"; + this.gvMx1daa010.Visible = true; + this.gvMx1daa010.VisibleIndex = 1; + this.gvMx1daa010.Width = 129; + // + // gvMx1daa004 + // + this.gvMx1daa004.AppearanceCell.Options.UseFont = true; + this.gvMx1daa004.Caption = "涓婂伐搴�"; + this.gvMx1daa004.FieldName = "frontProcessNo"; + this.gvMx1daa004.MinWidth = 150; + this.gvMx1daa004.Name = "gvMx1daa004"; + this.gvMx1daa004.OptionsColumn.ReadOnly = true; + this.gvMx1daa004.Tag = "query_a.daa010"; + this.gvMx1daa004.Visible = true; + this.gvMx1daa004.VisibleIndex = 2; + this.gvMx1daa004.Width = 150; + // + // gridColumn63 + // + this.gridColumn63.Caption = "鏄惁鍙繑宸�"; + this.gridColumn63.FieldName = "isBack"; + this.gridColumn63.MinWidth = 25; + this.gridColumn63.Name = "gridColumn63"; + this.gridColumn63.OptionsColumn.ReadOnly = true; + this.gridColumn63.Tag = "query_a.daa010"; + this.gridColumn63.Visible = true; + this.gridColumn63.VisibleIndex = 3; + this.gridColumn63.Width = 94; + // + // gridColumn64 + // + this.gridColumn64.Caption = "鏄惁杩旇拷婧爜"; + this.gridColumn64.FieldName = "isZsm"; + this.gridColumn64.MinWidth = 25; + this.gridColumn64.Name = "gridColumn64"; + this.gridColumn64.OptionsColumn.ReadOnly = true; + this.gridColumn64.Tag = "query_a.daa010"; + this.gridColumn64.Visible = true; + this.gridColumn64.VisibleIndex = 4; + this.gridColumn64.Width = 94; + // + // gridColumn65 + // + this.gridColumn65.Caption = "鏄惁杩旀墭鏉跨爜"; + this.gridColumn65.FieldName = "isTbm"; + this.gridColumn65.MinWidth = 25; + this.gridColumn65.Name = "gridColumn65"; + this.gridColumn65.OptionsColumn.ReadOnly = true; + this.gridColumn65.Tag = "query_a.daa010"; + this.gridColumn65.Visible = true; + this.gridColumn65.VisibleIndex = 5; + this.gridColumn65.Width = 94; // // Frm_WomFanGong // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1365, 682); + this.Controls.Add(this.picCheckBox); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_WomFanGong"; @@ -1208,6 +1344,10 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa00111111)).EndInit(); @@ -1220,6 +1360,11 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1228,17 +1373,11 @@ this.tabMxPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); + this.xtraTabPage3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gcMx7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx7)).EndInit(); this.ResumeLayout(false); } @@ -1297,7 +1436,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraEditors.TextEdit txt_erpCheckBy; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; - private DevExpress.XtraEditors.SimpleButton btnZsm; private UserControl.UcBtnPrint ucBtnPrint98; private DevExpress.XtraEditors.TextEdit txt_aboutGuid; private DevExpress.XtraLayout.LayoutControlItem txt_daa00111111; @@ -1310,7 +1448,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; private DevExpress.XtraGrid.Columns.GridColumn gridColumn22; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn47; private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; @@ -1322,11 +1459,23 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.XtraEditors.TextEdit txt_msg; private DevExpress.XtraEditors.TextEdit txt_fngHandle; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; + private System.Windows.Forms.PictureBox picCheckBox; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; + private DevExpress.XtraTab.XtraTabPage xtraTabPage3; + private DevExpress.XtraGrid.GridControl gcMx7; + private DevExpress.XtraGrid.Views.Grid.GridView gvMx7; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa002; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa010; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn63; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn64; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn65; } } \ No newline at end of file -- Gitblit v1.9.3