From a44e14cc44c5beea13cfa0accd2237c3a8a07202 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 01 四月 2025 16:56:35 +0800 Subject: [PATCH] 现场修理 --- DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs | 181 +++++++++++ DevApp/Gs.DevApp/Gs.DevApp.csproj | 9 DevApp/Gs.DevApp/App.config | 4 DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs | 610 ++++++++++++++++++++++++++++++++++++++ DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.resx | 120 +++++++ 5 files changed, 922 insertions(+), 2 deletions(-) diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config index 673f1fc..729ea9d 100644 --- a/DevApp/Gs.DevApp/App.config +++ b/DevApp/Gs.DevApp/App.config @@ -28,8 +28,8 @@ </assemblyBinding> </runtime> <appSettings> - <add key="WebApiUrl" value="http://localhost:5263/" /> - <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> + <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> + <add key="WebApiUrl" value="http://192.168.1.145:81/" /> <add key="LogPath" value="logs" /> <add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" /> <add key="PageSize" value="50" /> diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs new file mode 100644 index 0000000..8cb3288 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs @@ -0,0 +1,610 @@ +锘縩amespace Gs.DevApp.DevFrm.Work +{ + partial class Frm_Repair + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); + this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); + this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); + this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.split1 = new DevExpress.XtraEditors.SplitContainerControl(); + this.gcMain1 = new DevExpress.XtraGrid.GridControl(); + this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); + this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); + this.pageBar1 = new UserControls.Data.UcPageBar(); + this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); + this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); + this.layoutMx1 = new DevExpress.XtraDataLayout.DataLayoutControl(); + this.lbGuid = new System.Windows.Forms.Label(); + this.txt_userName = new DevExpress.XtraEditors.TextEdit(); + this.txt_operationTime = new DevExpress.XtraEditors.TextEdit(); + this.txt_operationTable = new DevExpress.XtraEditors.TextEdit(); + this.txt_abtHno = new DevExpress.XtraEditors.TextEdit(); + this.txt_rtnJson = new DevExpress.XtraEditors.MemoEdit(); + this.txt_msg = new DevExpress.XtraEditors.MemoEdit(); + this.txt_sendJson = new DevExpress.XtraEditors.MemoEdit(); + this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); + this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); + this.xtraTabControl1.SuspendLayout(); + this.xtraTabPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit(); + this.split1.Panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit(); + this.split1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit2)).BeginInit(); + this.xtraTabPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit(); + this.splitMx1.Panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit(); + this.splitMx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); + this.layoutMx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_operationTime.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_operationTable.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_abtHno.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_rtnJson.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_sendJson.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); + this.SuspendLayout(); + // + // toolBarMenu1 + // + this.toolBarMenu1.chkParameter = null; + this.toolBarMenu1.currentAction = null; + this.toolBarMenu1.defaultActions = null; + this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; + this.toolBarMenu1.guidKey = null; + this.toolBarMenu1.isSetBtn = false; + 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.TabIndex = 0; + this.toolBarMenu1.xlsInService = null; + this.toolBarMenu1.xlsOutParameter = null; + // + // xtraTabControl1 + // + this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + 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.TabIndex = 3; + this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.xtraTabPage1, + this.xtraTabPage2}); + // + // xtraTabPage1 + // + this.xtraTabPage1.Controls.Add(this.split1); + this.xtraTabPage1.Name = "xtraTabPage1"; + this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570); + this.xtraTabPage1.Text = "鏁版嵁鍒楄〃"; + // + // split1 + // + this.split1.Dock = System.Windows.Forms.DockStyle.Fill; + this.split1.Horizontal = false; + this.split1.Location = new System.Drawing.Point(0, 0); + this.split1.Name = "split1"; + // + // split1.Panel1 + // + this.split1.Panel1.Controls.Add(this.gcMain1); + this.split1.Panel1.Controls.Add(this.pageBar1); + this.split1.Panel1.Text = "Panel1"; + // + // split1.Panel2 + // + this.split1.Panel2.Text = "Panel2"; + this.split1.Size = new System.Drawing.Size(1126, 570); + this.split1.SplitterPosition = 558; + this.split1.TabIndex = 0; + // + // gcMain1 + // + this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill; + + this.gcMain1.Location = new System.Drawing.Point(0, 0); + this.gcMain1.MainView = this.gridView1; + this.gcMain1.Name = "gcMain1"; + this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.repositoryItemMemoEdit1, + this.repositoryItemMemoEdit2}); + this.gcMain1.Size = new System.Drawing.Size(1126, 519); + this.gcMain1.TabIndex = 2; + this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView1}); + // + // gridView1 + // + + this.gridView1.Appearance.Row.Options.UseFont = true; + this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gv_operationTime, + this.gv_userName, + this.gv_operationTable, + this.gridColumn1, + this.gv_msg}); + this.gridView1.GridControl = this.gcMain1; + this.gridView1.Name = "gridView1"; + this.gridView1.OptionsFind.ShowSearchNavButtons = false; + this.gridView1.OptionsView.ShowAutoFilterRow = true; + this.gridView1.OptionsView.ShowGroupPanel = false; + // + // gv_operationTime + // + + this.gv_operationTime.AppearanceCell.Options.UseFont = true; + this.gv_operationTime.Caption = "鎿嶄綔鏃堕棿"; + this.gv_operationTime.FieldName = "operationTime"; + this.gv_operationTime.Name = "gv_operationTime"; + this.gv_operationTime.OptionsColumn.AllowEdit = false; + this.gv_operationTime.Tag = "query_OPERATION_TIME"; + this.gv_operationTime.Visible = true; + this.gv_operationTime.VisibleIndex = 0; + this.gv_operationTime.Width = 180; + // + // gv_userName + // + + this.gv_userName.AppearanceCell.Options.UseFont = true; + this.gv_userName.Caption = "鎿嶄綔浜哄憳"; + this.gv_userName.FieldName = "userName"; + this.gv_userName.Name = "gv_userName"; + this.gv_userName.OptionsColumn.AllowEdit = false; + this.gv_userName.Tag = "query_USER_NAME"; + this.gv_userName.Visible = true; + this.gv_userName.VisibleIndex = 1; + this.gv_userName.Width = 94; + // + // gv_operationTable + // + + this.gv_operationTable.AppearanceCell.Options.UseFont = true; + this.gv_operationTable.Caption = "鐩稿叧琛�"; + this.gv_operationTable.FieldName = "operationTable"; + this.gv_operationTable.Name = "gv_operationTable"; + this.gv_operationTable.OptionsColumn.AllowEdit = false; + this.gv_operationTable.Tag = "query_OPERATION_TABLE"; + this.gv_operationTable.Width = 100; + // + // gridColumn1 + // + this.gridColumn1.Caption = "鐩稿叧鍗曞彿"; + this.gridColumn1.FieldName = "abtHno"; + this.gridColumn1.MinWidth = 25; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 2; + this.gridColumn1.Width = 94; + // + // gv_msg + // + + this.gv_msg.AppearanceCell.Options.UseFont = true; + this.gv_msg.Caption = "鎿嶄綔璇︽儏"; + this.gv_msg.FieldName = "msg"; + this.gv_msg.MaxWidth = 800; + this.gv_msg.Name = "gv_msg"; + this.gv_msg.OptionsColumn.AllowEdit = false; + this.gv_msg.Tag = "query_MSG"; + this.gv_msg.Visible = true; + this.gv_msg.VisibleIndex = 3; + this.gv_msg.Width = 20; + // + // repositoryItemMemoEdit1 + // + this.repositoryItemMemoEdit1.Name = "repositoryItemMemoEdit1"; + // + // repositoryItemMemoEdit2 + // + this.repositoryItemMemoEdit2.Name = "repositoryItemMemoEdit2"; + // + // pageBar1 + // + this.pageBar1.CurrentPage = 1; + this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pageBar1.Location = new System.Drawing.Point(0, 519); + 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.TabIndex = 4; + this.pageBar1.TotalPages = 0; + // + // xtraTabPage2 + // + this.xtraTabPage2.Controls.Add(this.splitMx1); + this.xtraTabPage2.Name = "xtraTabPage2"; + this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570); + this.xtraTabPage2.Text = "鏁版嵁璇︾粏"; + // + // splitMx1 + // + 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"; + // + // splitMx1.Panel1 + // + this.splitMx1.Panel1.Controls.Add(this.layoutMx1); + this.splitMx1.Panel1.Text = "Panel1"; + // + // splitMx1.Panel2 + // + this.splitMx1.Panel2.Text = "Panel2"; + this.splitMx1.Size = new System.Drawing.Size(1126, 570); + this.splitMx1.SplitterPosition = 192; + this.splitMx1.TabIndex = 0; + // + // layoutMx1 + // + this.layoutMx1.Controls.Add(this.lbGuid); + this.layoutMx1.Controls.Add(this.txt_userName); + this.layoutMx1.Controls.Add(this.txt_operationTime); + this.layoutMx1.Controls.Add(this.txt_operationTable); + this.layoutMx1.Controls.Add(this.txt_abtHno); + this.layoutMx1.Controls.Add(this.txt_rtnJson); + this.layoutMx1.Controls.Add(this.txt_msg); + this.layoutMx1.Controls.Add(this.txt_sendJson); + this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem8}); + this.layoutMx1.Location = new System.Drawing.Point(0, 0); + this.layoutMx1.Name = "layoutMx1"; + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(733, 279, 812, 500); + this.layoutMx1.Root = this.Root; + this.layoutMx1.Size = new System.Drawing.Size(1126, 192); + this.layoutMx1.TabIndex = 0; + this.layoutMx1.Text = "dataLayoutControl1"; + // + // lbGuid + // + this.lbGuid.Location = new System.Drawing.Point(840, 42); + this.lbGuid.Name = "lbGuid"; + this.lbGuid.Size = new System.Drawing.Size(274, 27); + this.lbGuid.TabIndex = 13; + this.lbGuid.Text = "label1"; + // + // txt_userName + // + this.txt_userName.Location = new System.Drawing.Point(89, 12); + this.txt_userName.Name = "txt_userName"; + this.txt_userName.Size = new System.Drawing.Size(195, 24); + this.txt_userName.StyleController = this.layoutMx1; + this.txt_userName.TabIndex = 4; + // + // txt_operationTime + // + this.txt_operationTime.Location = new System.Drawing.Point(365, 12); + this.txt_operationTime.Name = "txt_operationTime"; + this.txt_operationTime.Size = new System.Drawing.Size(195, 24); + this.txt_operationTime.StyleController = this.layoutMx1; + this.txt_operationTime.TabIndex = 5; + // + // txt_operationTable + // + this.txt_operationTable.Location = new System.Drawing.Point(641, 12); + this.txt_operationTable.Name = "txt_operationTable"; + this.txt_operationTable.Size = new System.Drawing.Size(195, 24); + this.txt_operationTable.StyleController = this.layoutMx1; + this.txt_operationTable.TabIndex = 6; + // + // txt_abtHno + // + this.txt_abtHno.Location = new System.Drawing.Point(917, 12); + this.txt_abtHno.Name = "txt_abtHno"; + this.txt_abtHno.Size = new System.Drawing.Size(197, 24); + this.txt_abtHno.StyleController = this.layoutMx1; + this.txt_abtHno.TabIndex = 7; + // + // txt_rtnJson + // + this.txt_rtnJson.Location = new System.Drawing.Point(89, 126); + this.txt_rtnJson.Name = "txt_rtnJson"; + this.txt_rtnJson.Size = new System.Drawing.Size(1025, 54); + this.txt_rtnJson.StyleController = this.layoutMx1; + this.txt_rtnJson.TabIndex = 10; + // + // txt_msg + // + this.txt_msg.Location = new System.Drawing.Point(89, 40); + this.txt_msg.Name = "txt_msg"; + this.txt_msg.Size = new System.Drawing.Size(1025, 24); + this.txt_msg.StyleController = this.layoutMx1; + this.txt_msg.TabIndex = 11; + // + // txt_sendJson + // + this.txt_sendJson.Location = new System.Drawing.Point(89, 68); + this.txt_sendJson.Name = "txt_sendJson"; + this.txt_sendJson.Size = new System.Drawing.Size(1025, 54); + this.txt_sendJson.StyleController = this.layoutMx1; + this.txt_sendJson.TabIndex = 12; + // + // layoutControlItem8 + // + this.layoutControlItem8.Control = this.lbGuid; + this.layoutControlItem8.Location = new System.Drawing.Point(828, 30); + this.layoutControlItem8.Name = "layoutControlItem8"; + this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem8.Size = new System.Drawing.Size(278, 31); + this.layoutControlItem8.Text = "lbGuid"; + this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem8.TextVisible = false; + // + // Root + // + this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.Root.GroupBordersVisible = false; + this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem1, + this.layoutControlItem2, + this.layoutControlItem3, + this.layoutControlItem4, + this.layoutControlItem5, + this.layoutControlItem6, + this.layoutControlItem7}); + this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; + this.Root.Name = "Root"; + columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1.Width = 100D; + columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition2.Width = 100D; + columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition3.Width = 100D; + columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition4.Width = 100D; + this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition1, + columnDefinition2, + columnDefinition3, + columnDefinition4}); + rowDefinition1.Height = 100D; + rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition2.Height = 100D; + rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition3.Height = 100D; + rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition4.Height = 100D; + rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition5.Height = 100D; + rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition6.Height = 100D; + rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { + rowDefinition1, + rowDefinition2, + rowDefinition3, + rowDefinition4, + rowDefinition5, + rowDefinition6}); + this.Root.Size = new System.Drawing.Size(1126, 192); + this.Root.TextVisible = false; + // + // layoutControlItem1 + // + this.layoutControlItem1.Control = this.txt_userName; + this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem1.Text = "鎿嶄綔浜哄憳"; + this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18); + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txt_operationTime; + 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(276, 28); + this.layoutControlItem2.Text = "鎿嶄綔鏃堕棿"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txt_operationTable; + 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(276, 28); + this.layoutControlItem3.Text = "鐩稿叧琛�"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18); + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txt_abtHno; + 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(278, 28); + this.layoutControlItem4.Text = "鐩稿叧鍗曞彿"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18); + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.txt_msg; + this.layoutControlItem5.Location = new System.Drawing.Point(0, 28); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 4; + this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem5.Size = new System.Drawing.Size(1106, 28); + this.layoutControlItem5.Text = "鎿嶄綔璇︽儏"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18); + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.txt_sendJson; + this.layoutControlItem6.Location = new System.Drawing.Point(0, 56); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.OptionsTableLayoutItem.ColumnSpan = 4; + this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem6.OptionsTableLayoutItem.RowSpan = 2; + this.layoutControlItem6.Size = new System.Drawing.Size(1106, 58); + this.layoutControlItem6.Text = "鍙戦�丣SON"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(65, 18); + // + // layoutControlItem7 + // + this.layoutControlItem7.Control = this.txt_rtnJson; + this.layoutControlItem7.Location = new System.Drawing.Point(0, 114); + this.layoutControlItem7.Name = "layoutControlItem7"; + this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 4; + this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem7.OptionsTableLayoutItem.RowSpan = 2; + this.layoutControlItem7.Size = new System.Drawing.Size(1106, 58); + this.layoutControlItem7.Text = "杩斿洖JSON"; + this.layoutControlItem7.TextSize = new System.Drawing.Size(65, 18); + // + // SysLog + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1128, 682); + this.Controls.Add(this.xtraTabControl1); + this.Controls.Add(this.toolBarMenu1); + this.Name = "SysLog"; + this.Text = "绯荤粺鏃ュ織"; + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); + this.xtraTabControl1.ResumeLayout(false); + this.xtraTabPage1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit(); + this.split1.Panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit(); + this.split1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit2)).EndInit(); + this.xtraTabPage2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit(); + this.splitMx1.Panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit(); + this.splitMx1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit(); + this.layoutMx1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_operationTime.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_operationTable.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_abtHno.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_rtnJson.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_sendJson.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); + this.ResumeLayout(false); + + } + #endregion + private UserControl.UcToolBarMenu toolBarMenu1; + private DevExpress.XtraTab.XtraTabControl xtraTabControl1; + private DevExpress.XtraTab.XtraTabPage xtraTabPage1; + private DevExpress.XtraEditors.SplitContainerControl split1; + private DevExpress.XtraGrid.GridControl gcMain1; + private DevExpress.XtraGrid.Views.Grid.GridView gridView1; + private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime; + private DevExpress.XtraGrid.Columns.GridColumn gv_userName; + private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraGrid.Columns.GridColumn gv_msg; + private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1; + private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit2; + private UserControls.Data.UcPageBar pageBar1; + private DevExpress.XtraTab.XtraTabPage xtraTabPage2; + private DevExpress.XtraEditors.SplitContainerControl splitMx1; + private DevExpress.XtraDataLayout.DataLayoutControl layoutMx1; + private DevExpress.XtraLayout.LayoutControlGroup Root; + private DevExpress.XtraEditors.TextEdit txt_userName; + private DevExpress.XtraEditors.TextEdit txt_operationTime; + private DevExpress.XtraEditors.TextEdit txt_operationTable; + private DevExpress.XtraEditors.TextEdit txt_abtHno; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraEditors.MemoEdit txt_rtnJson; + private DevExpress.XtraEditors.MemoEdit txt_msg; + private DevExpress.XtraEditors.MemoEdit txt_sendJson; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private System.Windows.Forms.Label lbGuid; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs new file mode 100644 index 0000000..1953f81 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs @@ -0,0 +1,181 @@ +锘縰sing DevExpress.XtraEditors; +using Gs.DevApp.Entity; +using Gs.DevApp.ToolBox; +using Gs.DevApp.UserControl; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Gs.DevApp.DevFrm.Work +{ + public partial class Frm_Repair : DevExpress.XtraEditors.XtraForm + { + string _webServiceName = "SysLog/"; + private List<FilterEntity> _filterList = new List<FilterEntity>(); + public Frm_Repair() + { + InitializeComponent(); + this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; + this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; + this.toolBarMenu1.getXmlConfig(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, null, "", (value) => + { + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); + }); + Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) => + { + getModel(value); + }, (value) => + { + getPageList(this.pageBar1.CurrentPage); + }); + getPageList(1); + pageBar1.PagerEvent += PageBar1_PagerEvent; + } + private async void GridView1_ColumnFilterChanged(object sender, EventArgs e) + { + _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); + await Task.Delay(100); + getPageList(1); + } + + /// <summary> + /// 鍒嗛〉浜嬩欢 + /// </summary> + /// <param name="curPage"></param> + /// <param name="pageSize"></param> + private void PageBar1_PagerEvent(int curPage, int pageSize) + { + getPageList(curPage); + } + /// <summary> + /// 鏌ヨ浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e) + { + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + gridView1.ActiveFilter.Clear(); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName); + frm.UpdateParent += Frm_UpdateParent; + frm.ShowDialog(); + } + /// <summary> + /// 鏌ヨ鍥炶皟 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void Frm_UpdateParent(object sender, UpdateParentEventArgs e) + { + _filterList = e.FilterList; + getPageList(1); + } + + /// <summary> + /// 鍒锋柊浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) + { + if (xtraTabControl1.SelectedTabPageIndex == 1) + getModel(lbGuid.Text.Trim()); + else + { + //_filterList.Clear(); + //if (gridView1.ActiveFilter.Count > 0) + //{ + // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + // gridView1.ActiveFilter.Clear(); + // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + //} + //getPageList(1); + getPageList(this.pageBar1.CurrentPage); + } + } + + /// <summary> + /// + /// </summary> + /// <param name="curPage">绗嚑椤�</param> + /// <param name="pageSize">姣忛〉鍑犳潯</param> + private void getPageList(int curPage) + { + var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "OPERATION_TIME", "desc,ABT_HNO desc", "", _sbSqlWhere.ToString()); + string json = JsonConvert.SerializeObject(pgq); + try + { + var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json); + ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn); + if (dd.rtnCode > 0) + { + DataTable dt = dd.rtnData.list; + gcMain1.BindingContext = new BindingContext(); + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + if (dt.Rows.Count > 0) + { + gcMain1.DataSource = dt; + gcMain1.ForceInitialize(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); + } + else + UtilityHelper.SetDefaultTable(gcMain1, gridView1); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉 + pageBar1.CurrentPage = curPage;//褰撳墠椤� + pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟 + } + else + { + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg); + } + } + catch (Exception ex) + { + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); + } + } + private void getModel(string strGuid) + { + bool isEdit = false; + if (toolBarMenu1.currentAction == "add") return; + if (toolBarMenu1.currentAction == "edit") isEdit = true; + if (string.IsNullOrEmpty(strGuid)) + { + ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + var _obj = new + { + guid = strGuid,//涓诲缓 + }; + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + dynamic dy = _rtn.rtnData; + lbGuid.Text = strGuid; + UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit); + } + else + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.resx b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.resx @@ -0,0 +1,120 @@ +锘�<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 23efa03..14b303e 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -713,6 +713,12 @@ <Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs"> <DependentUpon>Frm_MesWorkProd.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Work\Frm_Repair.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Work\Frm_Repair.Designer.cs"> + <DependentUpon>Frm_Repair.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\Work\Frm_Work01.cs"> <SubType>Form</SubType> </Compile> @@ -1381,6 +1387,9 @@ <EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx"> <DependentUpon>Frm_MesWorkProd.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Work\Frm_Repair.resx"> + <DependentUpon>Frm_Repair.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Work\Frm_Work01.resx"> <DependentUpon>Frm_Work01.cs</DependentUpon> </EmbeddedResource> -- Gitblit v1.9.3