From b084bd77d01a94c8f0a2d20c86a1f45ba7c8a23c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 19 四月 2025 14:08:05 +0800
Subject: [PATCH] 页面跳转
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 20 ++
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 23 ++-
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs | 6
DevApp/Gs.DevApp/Gs.DevApp.csproj | 2
DevApp/Gs.DevApp/Properties/Resources.resx | 38 +++--
DevApp/Gs.DevApp/Resources/exporttopdf_16x16.png | 0
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 167 ++++++++++++++---------
DevApp/Gs.DevApp/Resources/sendpdf_32x32.png | 0
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.Designer.cs | 116 ++++++----------
10 files changed, 209 insertions(+), 165 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.Designer.cs
index 9ff735e..df84d7a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.Designer.cs
@@ -81,6 +81,9 @@
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -109,16 +112,11 @@
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -159,6 +157,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage2.SuspendLayout();
@@ -169,9 +170,6 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).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();
this.SuspendLayout();
//
// toolBarMenu1
@@ -726,6 +724,39 @@
this.layoutControlItem13.Text = "鐢宠鍗曞彿";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_checkUser;
+ this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem9.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_checkDate;
+ this.layoutControlItem10.Location = new System.Drawing.Point(828, 31);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem10.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem10.Text = "瀹℃牳鏃ユ湡";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_status;
+ this.layoutControlItem11.Location = new System.Drawing.Point(828, 62);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(278, 32);
+ this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem11.TextVisible = false;
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -943,8 +974,6 @@
this.gridColumn10,
this.gvMx1depotCode,
this.gvMx1depotSectionCode,
- this.gvMx1ebelnK3id,
- this.gvMx1lineK3id,
this.gridColumn16,
this.gridColumn17});
this.gvMx2.GridControl = this.gcMx2;
@@ -1047,28 +1076,6 @@
this.gvMx1depotSectionCode.VisibleIndex = 7;
this.gvMx1depotSectionCode.Width = 94;
//
- // gvMx1ebelnK3id
- //
- this.gvMx1ebelnK3id.AppearanceCell.Options.UseFont = true;
- this.gvMx1ebelnK3id.Caption = "閲囪喘璁㈠崟ID ";
- this.gvMx1ebelnK3id.FieldName = "ebelnK3id";
- this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id";
- this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID";
- this.gvMx1ebelnK3id.Visible = true;
- this.gvMx1ebelnK3id.VisibleIndex = 8;
- this.gvMx1ebelnK3id.Width = 94;
- //
- // gvMx1lineK3id
- //
- this.gvMx1lineK3id.AppearanceCell.Options.UseFont = true;
- this.gvMx1lineK3id.Caption = "閲囪喘璁㈠崟琛孖D ";
- this.gvMx1lineK3id.FieldName = "lineK3id";
- this.gvMx1lineK3id.Name = "gvMx1lineK3id";
- this.gvMx1lineK3id.Tag = "query_a.LINE_K3ID";
- this.gvMx1lineK3id.Visible = true;
- this.gvMx1lineK3id.VisibleIndex = 9;
- this.gvMx1lineK3id.Width = 94;
- //
// gridColumn16
//
this.gridColumn16.Caption = "鍒涘缓浜�";
@@ -1076,7 +1083,7 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 10;
+ this.gridColumn16.VisibleIndex = 8;
this.gridColumn16.Width = 94;
//
// gridColumn17
@@ -1086,7 +1093,7 @@
this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 11;
+ this.gridColumn17.VisibleIndex = 9;
this.gridColumn17.Width = 94;
//
// picCheckBox
@@ -1107,39 +1114,6 @@
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.Size = new System.Drawing.Size(138, 73);
this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_checkUser;
- this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(278, 31);
- this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_checkDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(828, 31);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(278, 31);
- this.layoutControlItem10.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_status;
- this.layoutControlItem11.Location = new System.Drawing.Point(828, 62);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(278, 32);
- this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem11.TextVisible = false;
//
// Frm_MesSctkSqDj
//
@@ -1191,6 +1165,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage2.ResumeLayout(false);
@@ -1201,9 +1178,6 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).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();
this.ResumeLayout(false);
}
@@ -1269,8 +1243,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotCode;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnK3id;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lineK3id;
private DevExpress.XtraEditors.TextEdit txt_guid;
private DevExpress.XtraLayout.LayoutControlItem lb_guid;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 78e48dc..bbcea10 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -384,7 +384,7 @@
newForm.Dock = DockStyle.Fill;
newForm.Visible = true;
//瀹炵幇瀛愮獥浣撶殑濮旀墭beg
- EventInfo evt = newForm.GetType().GetEvent("UpdateParent",
+ EventInfo evt = newForm.GetType().GetEvent("ToUpdateParent",
BindingFlags.NonPublic | BindingFlags.Instance
| BindingFlags.Public
);
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 14dcf72..5c12355 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -84,6 +84,7 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.btnYcReport = new DevExpress.XtraEditors.SimpleButton();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
@@ -131,6 +132,7 @@
this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -256,6 +258,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -790,11 +793,12 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1342, 688);
- this.splitMx1.SplitterPosition = 186;
+ this.splitMx1.SplitterPosition = 202;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.btnYcReport);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_suppName);
this.layoutMx1.Controls.Add(this.txt_remarks);
@@ -825,11 +829,21 @@
this.layoutControlItem21});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1094, 495, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1067, 391, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1342, 186);
+ this.layoutMx1.Size = new System.Drawing.Size(1342, 202);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // btnYcReport
+ //
+ this.btnYcReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttopdf_16x16;
+ this.btnYcReport.Location = new System.Drawing.Point(662, 167);
+ this.btnYcReport.Name = "btnYcReport";
+ this.btnYcReport.Size = new System.Drawing.Size(116, 27);
+ this.btnYcReport.StyleController = this.layoutMx1;
+ this.btnYcReport.TabIndex = 814;
+ this.btnYcReport.Text = "鏌ョ湅寮傚父鎶ュ憡";
//
// lbGuid
//
@@ -842,7 +856,7 @@
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(409, 96);
+ this.txt_suppName.Location = new System.Drawing.Point(409, 105);
this.txt_suppName.Name = "txt_suppName";
this.txt_suppName.Size = new System.Drawing.Size(249, 24);
this.txt_suppName.StyleController = this.layoutMx1;
@@ -851,7 +865,7 @@
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(84, 124);
+ this.txt_remarks.Location = new System.Drawing.Point(84, 136);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
this.txt_remarks.Size = new System.Drawing.Size(574, 24);
@@ -860,7 +874,7 @@
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(734, 96);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(734, 105);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
@@ -871,7 +885,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(84, 40);
+ this.txt_itemName.Location = new System.Drawing.Point(84, 43);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
this.txt_itemName.Size = new System.Drawing.Size(249, 24);
@@ -911,7 +925,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(84, 68);
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 74);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Size = new System.Drawing.Size(249, 24);
@@ -921,7 +935,7 @@
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(84, 96);
+ this.txt_itemModel.Location = new System.Drawing.Point(84, 105);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Size = new System.Drawing.Size(249, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
@@ -939,7 +953,7 @@
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(734, 40);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(734, 43);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
this.txt_fcheckBy.Size = new System.Drawing.Size(249, 24);
@@ -949,7 +963,7 @@
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(409, 68);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(409, 74);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
this.txt_fbatchQty.Size = new System.Drawing.Size(249, 24);
@@ -959,7 +973,7 @@
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1059, 40);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1059, 43);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
this.txt_fsubmitBy.Size = new System.Drawing.Size(250, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
@@ -968,7 +982,7 @@
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1059, 68);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1059, 74);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
this.txt_fsubmitDate.Size = new System.Drawing.Size(250, 24);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
@@ -987,7 +1001,7 @@
//
// txt_slOrg
//
- this.txt_slOrg.Location = new System.Drawing.Point(734, 124);
+ this.txt_slOrg.Location = new System.Drawing.Point(734, 136);
this.txt_slOrg.Name = "txt_slOrg";
this.txt_slOrg.Size = new System.Drawing.Size(249, 24);
this.txt_slOrg.StyleController = this.layoutMx1;
@@ -1005,7 +1019,7 @@
//
// txt_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(734, 68);
+ this.txt_checkStates.Location = new System.Drawing.Point(734, 74);
this.txt_checkStates.Name = "txt_checkStates";
this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
@@ -1016,7 +1030,7 @@
//
// txt_freceQty
//
- this.txt_freceQty.Location = new System.Drawing.Point(1059, 96);
+ this.txt_freceQty.Location = new System.Drawing.Point(1059, 105);
this.txt_freceQty.Name = "txt_freceQty";
this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true;
@@ -1027,7 +1041,7 @@
//
// txt_cgdNo
//
- this.txt_cgdNo.Location = new System.Drawing.Point(409, 40);
+ this.txt_cgdNo.Location = new System.Drawing.Point(409, 43);
this.txt_cgdNo.Name = "txt_cgdNo";
this.txt_cgdNo.Size = new System.Drawing.Size(249, 24);
this.txt_cgdNo.StyleController = this.layoutMx1;
@@ -1036,7 +1050,7 @@
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(1059, 124);
+ this.txt_fngHandle.Location = new System.Drawing.Point(1059, 136);
this.txt_fngHandle.Name = "txt_fngHandle";
this.txt_fngHandle.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fngHandle.Properties.Appearance.Options.UseForeColor = true;
@@ -1047,7 +1061,7 @@
//
// txt_fmrmode
//
- this.txt_fmrmode.Location = new System.Drawing.Point(1059, 152);
+ this.txt_fmrmode.Location = new System.Drawing.Point(1059, 167);
this.txt_fmrmode.Name = "txt_fmrmode";
this.txt_fmrmode.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fmrmode.Properties.Appearance.Options.UseForeColor = true;
@@ -1113,7 +1127,8 @@
this.layoutControlItem18,
this.layoutControlItem23,
this.layoutControlItem25,
- this.layoutControlItem26});
+ this.layoutControlItem26,
+ this.layoutControlItem27});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1148,7 +1163,7 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1321, 188);
+ this.Root.Size = new System.Drawing.Size(1321, 206);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1156,59 +1171,59 @@
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(325, 31);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_itemName;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(325, 31);
this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(325, 31);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 84);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(325, 31);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(975, 28);
+ this.layoutControlItem15.Location = new System.Drawing.Point(975, 31);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(326, 31);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(975, 56);
+ this.layoutControlItem16.Location = new System.Drawing.Point(975, 62);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(326, 31);
this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1218,7 +1233,7 @@
this.layoutControlItem14.Location = new System.Drawing.Point(975, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(326, 31);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1226,66 +1241,66 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 112);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem12.Size = new System.Drawing.Size(650, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(650, 31);
this.layoutControlItem12.Text = "澶囨敞璇存槑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(650, 84);
+ this.layoutControlItem10.Location = new System.Drawing.Point(650, 93);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(325, 31);
this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_suppName;
- this.layoutControlItem13.Location = new System.Drawing.Point(325, 84);
+ this.layoutControlItem13.Location = new System.Drawing.Point(325, 93);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(325, 31);
this.layoutControlItem13.Text = "渚涘簲鍟�";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_checkStates;
- this.layoutControlItem22.Location = new System.Drawing.Point(650, 56);
+ this.layoutControlItem22.Location = new System.Drawing.Point(650, 62);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem22.Size = new System.Drawing.Size(325, 31);
this.layoutControlItem22.Text = "妫�楠岀姸鎬�";
this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(325, 56);
+ this.layoutControlItem9.Location = new System.Drawing.Point(325, 62);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(325, 31);
this.layoutControlItem9.Text = "鏀惰揣鏁伴噺";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(650, 28);
+ this.layoutControlItem8.Location = new System.Drawing.Point(650, 31);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(325, 31);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1295,7 +1310,7 @@
this.layoutControlItem2.Location = new System.Drawing.Point(650, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(325, 31);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1305,64 +1320,79 @@
this.layoutControlItem3.Location = new System.Drawing.Point(325, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(325, 31);
this.layoutControlItem3.Text = "閫佹鎵瑰彿";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_cgdNo;
- this.layoutControlItem24.Location = new System.Drawing.Point(325, 28);
+ this.layoutControlItem24.Location = new System.Drawing.Point(325, 31);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem24.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem24.Size = new System.Drawing.Size(325, 31);
this.layoutControlItem24.Text = "閲囪喘鍗曞彿";
this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_slOrg;
- this.layoutControlItem18.Location = new System.Drawing.Point(650, 112);
+ this.layoutControlItem18.Location = new System.Drawing.Point(650, 124);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem18.Size = new System.Drawing.Size(325, 31);
this.layoutControlItem18.Text = "鏀舵枡缁勭粐";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_freceQty;
- this.layoutControlItem23.Location = new System.Drawing.Point(975, 84);
+ this.layoutControlItem23.Location = new System.Drawing.Point(975, 93);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem23.Size = new System.Drawing.Size(326, 31);
this.layoutControlItem23.Text = "鍒ゅ畾缁撴灉";
this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_fngHandle;
- this.layoutControlItem25.Location = new System.Drawing.Point(975, 112);
+ this.layoutControlItem25.Location = new System.Drawing.Point(975, 124);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem25.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(326, 31);
this.layoutControlItem25.Text = "澶勭悊缁撴灉";
this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_fmrmode;
- this.layoutControlItem26.Location = new System.Drawing.Point(975, 140);
+ this.layoutControlItem26.Location = new System.Drawing.Point(975, 155);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem26.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem26.Size = new System.Drawing.Size(326, 31);
this.layoutControlItem26.Text = "閫�鏂欐柟寮�";
this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.btnYcReport;
+ this.layoutControlItem27.Location = new System.Drawing.Point(650, 155);
+ this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem27.Size = new System.Drawing.Size(325, 31);
+ this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem27.TextVisible = false;
//
// xtraTabControl2
//
@@ -1370,7 +1400,7 @@
this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
- this.xtraTabControl2.Size = new System.Drawing.Size(1342, 490);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1342, 474);
this.xtraTabControl2.TabIndex = 3;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1381,7 +1411,7 @@
this.tabMxPage1.Controls.Add(this.splitMx2);
this.tabMxPage1.Controls.Add(this.panMsg);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1340, 458);
+ this.tabMxPage1.Size = new System.Drawing.Size(1340, 442);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitMx2
@@ -1400,7 +1430,7 @@
//
this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
this.splitMx2.Panel2.Text = "Panel2";
- this.splitMx2.Size = new System.Drawing.Size(1340, 411);
+ this.splitMx2.Size = new System.Drawing.Size(1340, 395);
this.splitMx2.SplitterPosition = 287;
this.splitMx2.TabIndex = 3;
//
@@ -1665,7 +1695,7 @@
//
this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
this.splitYangLi.Panel2.Text = "Panel2";
- this.splitYangLi.Size = new System.Drawing.Size(1340, 112);
+ this.splitYangLi.Size = new System.Drawing.Size(1340, 96);
this.splitYangLi.SplitterPosition = 676;
this.splitYangLi.TabIndex = 4;
//
@@ -1675,7 +1705,7 @@
this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl1.Location = new System.Drawing.Point(0, 0);
this.groupControl1.Name = "groupControl1";
- this.groupControl1.Size = new System.Drawing.Size(676, 112);
+ this.groupControl1.Size = new System.Drawing.Size(676, 96);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "妫�娴嬬粨鏋�";
//
@@ -1685,7 +1715,7 @@
this.gcMx2.Location = new System.Drawing.Point(2, 28);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(672, 82);
+ this.gcMx2.Size = new System.Drawing.Size(672, 66);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1773,7 +1803,7 @@
this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl2.Location = new System.Drawing.Point(0, 0);
this.groupControl2.Name = "groupControl2";
- this.groupControl2.Size = new System.Drawing.Size(652, 112);
+ this.groupControl2.Size = new System.Drawing.Size(652, 96);
this.groupControl2.TabIndex = 4;
this.groupControl2.Text = "鏍锋湰缁撴灉";
//
@@ -1783,7 +1813,7 @@
this.gcMx3.Location = new System.Drawing.Point(2, 28);
this.gcMx3.MainView = this.gvMx3;
this.gcMx3.Name = "gcMx3";
- this.gcMx3.Size = new System.Drawing.Size(648, 82);
+ this.gcMx3.Size = new System.Drawing.Size(648, 66);
this.gcMx3.TabIndex = 0;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -2007,7 +2037,7 @@
//
this.tabMxPage2.Controls.Add(this.ucUpFileList1);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1340, 459);
+ this.tabMxPage2.Size = new System.Drawing.Size(1340, 458);
this.tabMxPage2.Text = "闄勪欢淇℃伅";
//
// ucUpFileList1
@@ -2017,7 +2047,7 @@
this.ucUpFileList1.Name = "ucUpFileList1";
this.ucUpFileList1.parentGroup = null;
this.ucUpFileList1.pGuid = null;
- this.ucUpFileList1.Size = new System.Drawing.Size(1340, 459);
+ this.ucUpFileList1.Size = new System.Drawing.Size(1340, 458);
this.ucUpFileList1.TabIndex = 0;
//
// repositoryItemComboBox2
@@ -2129,6 +2159,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2318,5 +2349,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraEditors.SimpleButton btnYcReport;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 3cd5733..4ba7f62 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -48,7 +48,9 @@
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
btnIpt.Click += BtnIpt_Click;
+ btnYcReport.Click += BtnYcReport_Click;
}
+
/// <summary>
/// 鎵归噺褰曞叆
/// </summary>
@@ -452,6 +454,7 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
+ btnYcReport.Tag = dy.toGuid.ToString();
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
@@ -560,20 +563,26 @@
}
#region 鎵撳紑鐖朵翰绐楀彛濮旀墭
- public event EventHandler<UpdateParentEventArgs> UpdateParent;
- private void simpleButton1_Click(object sender, EventArgs e)
+ public event EventHandler<UpdateParentEventArgs> ToUpdateParent;
+ private void BtnYcReport_Click(object sender, EventArgs e)
{
- if (UpdateParent != null)
+ string _toGuid = (btnYcReport.Tag == null ? "" : btnYcReport.Tag.ToString());
+ if (string.IsNullOrEmpty(_toGuid))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ュ崟鏃犲紓甯告姤鍛婏紝鏌ョ湅澶辫触锛�");
+ return;
+ }
+ if (ToUpdateParent != null)
{
List<string> lst = new List<string>();
lst.Add("Gs.DevApp.DevFrm.QC.MesQcExceptional");//绫诲悕
- lst.Add("22222222");//寮傚父鎶ュ憡涓婚敭
- lst.Add("3");//鍏跺畠
- UpdateParent?.Invoke(this,
+ lst.Add(_toGuid);//寮傚父鎶ュ憡涓婚敭
+ lst.Add("tab1");//鍏跺畠
+ ToUpdateParent?.Invoke(this,
new UpdateParentEventArgs { StringList = lst });
}
}
#endregion
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
index a9c690c..79c1b25 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
@@ -1,4 +1,5 @@
-锘縰sing Gs.DevApp.Entity;
+锘縰sing CefSharp.DevTools.CSS;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -19,7 +20,8 @@
public void Initialize(string param)
{
// 浣跨敤param杩涜鍒濆鍖栧伐浣�
- MessageBox.Show(param);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1,0);
+ getModel(param);
}
public MesQcExceptional()
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 9193caf..bc89859 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1898,6 +1898,8 @@
<None Include="Resources\login_bg.jpg" />
<None Include="Resources\login_bg1.jpg" />
<None Include="Resources\login_bgOk.jpg" />
+ <None Include="Resources\sendpdf_32x32.png" />
+ <None Include="Resources\exporttopdf_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 7c6ab52..a3ad61d 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -1023,6 +1023,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap exporttopdf_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("exporttopdf_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap fill_16x16 {
get {
object obj = ResourceManager.GetObject("fill_16x16", resourceCulture);
@@ -1913,6 +1923,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap sendpdf_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("sendpdf_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap sendxls_16x16 {
get {
object obj = ResourceManager.GetObject("sendxls_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index d753b34..ac43c0c 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -153,6 +153,9 @@
<data name="projectfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\projectfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="sendpdf_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\sendpdf_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="meeting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\meeting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -249,6 +252,9 @@
<data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="login_bgOk" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\login_bgOk.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="boposition2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\boposition2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -271,11 +277,6 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -288,6 +289,9 @@
<value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap,
@@ -541,11 +545,6 @@
<data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -685,6 +684,9 @@
</data>
<data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ </data>
+ <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -829,8 +831,10 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
@@ -1021,8 +1025,10 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
@@ -1035,7 +1041,7 @@
<data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="login_bgOk" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\login_bgOk.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="exporttopdf_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\exporttopdf_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/exporttopdf_16x16.png b/DevApp/Gs.DevApp/Resources/exporttopdf_16x16.png
new file mode 100644
index 0000000..6c9145b
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/exporttopdf_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/sendpdf_32x32.png b/DevApp/Gs.DevApp/Resources/sendpdf_32x32.png
new file mode 100644
index 0000000..5c77501
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/sendpdf_32x32.png
Binary files differ
--
Gitblit v1.9.3