From 1beb65bd194fb0ae8bf3702a7e94b2b77656c0e7 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 17 十月 2025 11:09:42 +0800
Subject: [PATCH] 图标预览
---
DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.resx | 27 +-
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs | 228 +++++++++++-----------
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs | 45 ++++
DevApp/Gs.DevApp/DevFrm/WOM/KanBanLaTouH5.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs | 31 +++
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs | 184 ++++++++++-------
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs | 26 ++
DevApp/Gs.DevApp/UserControl/ShowFile.cs | 48 ++++
9 files changed, 380 insertions(+), 211 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
index d663ddd..971f72d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
@@ -30,6 +30,17 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesWorkshopLine));
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -38,12 +49,6 @@
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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesWorkshopLine));
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -63,6 +68,10 @@
this.gv_isZxbg = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -87,8 +96,6 @@
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -99,6 +106,8 @@
this.split1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -124,7 +133,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -138,7 +146,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1278, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -149,7 +157,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1278, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -159,7 +167,7 @@
//
this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1276, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -180,7 +188,7 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.Size = new System.Drawing.Size(1276, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
@@ -191,8 +199,9 @@
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit1});
- this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.repositoryItemButtonEdit1,
+ this.repositoryItemButtonEdit2});
+ this.gcMain1.Size = new System.Drawing.Size(1276, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -217,7 +226,8 @@
this.gv_isZxbg,
this.gridColumn2,
this.gridColumn3,
- this.gridColumn4});
+ this.gridColumn4,
+ this.gridColumn5});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -236,7 +246,7 @@
this.gv_org.Tag = "org.fnamber";
this.gv_org.Visible = true;
this.gv_org.VisibleIndex = 0;
- this.gv_org.Width = 254;
+ this.gv_org.Width = 193;
//
// gridColumn1
//
@@ -247,7 +257,7 @@
this.gridColumn1.Tag = "query_a.departName";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 1;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 71;
//
// gv_lineNo
//
@@ -260,7 +270,7 @@
this.gv_lineNo.Tag = "query_a.line_no";
this.gv_lineNo.Visible = true;
this.gv_lineNo.VisibleIndex = 2;
- this.gv_lineNo.Width = 82;
+ this.gv_lineNo.Width = 60;
//
// gv_name
//
@@ -273,7 +283,7 @@
this.gv_name.Tag = "query_a.name";
this.gv_name.Visible = true;
this.gv_name.VisibleIndex = 3;
- this.gv_name.Width = 100;
+ this.gv_name.Width = 60;
//
// gv_remark
//
@@ -286,7 +296,7 @@
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
this.gv_remark.VisibleIndex = 4;
- this.gv_remark.Width = 79;
+ this.gv_remark.Width = 50;
//
// gv_createBy
//
@@ -299,7 +309,7 @@
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 7;
- this.gv_createBy.Width = 63;
+ this.gv_createBy.Width = 50;
//
// gv_createDate
//
@@ -325,7 +335,7 @@
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
this.gv_lastupdateBy.VisibleIndex = 9;
- this.gv_lastupdateBy.Width = 63;
+ this.gv_lastupdateBy.Width = 50;
//
// gv_lastupdateDate
//
@@ -382,6 +392,48 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Width = 94;
//
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "绾块暱澶村儚";
+ this.gridColumn4.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 11;
+ this.gridColumn4.Width = 50;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绾块暱澶村儚", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "棰勮鐓х墖";
+ this.gridColumn5.ColumnEdit = this.repositoryItemButtonEdit2;
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 12;
+ this.gridColumn5.Width = 25;
+ //
+ // repositoryItemButtonEdit2
+ //
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.show_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "棰勮鐓х墖", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+ this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -390,7 +442,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1276, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -398,7 +450,7 @@
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1276, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -417,7 +469,7 @@
//
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+ this.splitMx1.Size = new System.Drawing.Size(1276, 570);
this.splitMx1.SplitterPosition = 147;
this.splitMx1.TabIndex = 0;
//
@@ -439,7 +491,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 147);
+ this.layoutMx1.Size = new System.Drawing.Size(1276, 147);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -457,7 +509,7 @@
this.txt_dptId.IsReadly = false;
this.txt_dptId.Location = new System.Drawing.Point(126, 12);
this.txt_dptId.Name = "txt_dptId";
- this.txt_dptId.Size = new System.Drawing.Size(158, 24);
+ this.txt_dptId.Size = new System.Drawing.Size(196, 24);
this.txt_dptId.TabIndex = 244;
//
// txt_lineNo
@@ -465,7 +517,7 @@
this.txt_lineNo.Location = new System.Drawing.Point(126, 43);
this.txt_lineNo.Name = "txt_lineNo";
this.txt_lineNo.Properties.Appearance.Options.UseFont = true;
- this.txt_lineNo.Size = new System.Drawing.Size(158, 24);
+ this.txt_lineNo.Size = new System.Drawing.Size(196, 24);
this.txt_lineNo.StyleController = this.layoutMx1;
this.txt_lineNo.TabIndex = 216;
this.txt_lineNo.Tag = "";
@@ -475,35 +527,35 @@
this.txt_name.Location = new System.Drawing.Point(126, 75);
this.txt_name.Name = "txt_name";
this.txt_name.Properties.Appearance.Options.UseFont = true;
- this.txt_name.Size = new System.Drawing.Size(158, 24);
+ this.txt_name.Size = new System.Drawing.Size(196, 24);
this.txt_name.StyleController = this.layoutMx1;
this.txt_name.TabIndex = 217;
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(402, 43);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(440, 43);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateDate.Size = new System.Drawing.Size(158, 24);
+ this.txt_lastupdateDate.Size = new System.Drawing.Size(196, 24);
this.txt_lastupdateDate.StyleController = this.layoutMx1;
this.txt_lastupdateDate.TabIndex = 231;
this.txt_lastupdateDate.Tag = "readonly";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(402, 75);
+ this.txt_remark.Location = new System.Drawing.Point(440, 75);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(158, 24);
+ this.txt_remark.Size = new System.Drawing.Size(196, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 219;
//
// txt_lastupdateBy
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(402, 12);
+ this.txt_lastupdateBy.Location = new System.Drawing.Point(440, 12);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateBy.Size = new System.Drawing.Size(158, 24);
+ this.txt_lastupdateBy.Size = new System.Drawing.Size(196, 24);
this.txt_lastupdateBy.StyleController = this.layoutMx1;
this.txt_lastupdateBy.TabIndex = 228;
this.txt_lastupdateBy.Tag = "readonly";
@@ -513,16 +565,16 @@
this.txt_isZxbg.Location = new System.Drawing.Point(12, 107);
this.txt_isZxbg.Name = "txt_isZxbg";
this.txt_isZxbg.Properties.Caption = "杩囩珯鏃跺己鍒剁數妫�";
- this.txt_isZxbg.Size = new System.Drawing.Size(272, 24);
+ this.txt_isZxbg.Size = new System.Drawing.Size(310, 24);
this.txt_isZxbg.StyleController = this.layoutMx1;
this.txt_isZxbg.TabIndex = 246;
//
// txt_lineType
//
- this.txt_lineType.Location = new System.Drawing.Point(288, 107);
+ this.txt_lineType.Location = new System.Drawing.Point(326, 107);
this.txt_lineType.Name = "txt_lineType";
this.txt_lineType.Properties.Caption = "杩囩珯鏃跺己鍒舵按妫�";
- this.txt_lineType.Size = new System.Drawing.Size(272, 24);
+ this.txt_lineType.Size = new System.Drawing.Size(310, 24);
this.txt_lineType.StyleController = this.layoutMx1;
this.txt_lineType.TabIndex = 247;
//
@@ -579,7 +631,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1126, 147);
+ this.Root.Size = new System.Drawing.Size(1276, 147);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -587,7 +639,7 @@
this.layoutControlItem1.Control = this.txt_dptId;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(314, 31);
this.layoutControlItem1.Text = "鎵�鍦ㄩ儴闂�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(102, 18);
//
@@ -597,7 +649,7 @@
this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(314, 32);
this.layoutControlItem2.Text = "浜х嚎缂栧彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(102, 18);
//
@@ -607,7 +659,7 @@
this.layoutControlItem3.Location = new System.Drawing.Point(0, 63);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(314, 32);
this.layoutControlItem3.Text = "浜х嚎鍚嶇О";
this.layoutControlItem3.TextSize = new System.Drawing.Size(102, 18);
//
@@ -615,32 +667,32 @@
//
this.layoutControlItem5.Control = this.txt_lastupdateBy;
this.layoutControlItem5.CustomizationFormText = "鏇存柊浜哄憳";
- this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(314, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(314, 31);
this.layoutControlItem5.Text = "鏇存柊浜哄憳";
this.layoutControlItem5.TextSize = new System.Drawing.Size(102, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_lastupdateDate;
- this.layoutControlItem6.Location = new System.Drawing.Point(276, 31);
+ this.layoutControlItem6.Location = new System.Drawing.Point(314, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem6.Size = new System.Drawing.Size(314, 32);
this.layoutControlItem6.Text = "鏇存柊鏃堕棿";
this.layoutControlItem6.TextSize = new System.Drawing.Size(102, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_remark;
- this.layoutControlItem4.Location = new System.Drawing.Point(276, 63);
+ this.layoutControlItem4.Location = new System.Drawing.Point(314, 63);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(314, 32);
this.layoutControlItem4.Text = "澶囨敞(绾块暱濮撳悕)";
this.layoutControlItem4.TextSize = new System.Drawing.Size(102, 18);
//
@@ -650,7 +702,7 @@
this.layoutControlItem8.Location = new System.Drawing.Point(0, 95);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem8.Size = new System.Drawing.Size(314, 32);
this.layoutControlItem8.Text = "杩囩珯鏃跺己鍒堕噰闆嗘暟鎹�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
@@ -658,40 +710,19 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_lineType;
- this.layoutControlItem10.Location = new System.Drawing.Point(276, 95);
+ this.layoutControlItem10.Location = new System.Drawing.Point(314, 95);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(314, 32);
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "绾块暱澶村儚";
- this.gridColumn4.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 11;
- this.gridColumn4.Width = 94;
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绾块暱澶村儚", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
- this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
// Frm_MesWorkshopLine
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(1278, 682);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesWorkshopLine";
@@ -706,6 +737,8 @@
this.split1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
this.splitMx1.Panel1.ResumeLayout(false);
@@ -731,7 +764,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.ResumeLayout(false);
}
@@ -781,5 +813,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
index dc224f6..30915aa 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
@@ -344,7 +344,11 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 涓婁紶鍥剧墖
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gridView1.FocusedRowHandle;
@@ -363,5 +367,30 @@
frm.ShowDialog();
}
}
+ /// <summary>
+ /// 棰勮鍥剧墖
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gridView1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ try
+ {
+ var dr = gridView1.GetDataRow(rowhandle);
+ var urlPath = dr["guid"].ToString();
+ Gs.DevApp.UserControl.ShowFile frm = new ShowFile(urlPath);
+ frm.ShowDialog();
+ }
+ catch (Exception ex)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.resx
index cf99b39..7b9ed5a 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.resx
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.resx
@@ -120,20 +120,19 @@
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAADXRFWHRUaXRsZQBVcGxvYWQ7
- a3x9RAAAAn1JREFUOE9tk+1LU3EUx91WmZHRq4qif6K3rblpNWzpXBbDDCQ1H9BZmXNuWVIKvQjzlSyK
- ksCHze2qcw8GUoQ4dUrZCyG0lfkwK11Yb+rdvp3zWxNu+oUP93fP+Z5zf/d37k1L6eLt0BaFjhCHFBfs
- gUsm4t86zdSUpMDm57xcXARAQFIY6noOlbSNbpS0jm7kWroPcyyVN1p3amAPimQikeBbJT3FO/IuhuDb
- VeRbfRLFVIRoktfgY49cJlsgVaw4Xy+Z217MYDr+B+H137jfNY3c614z5UQTQ/0Q++QyNoptKXSlnUeK
- W0LxyZVfGF5MMrb0E0XNwbj6Sscx8ijZx+b/xUGV4eag5IssYyC6CdeHHwLP/CakiSXoLZ4B8uwmuIlM
- olhf01t09+kUXO/X4Yx8RdfsOp4TYj3zDQ5nGNqyrmLychPZLpQnL7cfNTsC8ZG5DTyZWMPjcAx3/J8E
- zvEYnHQ/OPsdpoah+AnjveNUI85DVJOUZ2u9kt4iga44U+NFJxXZh6Nw+KLoHFtFdrUH2VX90FW5kVXe
- y6+yi9hqwAsOpBOZOWR+NrmGW9ICMY+ONyvQVrj5AzlI7CP2ELLD5AXD28rQVbrFazx6vSxoJ7KuubjB
- foIftH0S2sp+vnAiXVPWM8kFGuJUOdMH9dXuKcrtZY+6tJe9chXSP0DiBnzCvM1Mgrec4gDB8R3HyFIU
- NAXGjbYg8m0B5DX6kWclGoYFhnqf4NyNgTB5uck2KfV1Evrm4nj4agkPRr+g9eUiWkKf0eyPwu77iMbB
- BeiSh5mRLCGl/jCSKqfaHT5NE8ihcTHZlTQ2giegrXCJg9SUdkfIm5GsQ9pfC0htwf0VafMAAAAASUVO
- RK5CYII=
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAANdEVYdFRpdGxlAFVwbG9hZDtrfH1EAAACfUlEQVQ4
+ T22T7UtTcRTH3VaZkdGriqJ/oretuWk1bOlcFsMMJDUf0FmZc25ZUgq9CPOVLIqSwIfN7apzDwZShDh1
+ StkLIbSV+TArXVhv6t2+nfNbE276hQ/3d8/5nnN/93fuTUvp4u3QFoWOEIcUF+yBSybi3zrN1JSkwObn
+ vFxcBEBAUhjqeg6VtI1ulLSObuRaug9zLJU3WndqYA+KZCKR4FslPcU78i6G4NtV5Ft9EsVUhGiS1+Bj
+ j1wmWyBVrDhfL5nbXsxgOv4H4fXfuN81jdzrXjPlRBND/RD75DI2im0pdKWdR4pbQvHJlV8YXkwytvQT
+ Rc3BuPpKxzHyKNnH5v/FQZXh5qDkiyxjILoJ14cfAs/8JqSJJegtngHy7Ca4iUyiWF/TW3T36RRc79fh
+ jHxF1+w6nhNiPfMNDmcY2rKuYvJyE9kulCcvtx81OwLxkbkNPJlYw+NwDHf8nwTO8RicdD84+x2mhqH4
+ CeO941QjzkNUk5Rna72S3iKBrjhT40UnFdmHo3D4ougcW0V2tQfZVf3QVbmRVd7Lr7KL2GrACw6kE5k5
+ ZH42uYZb0gIxj443K9BWuPkDOUjsI/YQssPkBcPbytBVusVrPHq9LGgnsq65uMF+gh+0fRLayn6+cCJd
+ U9YzyQUa4lQ50wf11e4pyu1lj7q0l71yFdI/QOIGfMK8zUyCt5ziAMHxHcfIUhQ0BcaNtiDybQHkNfqR
+ ZyUahgWGep/g3I2BMHm5yTYp9XUS+ubiePhqCQ9Gv6D15SJaQp/R7I/C7vuIxsEF6JKHmZEsIaX+MJIq
+ p9odPk0TyKFxMdmVNDaCJ6CtcImD1JR2R8ibkaxD2l8LSG3B/RVp8wAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
index 7197146..eb90392 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
@@ -41,6 +41,11 @@
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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -73,6 +78,8 @@
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -104,6 +111,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -144,6 +152,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -156,7 +165,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -168,7 +178,8 @@
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit1});
+ this.repositoryItemButtonEdit1,
+ this.repositoryItemButtonEdit2});
this.gcMain1.Size = new System.Drawing.Size(1126, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -184,7 +195,8 @@
this.gv_pageGroup,
this.gv_pageIdx,
this.gv_pageStatus,
- this.gridColumn1});
+ this.gridColumn1,
+ this.gridColumn2});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -317,7 +329,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -327,6 +339,7 @@
// splitMx1.Panel2
//
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
this.splitMx1.SplitterPosition = 86;
this.splitMx1.TabIndex = 4;
@@ -504,6 +517,27 @@
this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem5.TextVisible = false;
//
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "棰勮鍥炬爣";
+ this.gridColumn2.ColumnEdit = this.repositoryItemButtonEdit2;
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 7;
+ this.gridColumn2.Width = 94;
+ //
+ // repositoryItemButtonEdit2
+ //
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.show_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "棰勮鍥炬爣", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+ this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+ //
// Frm_MesSysPageview
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -544,6 +578,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
this.ResumeLayout(false);
}
@@ -580,5 +615,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
index 9783b84..aba55dc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
@@ -1,5 +1,6 @@
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -309,5 +310,30 @@
frm.ShowDialog();
}
}
+ /// <summary>
+ /// 棰勮鍥炬爣
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gridView1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ try
+ {
+ var dr = gridView1.GetDataRow(rowhandle);
+ var urlPath = dr["guid"].ToString();
+ Gs.DevApp.UserControl.ShowFile frm = new ShowFile(urlPath);
+ frm.ShowDialog();
+ }
+ catch (Exception ex)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/KanBanLaTouH5.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/KanBanLaTouH5.Designer.cs
index bc89067..e121961 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/KanBanLaTouH5.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/KanBanLaTouH5.Designer.cs
@@ -67,7 +67,6 @@
this.Name = "KanBanLaTouH5";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "绾垮ご鐪嬫澘";
- this.TopMost = true;
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
((System.ComponentModel.ISupportInitialize)(this.pane1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtUrl.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
index 7c47cd4..16f919c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
@@ -425,7 +425,7 @@
this.gv_orderNo.OptionsColumn.AllowEdit = false;
this.gv_orderNo.Tag = "query_a.ORDER_NO";
this.gv_orderNo.Visible = true;
- this.gv_orderNo.VisibleIndex = 3;
+ this.gv_orderNo.VisibleIndex = 4;
this.gv_orderNo.Width = 120;
//
// gv_businessStatus
@@ -438,7 +438,7 @@
this.gv_businessStatus.OptionsColumn.AllowEdit = false;
this.gv_businessStatus.Tag = "query_a.BUSINESS_STATUS";
this.gv_businessStatus.Visible = true;
- this.gv_businessStatus.VisibleIndex = 5;
+ this.gv_businessStatus.VisibleIndex = 1;
this.gv_businessStatus.Width = 50;
//
// gridColumn3
@@ -481,7 +481,7 @@
this.gv_erpProductionOrderNo.OptionsColumn.AllowEdit = false;
this.gv_erpProductionOrderNo.Tag = "query_a.ERP_PRODUCTION_ORDER_NO";
this.gv_erpProductionOrderNo.Visible = true;
- this.gv_erpProductionOrderNo.VisibleIndex = 4;
+ this.gv_erpProductionOrderNo.VisibleIndex = 5;
this.gv_erpProductionOrderNo.Width = 94;
//
// gv_orderType
@@ -746,7 +746,7 @@
this.gv_auditor.OptionsColumn.AllowEdit = false;
this.gv_auditor.Tag = "query_a.AUDITOR";
this.gv_auditor.Visible = true;
- this.gv_auditor.VisibleIndex = 2;
+ this.gv_auditor.VisibleIndex = 3;
this.gv_auditor.Width = 94;
//
// gv_auditDate
@@ -759,7 +759,7 @@
this.gv_auditDate.OptionsColumn.AllowEdit = false;
this.gv_auditDate.Tag = "query_a.AUDIT_DATE";
this.gv_auditDate.Visible = true;
- this.gv_auditDate.VisibleIndex = 1;
+ this.gv_auditDate.VisibleIndex = 2;
this.gv_auditDate.Width = 94;
//
// gv_stockowner
@@ -933,7 +933,7 @@
this.txt_stockownerName.Location = new System.Drawing.Point(114, 208);
this.txt_stockownerName.Name = "txt_stockownerName";
this.txt_stockownerName.Properties.Appearance.Options.UseFont = true;
- this.txt_stockownerName.Size = new System.Drawing.Size(165, 24);
+ this.txt_stockownerName.Size = new System.Drawing.Size(170, 24);
this.txt_stockownerName.StyleController = this.layoutMx1;
this.txt_stockownerName.TabIndex = 664;
//
@@ -942,79 +942,79 @@
this.txt_orderNo.Location = new System.Drawing.Point(114, 12);
this.txt_orderNo.Name = "txt_orderNo";
this.txt_orderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_orderNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_orderNo.Size = new System.Drawing.Size(170, 24);
this.txt_orderNo.StyleController = this.layoutMx1;
this.txt_orderNo.TabIndex = 211;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(656, 96);
+ this.txt_itemModel.Location = new System.Drawing.Point(666, 96);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(165, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(170, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 662;
//
// txt_orderType
//
- this.txt_orderType.Location = new System.Drawing.Point(385, 12);
+ this.txt_orderType.Location = new System.Drawing.Point(390, 12);
this.txt_orderType.Name = "txt_orderType";
this.txt_orderType.Properties.Appearance.Options.UseFont = true;
- this.txt_orderType.Size = new System.Drawing.Size(165, 24);
+ this.txt_orderType.Size = new System.Drawing.Size(170, 24);
this.txt_orderType.StyleController = this.layoutMx1;
this.txt_orderType.TabIndex = 219;
//
// txt_auditDate
//
- this.txt_auditDate.Location = new System.Drawing.Point(927, 152);
+ this.txt_auditDate.Location = new System.Drawing.Point(942, 152);
this.txt_auditDate.Name = "txt_auditDate";
this.txt_auditDate.Properties.Appearance.Options.UseFont = true;
- this.txt_auditDate.Size = new System.Drawing.Size(166, 24);
+ this.txt_auditDate.Size = new System.Drawing.Size(172, 24);
this.txt_auditDate.StyleController = this.layoutMx1;
this.txt_auditDate.TabIndex = 532;
//
// txt_planConfirmation
//
- this.txt_planConfirmation.Location = new System.Drawing.Point(927, 124);
+ this.txt_planConfirmation.Location = new System.Drawing.Point(942, 124);
this.txt_planConfirmation.Name = "txt_planConfirmation";
this.txt_planConfirmation.Properties.Appearance.Options.UseFont = true;
- this.txt_planConfirmation.Size = new System.Drawing.Size(166, 24);
+ this.txt_planConfirmation.Size = new System.Drawing.Size(172, 24);
this.txt_planConfirmation.StyleController = this.layoutMx1;
this.txt_planConfirmation.TabIndex = 627;
//
// txt_workOrderQty
//
- this.txt_workOrderQty.Location = new System.Drawing.Point(656, 12);
+ this.txt_workOrderQty.Location = new System.Drawing.Point(666, 12);
this.txt_workOrderQty.Name = "txt_workOrderQty";
this.txt_workOrderQty.Properties.Appearance.Options.UseFont = true;
- this.txt_workOrderQty.Size = new System.Drawing.Size(165, 24);
+ this.txt_workOrderQty.Size = new System.Drawing.Size(170, 24);
this.txt_workOrderQty.StyleController = this.layoutMx1;
this.txt_workOrderQty.TabIndex = 231;
//
// txt_auditStatus
//
- this.txt_auditStatus.Location = new System.Drawing.Point(927, 208);
+ this.txt_auditStatus.Location = new System.Drawing.Point(942, 208);
this.txt_auditStatus.Name = "txt_auditStatus";
this.txt_auditStatus.Properties.Appearance.Options.UseFont = true;
- this.txt_auditStatus.Size = new System.Drawing.Size(166, 24);
+ this.txt_auditStatus.Size = new System.Drawing.Size(172, 24);
this.txt_auditStatus.StyleController = this.layoutMx1;
this.txt_auditStatus.TabIndex = 507;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(385, 68);
+ this.txt_itemName.Location = new System.Drawing.Point(390, 68);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(165, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(170, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 660;
//
// txt_businessStatusTxt
//
- this.txt_businessStatusTxt.Location = new System.Drawing.Point(927, 12);
+ this.txt_businessStatusTxt.Location = new System.Drawing.Point(942, 12);
this.txt_businessStatusTxt.Name = "txt_businessStatusTxt";
this.txt_businessStatusTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_businessStatusTxt.Size = new System.Drawing.Size(166, 24);
+ this.txt_businessStatusTxt.Size = new System.Drawing.Size(172, 24);
this.txt_businessStatusTxt.StyleController = this.layoutMx1;
this.txt_businessStatusTxt.TabIndex = 222;
//
@@ -1032,43 +1032,43 @@
this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(114, 40);
this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
this.txt_erpProductionOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(170, 24);
this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
this.txt_erpProductionOrderNo.TabIndex = 319;
//
// txt_auditor
//
- this.txt_auditor.Location = new System.Drawing.Point(927, 180);
+ this.txt_auditor.Location = new System.Drawing.Point(942, 180);
this.txt_auditor.Name = "txt_auditor";
this.txt_auditor.Properties.Appearance.Options.UseFont = true;
- this.txt_auditor.Size = new System.Drawing.Size(166, 24);
+ this.txt_auditor.Size = new System.Drawing.Size(172, 24);
this.txt_auditor.StyleController = this.layoutMx1;
this.txt_auditor.TabIndex = 519;
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(385, 208);
+ this.txt_remarks.Location = new System.Drawing.Point(390, 208);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(436, 24);
+ this.txt_remarks.Size = new System.Drawing.Size(446, 24);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 397;
//
// txt_trackingNo
//
- this.txt_trackingNo.Location = new System.Drawing.Point(385, 40);
+ this.txt_trackingNo.Location = new System.Drawing.Point(390, 40);
this.txt_trackingNo.Name = "txt_trackingNo";
this.txt_trackingNo.Properties.Appearance.Options.UseFont = true;
- this.txt_trackingNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_trackingNo.Size = new System.Drawing.Size(170, 24);
this.txt_trackingNo.StyleController = this.layoutMx1;
this.txt_trackingNo.TabIndex = 267;
//
// txt_yrkQty
//
- this.txt_yrkQty.Location = new System.Drawing.Point(656, 40);
+ this.txt_yrkQty.Location = new System.Drawing.Point(666, 40);
this.txt_yrkQty.Name = "txt_yrkQty";
this.txt_yrkQty.Properties.Appearance.Options.UseFont = true;
- this.txt_yrkQty.Size = new System.Drawing.Size(165, 24);
+ this.txt_yrkQty.Size = new System.Drawing.Size(170, 24);
this.txt_yrkQty.StyleController = this.layoutMx1;
this.txt_yrkQty.TabIndex = 471;
//
@@ -1086,7 +1086,7 @@
this.txt_itemNo.Location = new System.Drawing.Point(114, 68);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(170, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 226;
//
@@ -1095,16 +1095,16 @@
this.txt_purchaseorderno.Location = new System.Drawing.Point(114, 96);
this.txt_purchaseorderno.Name = "txt_purchaseorderno";
this.txt_purchaseorderno.Properties.Appearance.Options.UseFont = true;
- this.txt_purchaseorderno.Size = new System.Drawing.Size(165, 24);
+ this.txt_purchaseorderno.Size = new System.Drawing.Size(170, 24);
this.txt_purchaseorderno.StyleController = this.layoutMx1;
this.txt_purchaseorderno.TabIndex = 427;
//
// txt_demandOrderNo
//
- this.txt_demandOrderNo.Location = new System.Drawing.Point(385, 96);
+ this.txt_demandOrderNo.Location = new System.Drawing.Point(390, 96);
this.txt_demandOrderNo.Name = "txt_demandOrderNo";
this.txt_demandOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_demandOrderNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_demandOrderNo.Size = new System.Drawing.Size(170, 24);
this.txt_demandOrderNo.StyleController = this.layoutMx1;
this.txt_demandOrderNo.TabIndex = 351;
//
@@ -1113,43 +1113,43 @@
this.txt_purchaseorderentryseq.Location = new System.Drawing.Point(114, 124);
this.txt_purchaseorderentryseq.Name = "txt_purchaseorderentryseq";
this.txt_purchaseorderentryseq.Properties.Appearance.Options.UseFont = true;
- this.txt_purchaseorderentryseq.Size = new System.Drawing.Size(165, 24);
+ this.txt_purchaseorderentryseq.Size = new System.Drawing.Size(170, 24);
this.txt_purchaseorderentryseq.StyleController = this.layoutMx1;
this.txt_purchaseorderentryseq.TabIndex = 438;
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(656, 124);
+ this.txt_dwName.Location = new System.Drawing.Point(666, 124);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
- this.txt_dwName.Size = new System.Drawing.Size(165, 24);
+ this.txt_dwName.Size = new System.Drawing.Size(170, 24);
this.txt_dwName.StyleController = this.layoutMx1;
this.txt_dwName.TabIndex = 228;
//
// txt_closingType
//
- this.txt_closingType.Location = new System.Drawing.Point(385, 180);
+ this.txt_closingType.Location = new System.Drawing.Point(390, 180);
this.txt_closingType.Name = "txt_closingType";
this.txt_closingType.Properties.Appearance.Options.UseFont = true;
- this.txt_closingType.Size = new System.Drawing.Size(165, 24);
+ this.txt_closingType.Size = new System.Drawing.Size(170, 24);
this.txt_closingType.StyleController = this.layoutMx1;
this.txt_closingType.TabIndex = 378;
//
// txt_estimatedStartTime
//
- this.txt_estimatedStartTime.Location = new System.Drawing.Point(927, 40);
+ this.txt_estimatedStartTime.Location = new System.Drawing.Point(942, 40);
this.txt_estimatedStartTime.Name = "txt_estimatedStartTime";
this.txt_estimatedStartTime.Properties.Appearance.Options.UseFont = true;
- this.txt_estimatedStartTime.Size = new System.Drawing.Size(166, 24);
+ this.txt_estimatedStartTime.Size = new System.Drawing.Size(172, 24);
this.txt_estimatedStartTime.StyleController = this.layoutMx1;
this.txt_estimatedStartTime.TabIndex = 243;
//
// txt_demandOrderLineNo
//
- this.txt_demandOrderLineNo.Location = new System.Drawing.Point(385, 124);
+ this.txt_demandOrderLineNo.Location = new System.Drawing.Point(390, 124);
this.txt_demandOrderLineNo.Name = "txt_demandOrderLineNo";
this.txt_demandOrderLineNo.Properties.Appearance.Options.UseFont = true;
- this.txt_demandOrderLineNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_demandOrderLineNo.Size = new System.Drawing.Size(170, 24);
this.txt_demandOrderLineNo.StyleController = this.layoutMx1;
this.txt_demandOrderLineNo.TabIndex = 360;
//
@@ -1158,34 +1158,34 @@
this.txt_sourceOrderNo.Location = new System.Drawing.Point(114, 180);
this.txt_sourceOrderNo.Name = "txt_sourceOrderNo";
this.txt_sourceOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_sourceOrderNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_sourceOrderNo.Size = new System.Drawing.Size(170, 24);
this.txt_sourceOrderNo.StyleController = this.layoutMx1;
this.txt_sourceOrderNo.TabIndex = 336;
//
// txt_closingPerson
//
- this.txt_closingPerson.Location = new System.Drawing.Point(385, 152);
+ this.txt_closingPerson.Location = new System.Drawing.Point(390, 152);
this.txt_closingPerson.Name = "txt_closingPerson";
this.txt_closingPerson.Properties.Appearance.Options.UseFont = true;
- this.txt_closingPerson.Size = new System.Drawing.Size(165, 24);
+ this.txt_closingPerson.Size = new System.Drawing.Size(170, 24);
this.txt_closingPerson.StyleController = this.layoutMx1;
this.txt_closingPerson.TabIndex = 370;
//
// txt_storageUpperLimit
//
- this.txt_storageUpperLimit.Location = new System.Drawing.Point(656, 152);
+ this.txt_storageUpperLimit.Location = new System.Drawing.Point(666, 152);
this.txt_storageUpperLimit.Name = "txt_storageUpperLimit";
this.txt_storageUpperLimit.Properties.Appearance.Options.UseFont = true;
- this.txt_storageUpperLimit.Size = new System.Drawing.Size(165, 24);
+ this.txt_storageUpperLimit.Size = new System.Drawing.Size(170, 24);
this.txt_storageUpperLimit.StyleController = this.layoutMx1;
this.txt_storageUpperLimit.TabIndex = 258;
//
// txt_estimatedEndTime
//
- this.txt_estimatedEndTime.Location = new System.Drawing.Point(927, 68);
+ this.txt_estimatedEndTime.Location = new System.Drawing.Point(942, 68);
this.txt_estimatedEndTime.Name = "txt_estimatedEndTime";
this.txt_estimatedEndTime.Properties.Appearance.Options.UseFont = true;
- this.txt_estimatedEndTime.Size = new System.Drawing.Size(166, 24);
+ this.txt_estimatedEndTime.Size = new System.Drawing.Size(172, 24);
this.txt_estimatedEndTime.StyleController = this.layoutMx1;
this.txt_estimatedEndTime.TabIndex = 247;
//
@@ -1194,33 +1194,33 @@
this.txt_bomVersion.Location = new System.Drawing.Point(114, 152);
this.txt_bomVersion.Name = "txt_bomVersion";
this.txt_bomVersion.Properties.Appearance.Options.UseFont = true;
- this.txt_bomVersion.Size = new System.Drawing.Size(165, 24);
+ this.txt_bomVersion.Size = new System.Drawing.Size(170, 24);
this.txt_bomVersion.StyleController = this.layoutMx1;
this.txt_bomVersion.TabIndex = 280;
//
// txt_storageLowerLimit
//
- this.txt_storageLowerLimit.Location = new System.Drawing.Point(656, 180);
+ this.txt_storageLowerLimit.Location = new System.Drawing.Point(666, 180);
this.txt_storageLowerLimit.Name = "txt_storageLowerLimit";
this.txt_storageLowerLimit.Properties.Appearance.Options.UseFont = true;
- this.txt_storageLowerLimit.Size = new System.Drawing.Size(165, 24);
+ this.txt_storageLowerLimit.Size = new System.Drawing.Size(170, 24);
this.txt_storageLowerLimit.StyleController = this.layoutMx1;
this.txt_storageLowerLimit.TabIndex = 262;
//
// txt_planReleaseDate
//
- this.txt_planReleaseDate.Location = new System.Drawing.Point(927, 96);
+ this.txt_planReleaseDate.Location = new System.Drawing.Point(942, 96);
this.txt_planReleaseDate.Name = "txt_planReleaseDate";
this.txt_planReleaseDate.Properties.Appearance.Options.UseFont = true;
- this.txt_planReleaseDate.Size = new System.Drawing.Size(166, 24);
+ this.txt_planReleaseDate.Size = new System.Drawing.Size(172, 24);
this.txt_planReleaseDate.StyleController = this.layoutMx1;
this.txt_planReleaseDate.TabIndex = 252;
//
// txt_wrkQty
//
- this.txt_wrkQty.Location = new System.Drawing.Point(656, 68);
+ this.txt_wrkQty.Location = new System.Drawing.Point(666, 68);
this.txt_wrkQty.Name = "txt_wrkQty";
- this.txt_wrkQty.Size = new System.Drawing.Size(165, 24);
+ this.txt_wrkQty.Size = new System.Drawing.Size(170, 24);
this.txt_wrkQty.StyleController = this.layoutMx1;
this.txt_wrkQty.TabIndex = 667;
//
@@ -1344,7 +1344,7 @@
rowDefinition6,
rowDefinition7,
rowDefinition8});
- this.Root.Size = new System.Drawing.Size(1105, 244);
+ this.Root.Size = new System.Drawing.Size(1126, 244);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1352,37 +1352,37 @@
this.layoutControlItem1.Control = this.txt_orderNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem1.Text = "鎶曟枡鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_orderType;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_workOrderQty;
- this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_businessStatusTxt;
- this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem4.Text = "涓氬姟鐘舵��";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1392,29 +1392,29 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_trackingNo;
- this.layoutControlItem6.Location = new System.Drawing.Point(271, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(276, 28);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem6.Text = "璁″垝璺熻釜鍙�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_yrkQty;
- this.layoutControlItem7.Location = new System.Drawing.Point(542, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(552, 28);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1424,18 +1424,18 @@
this.layoutControlItem9.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem9.Text = "浜у搧缂栫爜";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_itemName;
- this.layoutControlItem10.Location = new System.Drawing.Point(271, 56);
+ this.layoutControlItem10.Location = new System.Drawing.Point(276, 56);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem10.Text = "浜у搧鍚嶇О";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1445,18 +1445,18 @@
this.layoutControlItem12.Location = new System.Drawing.Point(0, 84);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem12.Text = "閲囪喘璁㈠崟";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_demandOrderNo;
- this.layoutControlItem13.Location = new System.Drawing.Point(271, 84);
+ this.layoutControlItem13.Location = new System.Drawing.Point(276, 84);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem13.Text = "闇�姹傚崟鎹彿";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1466,18 +1466,18 @@
this.layoutControlItem16.Location = new System.Drawing.Point(0, 112);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem16.Text = "閲囪喘鍗曡鍙�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_demandOrderLineNo;
- this.layoutControlItem17.Location = new System.Drawing.Point(271, 112);
+ this.layoutControlItem17.Location = new System.Drawing.Point(276, 112);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem17.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem17.Text = "闇�姹傚崟鎹鍙�";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1487,18 +1487,18 @@
this.layoutControlItem20.Location = new System.Drawing.Point(0, 140);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem20.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem20.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem20.Text = "BOM鐗堟";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_closingPerson;
- this.layoutControlItem21.Location = new System.Drawing.Point(271, 140);
+ this.layoutControlItem21.Location = new System.Drawing.Point(276, 140);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem21.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem21.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem21.Text = "缁撴浜哄憳";
this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1508,18 +1508,18 @@
this.layoutControlItem24.Location = new System.Drawing.Point(0, 168);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem24.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem24.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem24.Text = "婧愬崟缂栧彿";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_closingType;
- this.layoutControlItem25.Location = new System.Drawing.Point(271, 168);
+ this.layoutControlItem25.Location = new System.Drawing.Point(276, 168);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem25.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem25.Text = "缁撴绫诲瀷";
this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1529,7 +1529,7 @@
this.layoutControlItem33.Location = new System.Drawing.Point(0, 196);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem33.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem33.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem33.Text = "鍏ュ簱璐т富";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1537,22 +1537,22 @@
//
this.layoutControlItem15.Control = this.txt_estimatedStartTime;
this.layoutControlItem15.CustomizationFormText = "Erp棰勮寮�宸�";
- this.layoutControlItem15.Location = new System.Drawing.Point(813, 28);
+ this.layoutControlItem15.Location = new System.Drawing.Point(828, 28);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem15.Text = "Erp棰勮寮�宸�";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_estimatedEndTime;
- this.layoutControlItem19.Location = new System.Drawing.Point(813, 56);
+ this.layoutControlItem19.Location = new System.Drawing.Point(828, 56);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem19.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem19.Text = "Erp棰勮瀹屽伐";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1560,22 +1560,22 @@
//
this.layoutControlItem23.Control = this.txt_planReleaseDate;
this.layoutControlItem23.CustomizationFormText = "Erp璁″垝涓嬭揪";
- this.layoutControlItem23.Location = new System.Drawing.Point(813, 84);
+ this.layoutControlItem23.Location = new System.Drawing.Point(828, 84);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem23.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem23.Text = "Erp璁″垝涓嬭揪";
this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_planConfirmation;
- this.layoutControlItem27.Location = new System.Drawing.Point(813, 112);
+ this.layoutControlItem27.Location = new System.Drawing.Point(828, 112);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem27.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem27.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem27.Text = "Erp璁″垝纭";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1583,100 +1583,100 @@
//
this.layoutControlItem31.Control = this.txt_auditDate;
this.layoutControlItem31.CustomizationFormText = "Mes瀹℃牳鏃堕棿";
- this.layoutControlItem31.Location = new System.Drawing.Point(813, 140);
+ this.layoutControlItem31.Location = new System.Drawing.Point(828, 140);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem31.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem31.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem31.Text = "Mes瀹℃牳鏃堕棿";
this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_auditor;
- this.layoutControlItem26.Location = new System.Drawing.Point(813, 168);
+ this.layoutControlItem26.Location = new System.Drawing.Point(828, 168);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem26.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem26.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem26.Text = "Mes瀹℃牳浜哄憳";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.txt_auditStatus;
- this.layoutControlItem30.Location = new System.Drawing.Point(813, 196);
+ this.layoutControlItem30.Location = new System.Drawing.Point(828, 196);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem30.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem30.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem30.Text = "Mes瀹℃牳鐘舵��";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_storageLowerLimit;
- this.layoutControlItem22.Location = new System.Drawing.Point(542, 168);
+ this.layoutControlItem22.Location = new System.Drawing.Point(552, 168);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem22.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem22.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem22.Text = "鍏ュ簱涓嬮檺";
this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_storageUpperLimit;
- this.layoutControlItem18.Location = new System.Drawing.Point(542, 140);
+ this.layoutControlItem18.Location = new System.Drawing.Point(552, 140);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem18.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem18.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem18.Text = "鍏ュ簱涓婇檺";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_dwName;
- this.layoutControlItem14.Location = new System.Drawing.Point(542, 112);
+ this.layoutControlItem14.Location = new System.Drawing.Point(552, 112);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem14.Text = "鍗曚綅";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemModel;
- this.layoutControlItem11.Location = new System.Drawing.Point(542, 84);
+ this.layoutControlItem11.Location = new System.Drawing.Point(552, 84);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.txt_wrkQty;
- this.layoutControlItem35.Location = new System.Drawing.Point(542, 56);
+ this.layoutControlItem35.Location = new System.Drawing.Point(552, 56);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem35.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem35.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem35.Text = "鏈叆搴撴暟";
this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_remarks;
- this.layoutControlItem28.Location = new System.Drawing.Point(271, 196);
+ this.layoutControlItem28.Location = new System.Drawing.Point(276, 196);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem28.Size = new System.Drawing.Size(542, 28);
+ this.layoutControlItem28.Size = new System.Drawing.Size(552, 28);
this.layoutControlItem28.Text = "澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs
index 39ea454..2ae86fd 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs
@@ -66,7 +66,6 @@
this.Name = "ShowFile";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "鏂囦欢棰勮";
- this.TopMost = true;
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
((System.ComponentModel.ISupportInitialize)(this.pane1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtUrl.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFile.cs b/DevApp/Gs.DevApp/UserControl/ShowFile.cs
index eefa5e3..9bef396 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFile.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFile.cs
@@ -1,6 +1,7 @@
锘縰sing CefSharp.WinForms;
using System;
using System.Configuration;
+using System.Data.SqlClient;
using System.IO;
using System.Windows.Forms;
@@ -8,6 +9,7 @@
{
public partial class ShowFile : DevExpress.XtraEditors.XtraForm
{
+ string strConn = "Data Source=192.168.1.146,12468;Initial Catalog=GS_MES;User ID=mesUser;Password =qixi1qaz@WSXmes";
private static readonly string WebApiUrl =
ConfigurationManager.AppSettings["WebApiUrl"];
private ChromiumWebBrowser chromeBrowser;
@@ -27,8 +29,23 @@
private void ShowFile_Load(object sender, EventArgs e)
{
- string filePath = System.Uri.EscapeUriString(urlPath);
string fileType = GetFileType(urlPath);
+ string filePath = "";
+ //杩欐槸guid,涓嶆槸璺緞锛屾牴鎹甮uid 璇诲彇鍒板畠鐨勮矾寰�
+ if (urlPath.Length == 36)
+ {
+ System.Text.StringBuilder sb = new System.Text.StringBuilder(" select top 1 url_Path from [dbo].[MES_FILE] where parent_Guid='" + urlPath + "'");
+ object obj = GetSingle(sb.ToString());
+ if (obj != null)
+ {
+ filePath = System.Uri.EscapeUriString(obj.ToString());
+ fileType = GetFileType(filePath);
+ }
+ else
+ filePath = System.Uri.EscapeUriString(urlPath);
+ }
+ else
+ filePath = System.Uri.EscapeUriString(urlPath);
string _url = WebApiUrl + "upload/h5/site.html?fileType=" + fileType + "&filePath=" + filePath + "&mid=" + Guid.NewGuid().ToString();
chromeBrowser = new ChromiumWebBrowser(_url);
this.pane1.Controls.Add(chromeBrowser);
@@ -56,5 +73,34 @@
return "other";
}
}
+
+
+ /// <summary>
+ /// 鎵ц涓�鏉¤绠楁煡璇㈢粨鏋滆鍙ワ紝杩斿洖鏌ヨ缁撴灉锛坥bject锛夈��
+ /// </summary>
+ /// <param name="SQLString">璁＄畻鏌ヨ缁撴灉璇彞</param>
+ /// <returns>鏌ヨ缁撴灉锛坥bject锛�</returns>
+ private object GetSingle(string SQLString)
+ {
+ using (var connection = new SqlConnection(strConn))
+ {
+ using (var cmd = new SqlCommand(SQLString, connection))
+ {
+ try
+ {
+ connection.Open();
+ var obj = cmd.ExecuteScalar();
+ if (Equals(obj, null) || Equals(obj, DBNull.Value))
+ return null;
+ return obj;
+ }
+ catch (SqlException e)
+ {
+ connection.Close();
+ throw new Exception(e.Message);
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3