From 2f609b30563132cda27c0f8f4c935757571e03a2 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期五, 27 六月 2025 15:56:24 +0800 Subject: [PATCH] 倒冲 --- DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs | 394 +++++++++++++++ DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs | 843 ++++++++++++++++++++++++++++++++ DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.cs | 1 DevApp/Gs.DevApp/Gs.DevApp.csproj | 9 DevApp/Gs.DevApp/App.config | 4 DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.resx | 123 ++++ DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 12 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 82 ++ DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.Designer.cs | 60 +- 9 files changed, 1,469 insertions(+), 59 deletions(-) diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config index f77fd81..3d80851 100644 --- a/DevApp/Gs.DevApp/App.config +++ b/DevApp/Gs.DevApp/App.config @@ -28,9 +28,9 @@ </assemblyBinding> </runtime> <appSettings> - <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> + <add key="WebApiUrl" value="http://localhost:5263/" /> <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />--> - <add key="WebApiUrl" value="http://192.168.1.145:81/" /> + <!--<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/Sys/EasyRptEdtShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.Designer.cs index 72e2947..5392229 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.Designer.cs @@ -40,6 +40,8 @@ this.txt_reportName = new DevExpress.XtraEditors.TextEdit(); this.btnSave = new DevExpress.XtraEditors.SimpleButton(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl(); this.gcMain = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -48,12 +50,12 @@ this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_del = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); - this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); this.layoutControl1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txt_reportName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit(); this.splitContainerControl1.Panel1.SuspendLayout(); @@ -63,8 +65,6 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); this.SuspendLayout(); // // layoutControl1 @@ -120,6 +120,29 @@ rowDefinition1}); this.Root.Size = new System.Drawing.Size(626, 51); this.Root.TextVisible = false; + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txt_reportName; + this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.Size = new System.Drawing.Size(303, 31); + this.layoutControlItem2.Text = "妯℃澘鍚嶇О"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.btnSave; + this.layoutControlItem3.Location = new System.Drawing.Point(303, 0); + this.layoutControlItem3.MaxSize = new System.Drawing.Size(100, 31); + this.layoutControlItem3.MinSize = new System.Drawing.Size(90, 31); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem3.Size = new System.Drawing.Size(303, 31); + this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem3.Text = "淇濆瓨"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem3.TextVisible = false; // // splitContainerControl1 // @@ -198,7 +221,7 @@ // gv_operationTable // this.gv_operationTable.AppearanceCell.Options.UseFont = true; - this.gv_operationTable.Caption = "绫诲瀷"; + this.gv_operationTable.Caption = "妯℃澘缂栫爜"; this.gv_operationTable.FieldName = "reportType"; this.gv_operationTable.MinWidth = 50; this.gv_operationTable.Name = "gv_operationTable"; @@ -229,29 +252,6 @@ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.txt_reportName; - this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(303, 31); - this.layoutControlItem2.Text = "妯℃澘鍚嶇О"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem3 - // - this.layoutControlItem3.Control = this.btnSave; - this.layoutControlItem3.Location = new System.Drawing.Point(303, 0); - this.layoutControlItem3.MaxSize = new System.Drawing.Size(100, 31); - this.layoutControlItem3.MinSize = new System.Drawing.Size(90, 31); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem3.Size = new System.Drawing.Size(303, 31); - this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem3.Text = "淇濆瓨"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem3.TextVisible = false; - // // EasyRptEdtShow // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -268,6 +268,8 @@ this.layoutControl1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.txt_reportName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit(); this.splitContainerControl1.Panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit(); @@ -277,8 +279,6 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); this.ResumeLayout(false); } diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.cs index 839bf19..3132710 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.cs @@ -146,5 +146,6 @@ /// </summary> public event EventHandler<UpdateParentEventArgs> UpdateParent; + } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs new file mode 100644 index 0000000..1205e7f --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs @@ -0,0 +1,843 @@ +锘縩amespace Gs.DevApp.DevFrm.WOM +{ + partial class FrmBackFlash + { + /// <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() + { + this.components = new System.ComponentModel.Container(); + 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(); + 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_org = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_lineNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_name = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_lineType = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_isZxbg = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.pageBar1 = new UserControls.Data.UcPageBar(); + this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); + this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); + this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); + this.txt_depotId = new Gs.DevApp.UserControl.UcLookCk(); + this.txt_ItemId = new Gs.DevApp.UserControl.UcLookItems(); + this.txt_orgId = new Gs.DevApp.UserControl.UcLookOrg(); + this.lbGuid = new System.Windows.Forms.Label(); + this.txt_departmentId = new Gs.DevApp.UserControl.UcLookDepartment(); + this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); + this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); + this.txt_checkBy = new DevExpress.XtraEditors.TextEdit(); + this.txt_checkDate = new DevExpress.XtraEditors.TextEdit(); + this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit(); + this.txt_itemNo = new DevExpress.XtraEditors.TextEdit(); + this.txt_itemModel = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem9 = 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.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.tips = new DevExpress.Utils.ToolTipController(this.components); + this.picCheckBox = new System.Windows.Forms.PictureBox(); + ((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(); + 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_createDate.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).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.layoutControlItem7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).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.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; + 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.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; + this.split1.Size = new System.Drawing.Size(1126, 570); + this.split1.SplitterPosition = 0; + 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.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.HeaderPanel.Options.UseTextOptions = true; + this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; + this.gridView1.Appearance.Row.Options.UseFont = true; + this.gridView1.ColumnPanelRowHeight = 50; + this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gv_org, + this.gridColumn1, + this.gv_lineNo, + this.gv_name, + this.gv_remark, + this.gv_createBy, + this.gv_createDate, + this.gv_lastupdateBy, + this.gv_lastupdateDate, + this.gv_lineType, + this.gv_isZxbg, + this.gridColumn2, + this.gridColumn3}); + this.gridView1.GridControl = this.gcMain1; + this.gridView1.IndicatorWidth = 50; + this.gridView1.Name = "gridView1"; + this.gridView1.OptionsFind.ShowSearchNavButtons = false; + this.gridView1.OptionsView.ShowAutoFilterRow = true; + this.gridView1.OptionsView.ShowGroupPanel = false; + // + // gv_org + // + this.gv_org.AppearanceCell.Options.UseFont = true; + this.gv_org.Caption = "浣跨敤缁勭粐"; + this.gv_org.FieldName = "fSubsidiary"; + this.gv_org.MinWidth = 50; + this.gv_org.Name = "gv_org"; + this.gv_org.OptionsColumn.AllowEdit = false; + this.gv_org.Tag = "org.fnamber"; + this.gv_org.Visible = true; + this.gv_org.VisibleIndex = 0; + this.gv_org.Width = 254; + // + // gridColumn1 + // + this.gridColumn1.Caption = "鎵�鍦ㄩ儴闂�"; + this.gridColumn1.FieldName = "departName"; + this.gridColumn1.MinWidth = 60; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Tag = "query_a.departName"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 1; + this.gridColumn1.Width = 94; + // + // gv_lineNo + // + this.gv_lineNo.AppearanceCell.Options.UseFont = true; + this.gv_lineNo.Caption = "绾夸綋缂栧彿"; + this.gv_lineNo.FieldName = "lineNo"; + this.gv_lineNo.MinWidth = 50; + this.gv_lineNo.Name = "gv_lineNo"; + this.gv_lineNo.OptionsColumn.AllowEdit = false; + this.gv_lineNo.Tag = "query_a.line_no"; + this.gv_lineNo.Visible = true; + this.gv_lineNo.VisibleIndex = 2; + this.gv_lineNo.Width = 82; + // + // gv_name + // + this.gv_name.AppearanceCell.Options.UseFont = true; + this.gv_name.Caption = "浜х嚎鍚嶇О"; + this.gv_name.FieldName = "name"; + this.gv_name.MinWidth = 60; + this.gv_name.Name = "gv_name"; + this.gv_name.OptionsColumn.AllowEdit = false; + this.gv_name.Tag = "query_a.name"; + this.gv_name.Visible = true; + this.gv_name.VisibleIndex = 3; + this.gv_name.Width = 100; + // + // gv_remark + // + this.gv_remark.AppearanceCell.Options.UseFont = true; + this.gv_remark.Caption = "澶囨敞"; + this.gv_remark.FieldName = "remark"; + this.gv_remark.MinWidth = 50; + this.gv_remark.Name = "gv_remark"; + this.gv_remark.OptionsColumn.AllowEdit = false; + this.gv_remark.Tag = "query_a.remark"; + this.gv_remark.Visible = true; + this.gv_remark.VisibleIndex = 4; + this.gv_remark.Width = 79; + // + // gv_createBy + // + this.gv_createBy.AppearanceCell.Options.UseFont = true; + this.gv_createBy.Caption = "寤虹珛鑰�"; + this.gv_createBy.FieldName = "createBy"; + this.gv_createBy.MinWidth = 50; + this.gv_createBy.Name = "gv_createBy"; + this.gv_createBy.OptionsColumn.AllowEdit = false; + this.gv_createBy.Tag = "query_a.create_by"; + this.gv_createBy.Visible = true; + this.gv_createBy.VisibleIndex = 5; + this.gv_createBy.Width = 63; + // + // gv_createDate + // + this.gv_createDate.AppearanceCell.Options.UseFont = true; + this.gv_createDate.Caption = "寤虹珛鏃堕棿"; + this.gv_createDate.FieldName = "createDate"; + this.gv_createDate.MinWidth = 180; + this.gv_createDate.Name = "gv_createDate"; + this.gv_createDate.OptionsColumn.AllowEdit = false; + this.gv_createDate.Tag = "query_a.create_date"; + this.gv_createDate.Visible = true; + this.gv_createDate.VisibleIndex = 6; + this.gv_createDate.Width = 180; + // + // gv_lastupdateBy + // + this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true; + this.gv_lastupdateBy.Caption = "鏇存柊鑰�"; + this.gv_lastupdateBy.FieldName = "lastupdateBy"; + this.gv_lastupdateBy.MinWidth = 50; + this.gv_lastupdateBy.Name = "gv_lastupdateBy"; + this.gv_lastupdateBy.OptionsColumn.AllowEdit = false; + this.gv_lastupdateBy.Tag = "query_a.lastupdate_by"; + this.gv_lastupdateBy.Visible = true; + this.gv_lastupdateBy.VisibleIndex = 7; + this.gv_lastupdateBy.Width = 63; + // + // gv_lastupdateDate + // + this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true; + this.gv_lastupdateDate.Caption = "鏇存柊鏃堕棿"; + this.gv_lastupdateDate.FieldName = "lastupdateDate"; + this.gv_lastupdateDate.MinWidth = 180; + this.gv_lastupdateDate.Name = "gv_lastupdateDate"; + this.gv_lastupdateDate.OptionsColumn.AllowEdit = false; + this.gv_lastupdateDate.Tag = "query_a.lastupdate_date"; + this.gv_lastupdateDate.Visible = true; + this.gv_lastupdateDate.VisibleIndex = 8; + this.gv_lastupdateDate.Width = 180; + // + // gv_lineType + // + this.gv_lineType.AppearanceCell.Options.UseFont = true; + this.gv_lineType.Caption = "绾夸綋绫诲埆"; + this.gv_lineType.FieldName = "lineType"; + this.gv_lineType.MinWidth = 80; + this.gv_lineType.Name = "gv_lineType"; + this.gv_lineType.OptionsColumn.AllowEdit = false; + this.gv_lineType.Tag = "query_a.line_type"; + this.gv_lineType.Width = 80; + // + // gv_isZxbg + // + this.gv_isZxbg.AppearanceCell.Options.UseFont = true; + this.gv_isZxbg.Caption = "鏁寸嚎鎶ュ伐"; + this.gv_isZxbg.FieldName = "isZxbg"; + this.gv_isZxbg.MinWidth = 50; + this.gv_isZxbg.Name = "gv_isZxbg"; + this.gv_isZxbg.OptionsColumn.AllowEdit = false; + this.gv_isZxbg.Tag = "query_a.is_zxbg"; + this.gv_isZxbg.Width = 50; + // + // gridColumn2 + // + this.gridColumn2.Caption = "绾夸綋ID"; + this.gridColumn2.FieldName = "id"; + this.gridColumn2.MinWidth = 25; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 9; + this.gridColumn2.Width = 94; + // + // gridColumn3 + // + this.gridColumn3.Caption = "涓婚敭Guid"; + this.gridColumn3.FieldName = "guid"; + this.gridColumn3.MinWidth = 25; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Width = 94; + // + // 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.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; + this.splitMx1.Size = new System.Drawing.Size(1126, 570); + this.splitMx1.SplitterPosition = 130; + this.splitMx1.TabIndex = 0; + // + // layoutMx1 + // + this.layoutMx1.Controls.Add(this.txt_depotId); + this.layoutMx1.Controls.Add(this.txt_ItemId); + this.layoutMx1.Controls.Add(this.txt_orgId); + this.layoutMx1.Controls.Add(this.lbGuid); + this.layoutMx1.Controls.Add(this.txt_departmentId); + this.layoutMx1.Controls.Add(this.txt_createDate); + this.layoutMx1.Controls.Add(this.txt_createBy); + this.layoutMx1.Controls.Add(this.txt_checkBy); + this.layoutMx1.Controls.Add(this.txt_checkDate); + this.layoutMx1.Controls.Add(this.txt_checkStatus); + this.layoutMx1.Controls.Add(this.txt_itemNo); + this.layoutMx1.Controls.Add(this.txt_itemModel); + this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem9}); + this.layoutMx1.Location = new System.Drawing.Point(0, 0); + 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, 130); + this.layoutMx1.TabIndex = 0; + this.layoutMx1.Text = "layoutControl1"; + // + // txt_depotId + // + this.txt_depotId.IsReadly = false; + this.txt_depotId.Location = new System.Drawing.Point(360, 40); + this.txt_depotId.Margin = new System.Windows.Forms.Padding(0); + this.txt_depotId.Name = "txt_depotId"; + this.txt_depotId.Size = new System.Drawing.Size(200, 24); + this.txt_depotId.TabIndex = 251; + // + // txt_ItemId + // + this.txt_ItemId.IsReadly = false; + this.txt_ItemId.Location = new System.Drawing.Point(84, 68); + this.txt_ItemId.Name = "txt_ItemId"; + this.txt_ItemId.Size = new System.Drawing.Size(200, 24); + this.txt_ItemId.TabIndex = 246; + this.txt_ItemId.Tag = "no"; + // + // txt_orgId + // + this.txt_orgId.IsReadly = false; + this.txt_orgId.Location = new System.Drawing.Point(84, 12); + this.txt_orgId.Name = "txt_orgId"; + this.txt_orgId.Size = new System.Drawing.Size(200, 24); + this.txt_orgId.TabIndex = 245; + // + // lbGuid + // + this.lbGuid.Location = new System.Drawing.Point(554, 107); + this.lbGuid.Name = "lbGuid"; + this.lbGuid.Size = new System.Drawing.Size(267, 28); + this.lbGuid.TabIndex = 1; + this.lbGuid.Text = "lbGuid"; + this.lbGuid.Visible = false; + // + // txt_departmentId + // + this.txt_departmentId.IsReadly = false; + this.txt_departmentId.Location = new System.Drawing.Point(84, 40); + this.txt_departmentId.Name = "txt_departmentId"; + this.txt_departmentId.Size = new System.Drawing.Size(200, 24); + this.txt_departmentId.TabIndex = 244; + // + // txt_createDate + // + this.txt_createDate.Location = new System.Drawing.Point(636, 40); + this.txt_createDate.Name = "txt_createDate"; + this.txt_createDate.Properties.Appearance.Options.UseFont = true; + this.txt_createDate.Size = new System.Drawing.Size(200, 24); + this.txt_createDate.StyleController = this.layoutMx1; + this.txt_createDate.TabIndex = 231; + this.txt_createDate.Tag = "readonly"; + // + // txt_createBy + // + this.txt_createBy.Location = new System.Drawing.Point(636, 12); + this.txt_createBy.Name = "txt_createBy"; + this.txt_createBy.Properties.Appearance.Options.UseFont = true; + this.txt_createBy.Size = new System.Drawing.Size(200, 24); + this.txt_createBy.StyleController = this.layoutMx1; + this.txt_createBy.TabIndex = 228; + this.txt_createBy.Tag = "readonly"; + // + // txt_checkBy + // + this.txt_checkBy.Location = new System.Drawing.Point(912, 12); + this.txt_checkBy.Name = "txt_checkBy"; + this.txt_checkBy.Size = new System.Drawing.Size(202, 24); + this.txt_checkBy.StyleController = this.layoutMx1; + this.txt_checkBy.TabIndex = 247; + this.txt_checkBy.Tag = "readonly"; + // + // txt_checkDate + // + this.txt_checkDate.Location = new System.Drawing.Point(912, 40); + this.txt_checkDate.Name = "txt_checkDate"; + this.txt_checkDate.Size = new System.Drawing.Size(202, 24); + this.txt_checkDate.StyleController = this.layoutMx1; + this.txt_checkDate.TabIndex = 248; + this.txt_checkDate.Tag = "readonly"; + // + // txt_checkStatus + // + this.txt_checkStatus.Location = new System.Drawing.Point(840, 68); + this.txt_checkStatus.Name = "txt_checkStatus"; + this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑"; + this.txt_checkStatus.Size = new System.Drawing.Size(274, 24); + this.txt_checkStatus.StyleController = this.layoutMx1; + this.txt_checkStatus.TabIndex = 249; + this.txt_checkStatus.Tag = "readonly"; + // + // txt_itemNo + // + this.txt_itemNo.Location = new System.Drawing.Point(360, 68); + this.txt_itemNo.Name = "txt_itemNo"; + this.txt_itemNo.Size = new System.Drawing.Size(200, 24); + this.txt_itemNo.StyleController = this.layoutMx1; + this.txt_itemNo.TabIndex = 250; + this.txt_itemNo.Tag = "readonly"; + // + // txt_itemModel + // + this.txt_itemModel.Location = new System.Drawing.Point(636, 68); + this.txt_itemModel.Name = "txt_itemModel"; + this.txt_itemModel.Size = new System.Drawing.Size(200, 24); + this.txt_itemModel.StyleController = this.layoutMx1; + this.txt_itemModel.TabIndex = 252; + this.txt_itemModel.Tag = "readonly"; + // + // layoutControlItem9 + // + this.layoutControlItem9.Control = this.lbGuid; + this.layoutControlItem9.Location = new System.Drawing.Point(542, 96); + this.layoutControlItem9.Name = "layoutControlItem9"; + this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem9.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem9.Text = "lbGuid"; + this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem9.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.layoutControlItem7, + this.layoutControlItem8, + this.layoutControlItem10, + this.layoutControlItem5, + this.layoutControlItem6, + this.layoutControlItem11, + this.layoutControlItem12, + this.layoutControlItem4}); + 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; + this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { + rowDefinition1, + rowDefinition2, + rowDefinition3, + rowDefinition4}); + this.Root.Size = new System.Drawing.Size(1126, 132); + this.Root.TextVisible = false; + // + // layoutControlItem1 + // + this.layoutControlItem1.Control = this.txt_departmentId; + this.layoutControlItem1.Location = new System.Drawing.Point(0, 28); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem1.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem1.Text = "閫夋嫨杞﹂棿"; + this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txt_orgId; + this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem2.Text = "閫夋嫨缁勭粐"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txt_ItemId; + this.layoutControlItem3.Location = new System.Drawing.Point(0, 56); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem3.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem3.Text = "閫夋嫨鐗╂枡"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem7 + // + this.layoutControlItem7.Control = this.txt_checkBy; + this.layoutControlItem7.Location = new System.Drawing.Point(828, 0); + this.layoutControlItem7.Name = "layoutControlItem7"; + this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem7.Size = new System.Drawing.Size(278, 28); + this.layoutControlItem7.Text = "瀹℃牳鑰�"; + this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem8 + // + this.layoutControlItem8.Control = this.txt_checkDate; + this.layoutControlItem8.Location = new System.Drawing.Point(828, 28); + this.layoutControlItem8.Name = "layoutControlItem8"; + this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem8.Size = new System.Drawing.Size(278, 28); + this.layoutControlItem8.Text = "瀹℃牳鏃堕棿"; + this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem10 + // + this.layoutControlItem10.Control = this.txt_checkStatus; + this.layoutControlItem10.Location = new System.Drawing.Point(828, 56); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem10.Size = new System.Drawing.Size(278, 28); + this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem10.TextVisible = false; + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.txt_createBy; + this.layoutControlItem5.Location = new System.Drawing.Point(552, 0); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem5.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem5.Text = "寤虹珛鑰�"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.txt_createDate; + this.layoutControlItem6.Location = new System.Drawing.Point(552, 28); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem6.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem6.Text = "寤虹珛鏃堕棿"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem11 + // + this.layoutControlItem11.Control = this.txt_itemNo; + this.layoutControlItem11.Location = new System.Drawing.Point(276, 56); + this.layoutControlItem11.Name = "layoutControlItem11"; + this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem11.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem11.Text = "鐗╂枡缂栫爜"; + this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.txt_depotId; + this.layoutControlItem12.Location = new System.Drawing.Point(276, 28); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem12.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem12.Text = "閫夋嫨浠撳簱"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txt_itemModel; + this.layoutControlItem4.Location = new System.Drawing.Point(552, 56); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem4.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem4.Text = "鐗╂枡瑙勬牸"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); + // + // picCheckBox + // + this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; + this.picCheckBox.Location = new System.Drawing.Point(1028, 24); + this.picCheckBox.Name = "picCheckBox"; + this.picCheckBox.Size = new System.Drawing.Size(100, 50); + this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.picCheckBox.TabIndex = 9; + this.picCheckBox.TabStop = false; + this.picCheckBox.Visible = false; + // + // FrmBackFlash + // + 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.picCheckBox); + this.Controls.Add(this.xtraTabControl1); + this.Controls.Add(this.toolBarMenu1); + this.Name = "FrmBackFlash"; + 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(); + 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_createDate.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).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.layoutControlItem7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).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_org; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraGrid.Columns.GridColumn gv_lineNo; + private DevExpress.XtraGrid.Columns.GridColumn gv_name; + private DevExpress.XtraGrid.Columns.GridColumn gv_remark; + private DevExpress.XtraGrid.Columns.GridColumn gv_createBy; + private DevExpress.XtraGrid.Columns.GridColumn gv_createDate; + private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy; + private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate; + private DevExpress.XtraGrid.Columns.GridColumn gv_lineType; + private DevExpress.XtraGrid.Columns.GridColumn gv_isZxbg; + private UserControls.Data.UcPageBar pageBar1; + private DevExpress.XtraTab.XtraTabPage xtraTabPage2; + private DevExpress.XtraEditors.SplitContainerControl splitMx1; + private UserControl.UcLookDepartment txt_departmentId; + private System.Windows.Forms.Label lbGuid; + private DevExpress.XtraEditors.TextEdit txt_createDate; + private DevExpress.XtraEditors.TextEdit txt_createBy; + private DevExpress.XtraLayout.LayoutControl layoutMx1; + private DevExpress.XtraLayout.LayoutControlGroup Root; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; + private DevExpress.Utils.ToolTipController tips; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private UserControl.UcLookItems txt_ItemId; + private UserControl.UcLookOrg txt_orgId; + private DevExpress.XtraEditors.TextEdit txt_checkBy; + private DevExpress.XtraEditors.TextEdit txt_checkDate; + private DevExpress.XtraEditors.CheckEdit txt_checkStatus; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraEditors.TextEdit txt_itemNo; + private UserControl.UcLookCk txt_depotId; + private DevExpress.XtraEditors.TextEdit txt_itemModel; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private System.Windows.Forms.PictureBox picCheckBox; + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs new file mode 100644 index 0000000..9fdf40c --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs @@ -0,0 +1,394 @@ +锘縰sing DevExpress.RichEdit.Export; +using Gs.DevApp.Entity; +using Gs.DevApp.ToolBox; +using Gs.DevApp.UserControl; +using Newtonsoft.Json; +using OracleInternal.Sharding; +using System; +using System.Collections.Generic; +using System.Data; +using System.Threading.Tasks; +using System.Windows.Forms; +using static DevExpress.XtraBars.Docking2010.Views.BaseRegistrator; + +namespace Gs.DevApp.DevFrm.WOM +{ + public partial class FrmBackFlash : DevExpress.XtraEditors.XtraForm + { + string _webServiceName = "MesBackFlash/"; + List<FilterEntity> _filterList = new List<FilterEntity>(); + public FrmBackFlash() + { + InitializeComponent(); + this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; + this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; + this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; + this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; + this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; + this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; + toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; + toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; + this.toolBarMenu1.getXmlConfig(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) => + { + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); + }, tips); + Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) => + { + getModel(value); + }, (value) => + { + getPageList(this.pageBar1.CurrentPage); + }, lbGuid); + getPageList(1); + pageBar1.PagerEvent += PageBar1_PagerEvent; + txt_depotId.getSuppler(""); + txt_departmentId.getSuppler(""); + txt_ItemId.getSuppler(""); + } + 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_btnChkClick(object sender, EventArgs e) + { + _toolCk(1); + } + + /// <summary> + /// 鍙嶅鏍� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + /// <exception cref="NotImplementedException"></exception> + private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e) + { + _toolCk(0); + } + /// <summary> + /// 鍙栨秷浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnEscClick(object sender, EventArgs e) + { + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1); + } + + /// <summary> + /// 鍒犻櫎浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e) + { + string rowGuid = "", rowName = ""; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "guid"); + if (string.IsNullOrEmpty(rowGuid)) + { + ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) + return; + List<dynamic> lst = new List<dynamic>(); + lst.Add(rowGuid); + var _obj = lst; + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + if (xtraTabControl1.SelectedTabPageIndex == 0) + { } + else + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); + getPageList(this.pageBar1.CurrentPage); + } + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + /// <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="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnAddClick(object sender, EventArgs e) + { + lbGuid.Text = ""; + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4); + UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true); + //澧炲姞鏃讹紝榛樿缁勭粐 + string deftOrg = UtilityHelper.GetFirstOrg(txt_orgId); + } + /// <summary> + /// 淇濆瓨浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) + { + toolBarMenu1.isSetBtn = false; + if (string.IsNullOrEmpty(txt_orgId.GetId().Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("缁勭粐涓嶈兘涓虹┖锛�"); + txt_orgId.Focus(); + return; + } + if (string.IsNullOrEmpty(txt_departmentId.GetId().Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("杞﹂棿涓嶈兘涓虹┖锛�"); + txt_departmentId.Focus(); + return; + } + if (string.IsNullOrEmpty(txt_ItemId.GetId().Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("鐗╂枡涓嶈兘涓虹┖锛�"); + txt_ItemId.Focus(); + return; + } + if (string.IsNullOrEmpty(txt_depotId.GetId().Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("浠撳簱涓嶈兘涓虹┖锛�"); + txt_depotId.Focus(); + return; + } + var _obj = new + { + itemId = txt_ItemId.GetId(), + departmentId = txt_departmentId.GetId().Trim(), + depotId = txt_depotId.GetId().Trim(), + }; + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + if (_rtn.rtnCode > 0) + { + lbGuid.Text = _rtn.rtnData.outGuid; + toolBarMenu1.isSetBtn = true; + UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false); + toolBarMenu1.currentAction = ""; + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); + } + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + /// <summary> + /// + /// </summary> + /// <param name="curPage">绗嚑椤�</param> + /// <param name="pageSize">姣忛〉鍑犳潯</param> + private void getPageList(int curPage) + { + gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc, d.depot_code asc,i.item_no", + "asc", "", _sbSqlWhere.ToString()); + var json = JsonConvert.SerializeObject(pgq); + try + { + var strReturn = UtilityHelper.HttpPost("", + _webServiceName + "GetListPage", json); + var 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) + { + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); + } + } + /// <summary> + /// + /// </summary> + /// <param name="strGuid">涓婚敭</param> + /// <param name="isEdit">鏄惁鍙紪杈�</param> + /// <param name="tabIdx">閫夐」鍗″簭鍙�</param> + 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); + } + } + + + /// <summary> + /// 宸ュ叿鏉′簨浠� + /// </summary> + /// <param name="inFieldValue"></param> + private void _toolCk(int _inFieldValue) + { + string strMsg = ""; + switch (_inFieldValue) + { + case 1: + strMsg = "瀹℃牳"; + break; + case 0: + strMsg = "鍙嶅鏍�"; + break; + }; + toolBarMenu1.guidKey = ""; + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "guid"); + if (string.IsNullOrEmpty(rowGuid)) + { + MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) + return; + var _obj = new + { + guid = rowGuid, + ckValue = _inFieldValue, + parameter = "MES_BACK_FLASH,checkDate,checkStatus,createBy" + }; + try + { + var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck", + JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); + if (xtraTabControl1.SelectedTabPageIndex == 1) + { + getModel(lbGuid.Text.Trim()); + } + int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); + gridView1.FocusedRowHandle = rowHandle; + UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString()); + } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); + } + catch (Exception ex) + { + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); + } + } + + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.resx b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.resx new file mode 100644 index 0000000..5160e8b --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.resx @@ -0,0 +1,123 @@ +锘�<?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> + <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>17, 17</value> + </metadata> +</root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs index 876b1ac..3b0582d 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs @@ -63,6 +63,7 @@ DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); @@ -263,6 +264,7 @@ this.txt_yQty100 = new DevExpress.XtraEditors.TextEdit(); this.txt_kQty100 = new DevExpress.XtraEditors.TextEdit(); this.txt_iCount_100 = new DevExpress.XtraEditors.TextEdit(); + this.btnDesign = new DevExpress.XtraEditors.SimpleButton(); this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem43 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -270,6 +272,7 @@ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem45 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem47 = new DevExpress.XtraLayout.LayoutControlItem(); this.gcMx4 = new DevExpress.XtraGrid.GridControl(); this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -431,6 +434,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit(); this.xtraTabPage5.SuspendLayout(); @@ -2845,6 +2849,7 @@ this.layMx100.Controls.Add(this.txt_yQty100); this.layMx100.Controls.Add(this.txt_kQty100); this.layMx100.Controls.Add(this.txt_iCount_100); + this.layMx100.Controls.Add(this.btnDesign); this.layMx100.Dock = System.Windows.Forms.DockStyle.Fill; this.layMx100.Location = new System.Drawing.Point(0, 0); this.layMx100.Name = "layMx100"; @@ -2858,19 +2863,19 @@ // this.ucBtnPrint100.allClickKey = null; this.ucBtnPrint100.guidKey = null; - this.ucBtnPrint100.Location = new System.Drawing.Point(1192, 10); + this.ucBtnPrint100.Location = new System.Drawing.Point(1112, 10); this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint100.Name = "ucBtnPrint100"; this.ucBtnPrint100.rptParameter = null; - this.ucBtnPrint100.Size = new System.Drawing.Size(296, 32); + this.ucBtnPrint100.Size = new System.Drawing.Size(276, 32); this.ucBtnPrint100.TabIndex = 0; // // btnIn // this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16; - this.btnIn.Location = new System.Drawing.Point(1490, 12); + this.btnIn.Location = new System.Drawing.Point(1390, 12); this.btnIn.Name = "btnIn"; - this.btnIn.Size = new System.Drawing.Size(146, 27); + this.btnIn.Size = new System.Drawing.Size(96, 27); this.btnIn.StyleController = this.layMx100; this.btnIn.TabIndex = 1; this.btnIn.Text = "瀵煎叆鏉$爜"; @@ -2880,35 +2885,45 @@ this.txt_zQty100.Location = new System.Drawing.Point(114, 12); this.txt_zQty100.Name = "txt_zQty100"; this.txt_zQty100.Properties.ReadOnly = true; - this.txt_zQty100.Size = new System.Drawing.Size(188, 24); + this.txt_zQty100.Size = new System.Drawing.Size(168, 24); this.txt_zQty100.StyleController = this.layMx100; this.txt_zQty100.TabIndex = 4; // // txt_yQty100 // - this.txt_yQty100.Location = new System.Drawing.Point(408, 12); + this.txt_yQty100.Location = new System.Drawing.Point(388, 12); this.txt_yQty100.Name = "txt_yQty100"; this.txt_yQty100.Properties.ReadOnly = true; - this.txt_yQty100.Size = new System.Drawing.Size(190, 24); + this.txt_yQty100.Size = new System.Drawing.Size(170, 24); this.txt_yQty100.StyleController = this.layMx100; this.txt_yQty100.TabIndex = 5; // // txt_kQty100 // - this.txt_kQty100.Location = new System.Drawing.Point(704, 12); + this.txt_kQty100.Location = new System.Drawing.Point(664, 12); this.txt_kQty100.Name = "txt_kQty100"; this.txt_kQty100.Properties.ReadOnly = true; - this.txt_kQty100.Size = new System.Drawing.Size(190, 24); + this.txt_kQty100.Size = new System.Drawing.Size(170, 24); this.txt_kQty100.StyleController = this.layMx100; this.txt_kQty100.TabIndex = 6; // // txt_iCount_100 // - this.txt_iCount_100.Location = new System.Drawing.Point(1000, 12); + this.txt_iCount_100.Location = new System.Drawing.Point(940, 12); this.txt_iCount_100.Name = "txt_iCount_100"; - this.txt_iCount_100.Size = new System.Drawing.Size(190, 24); + this.txt_iCount_100.Size = new System.Drawing.Size(170, 24); this.txt_iCount_100.StyleController = this.layMx100; this.txt_iCount_100.TabIndex = 7; + // + // btnDesign + // + this.btnDesign.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.print_16x16; + this.btnDesign.Location = new System.Drawing.Point(1490, 12); + this.btnDesign.Name = "btnDesign"; + this.btnDesign.Size = new System.Drawing.Size(146, 27); + this.btnDesign.StyleController = this.layMx100; + this.btnDesign.TabIndex = 8; + this.btnDesign.Text = "缁存姢瀹㈡埛妯℃澘"; // // layoutControlGroup4 // @@ -2920,7 +2935,8 @@ this.layoutControlItem44, this.layoutControlItem2, this.layoutControlItem10, - this.layoutControlItem45}); + this.layoutControlItem45, + this.layoutControlItem47}); this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.layoutControlGroup4.Name = "Root"; columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent; @@ -2934,14 +2950,17 @@ columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition22.Width = 100D; columnDefinition23.SizeType = System.Windows.Forms.SizeType.Absolute; - columnDefinition23.Width = 150D; + columnDefinition23.Width = 100D; + columnDefinition24.SizeType = System.Windows.Forms.SizeType.Absolute; + columnDefinition24.Width = 150D; this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition18, columnDefinition19, columnDefinition20, columnDefinition21, columnDefinition22, - columnDefinition23}); + columnDefinition23, + columnDefinition24}); rowDefinition11.Height = 100D; rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { @@ -2954,17 +2973,17 @@ this.layoutControlItem42.Control = this.txt_zQty100; this.layoutControlItem42.Location = new System.Drawing.Point(0, 0); this.layoutControlItem42.Name = "layoutControlItem42"; - this.layoutControlItem42.Size = new System.Drawing.Size(294, 32); + this.layoutControlItem42.Size = new System.Drawing.Size(274, 32); this.layoutControlItem42.Text = "宸ュ崟鎬婚噺"; this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem43 // this.layoutControlItem43.Control = this.txt_yQty100; - this.layoutControlItem43.Location = new System.Drawing.Point(294, 0); + this.layoutControlItem43.Location = new System.Drawing.Point(274, 0); this.layoutControlItem43.Name = "layoutControlItem43"; this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem43.Size = new System.Drawing.Size(296, 32); + this.layoutControlItem43.Size = new System.Drawing.Size(276, 32); this.layoutControlItem43.Text = "宸叉墦鍗版暟"; this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18); // @@ -2972,20 +2991,20 @@ // this.layoutControlItem44.Control = this.txt_kQty100; this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟"; - this.layoutControlItem44.Location = new System.Drawing.Point(590, 0); + this.layoutControlItem44.Location = new System.Drawing.Point(550, 0); this.layoutControlItem44.Name = "layoutControlItem44"; this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem44.Size = new System.Drawing.Size(296, 32); + this.layoutControlItem44.Size = new System.Drawing.Size(276, 32); this.layoutControlItem44.Text = "鍙墦鍗版暟瀛�"; this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.btnIn; - this.layoutControlItem2.Location = new System.Drawing.Point(1478, 0); + this.layoutControlItem2.Location = new System.Drawing.Point(1378, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5; - this.layoutControlItem2.Size = new System.Drawing.Size(150, 32); + this.layoutControlItem2.Size = new System.Drawing.Size(100, 32); this.layoutControlItem2.Text = "瀵煎叆鎸夐挳"; this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem2.TextVisible = false; @@ -2993,11 +3012,11 @@ // layoutControlItem10 // this.layoutControlItem10.Control = this.ucBtnPrint100; - this.layoutControlItem10.Location = new System.Drawing.Point(1182, 0); + this.layoutControlItem10.Location = new System.Drawing.Point(1102, 0); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 4; this.layoutControlItem10.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlItem10.Size = new System.Drawing.Size(296, 32); + this.layoutControlItem10.Size = new System.Drawing.Size(276, 32); this.layoutControlItem10.Text = "鎵撳嵃鎸夐挳"; this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem10.TextVisible = false; @@ -3005,12 +3024,22 @@ // layoutControlItem45 // this.layoutControlItem45.Control = this.txt_iCount_100; - this.layoutControlItem45.Location = new System.Drawing.Point(886, 0); + this.layoutControlItem45.Location = new System.Drawing.Point(826, 0); this.layoutControlItem45.Name = "layoutControlItem45"; this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem45.Size = new System.Drawing.Size(296, 32); + this.layoutControlItem45.Size = new System.Drawing.Size(276, 32); this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟"; this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem47 + // + this.layoutControlItem47.Control = this.btnDesign; + this.layoutControlItem47.Location = new System.Drawing.Point(1478, 0); + this.layoutControlItem47.Name = "layoutControlItem47"; + this.layoutControlItem47.OptionsTableLayoutItem.ColumnIndex = 6; + this.layoutControlItem47.Size = new System.Drawing.Size(150, 32); + this.layoutControlItem47.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem47.TextVisible = false; // // gcMx4 // @@ -3321,6 +3350,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit(); this.xtraTabPage5.ResumeLayout(false); @@ -3547,5 +3577,7 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem46; private DevExpress.XtraEditors.SplitContainerControl splitMx98; private DevExpress.XtraEditors.SplitContainerControl splitMx100; + private DevExpress.XtraEditors.SimpleButton btnDesign; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem47; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs index 6b38daa..493843b 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs @@ -1,4 +1,5 @@ using Gs.DevApp.DevFrm.Rpt; +using Gs.DevApp.DevFrm.Sys; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -215,7 +216,14 @@ }; frm.ShowDialog(); }; - + this.btnDesign.Click += (s, e) => + { + EasyRptEdtShow frm = new EasyRptEdtShow(); + frm.UpdateParent += (ss, ee) => + { + }; + frm.ShowDialog(); + }; } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) @@ -900,7 +908,7 @@ + "," + "" + "}"; } - + #endregion } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index a7a57ac..cc74be8 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -915,6 +915,12 @@ <Compile Include="DevFrm\Warehouse\Models\MesDepotSections.cs" /> <Compile Include="DevFrm\Warehouse\Models\MesInvItemOutCDetails.cs" /> <Compile Include="DevFrm\Warehouse\Models\MesInvItemOutItems.cs" /> + <Compile Include="DevFrm\WOM\FrmBackFlash.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\WOM\FrmBackFlash.Designer.cs"> + <DependentUpon>FrmBackFlash.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\WOM\Frm_MesScrkDj.cs"> <SubType>Form</SubType> </Compile> @@ -1715,6 +1721,9 @@ <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesShouTuiDj.resx"> <DependentUpon>Frm_MesShouTuiDj.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\WOM\FrmBackFlash.resx"> + <DependentUpon>FrmBackFlash.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\WOM\Frm_MesScrkDj.resx"> <DependentUpon>Frm_MesScrkDj.cs</DependentUpon> </EmbeddedResource> -- Gitblit v1.9.3