From c93910363c60e95266a2f9468c1346e68124adef Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期五, 11 七月 2025 17:06:11 +0800 Subject: [PATCH] 验退 --- DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.resx | 6 DevApp/Gs.DevApp/Gs.DevApp.csproj.user | 2 DevApp/Gs.DevApp/XtraForm1.Designer.cs | 192 ++---- DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs | 307 +++++++++ DevApp/Gs.DevApp/App.config | 4 DevApp/Gs.DevApp/XtraForm1.resx | 6 DevApp/Gs.DevApp/XtraForm1.cs | 101 +++ DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs | 1193 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 1,667 insertions(+), 144 deletions(-) diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config index b236262..05b6845 100644 --- a/DevApp/Gs.DevApp/App.config +++ b/DevApp/Gs.DevApp/App.config @@ -35,9 +35,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/Ck/Frm_MesYanTui.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs index 7d7ecc5..6e3594f 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs @@ -28,19 +28,1206 @@ /// </summary> private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); + 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.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_fType = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_itemOutNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn19 = 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.lbGuid = new System.Windows.Forms.Label(); + this.txt_checkUser = new DevExpress.XtraEditors.TextEdit(); + this.txt_checkDate = new DevExpress.XtraEditors.TextEdit(); + this.txt_suppName = new DevExpress.XtraEditors.TextEdit(); + this.txt_reason = new DevExpress.XtraEditors.ComboBoxEdit(); + this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit(); + this.txt_itemCgytNo = new DevExpress.XtraEditors.TextEdit(); + this.txt_isOut = new DevExpress.XtraEditors.CheckEdit(); + this.txt_remark = new DevExpress.XtraEditors.TextEdit(); + this.txt_status = new DevExpress.XtraEditors.CheckEdit(); + this.txt_guid = new DevExpress.XtraEditors.TextEdit(); + this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); + this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); + this.lb_guid = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.lab_createBy = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); + this.tabMx = new DevExpress.XtraTab.XtraTabControl(); + this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); + this.gcMx1 = new DevExpress.XtraGrid.GridControl(); + this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2itemOutId = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); + this.gcMx2 = new DevExpress.XtraGrid.GridControl(); + this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.picCheckBox = new System.Windows.Forms.PictureBox(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.tips = new DevExpress.Utils.ToolTipController(this.components); + ((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.Panel2.SuspendLayout(); + this.splitMx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); + this.layoutMx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_itemCgytNo.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_isOut.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.lb_guid)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.lab_createBy)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); + this.tabMx.SuspendLayout(); + this.tabMxPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); + this.xtraTabPage3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).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 = 3; + // + // 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.gridColumn13, + this.gv_status, + this.gv_fType, + this.gv_itemOutNo, + this.gv_suppNo, + this.gridColumn1, + this.gridColumn3, + this.gv_createDate, + this.gridColumn4, + this.gv_checkDate, + this.gv_reason, + this.gv_fmrmode, + this.gridColumn19}); + 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; + // + // gridColumn13 + // + this.gridColumn13.Caption = "閫�鏂欑粍缁�"; + this.gridColumn13.FieldName = "receivingOrg"; + this.gridColumn13.Name = "gridColumn13"; + this.gridColumn13.Tag = "org.fnamber"; + this.gridColumn13.Visible = true; + this.gridColumn13.VisibleIndex = 0; + this.gridColumn13.Width = 250; + // + // gv_status + // + this.gv_status.AppearanceCell.Options.UseFont = true; + this.gv_status.Caption = "瀹℃牳鏍囪瘑"; + this.gv_status.FieldName = "statusChk"; + this.gv_status.MaxWidth = 50; + this.gv_status.MinWidth = 50; + this.gv_status.Name = "gv_status"; + this.gv_status.OptionsColumn.AllowEdit = false; + this.gv_status.Tag = "query_a.status"; + this.gv_status.Visible = true; + this.gv_status.VisibleIndex = 1; + this.gv_status.Width = 50; + // + // gv_fType + // + this.gv_fType.AppearanceCell.Options.UseFont = true; + this.gv_fType.Caption = "濮斿鏍囪瘑"; + this.gv_fType.FieldName = "isOut"; + this.gv_fType.MaxWidth = 50; + this.gv_fType.MinWidth = 50; + this.gv_fType.Name = "gv_fType"; + this.gv_fType.OptionsColumn.AllowEdit = false; + this.gv_fType.Tag = "query_a.f_type"; + this.gv_fType.Visible = true; + this.gv_fType.VisibleIndex = 2; + this.gv_fType.Width = 50; + // + // gv_itemOutNo + // + this.gv_itemOutNo.AppearanceCell.Options.UseFont = true; + this.gv_itemOutNo.Caption = "楠岄��鍗曞彿 "; + this.gv_itemOutNo.FieldName = "itemCgytNo"; + this.gv_itemOutNo.Name = "gv_itemOutNo"; + this.gv_itemOutNo.OptionsColumn.AllowEdit = false; + this.gv_itemOutNo.Tag = "query_a.item_out_no"; + this.gv_itemOutNo.Visible = true; + this.gv_itemOutNo.VisibleIndex = 3; + this.gv_itemOutNo.Width = 100; + // + // gv_suppNo + // + this.gv_suppNo.AppearanceCell.Options.UseFont = true; + this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鍙� "; + this.gv_suppNo.FieldName = "suppNo2"; + this.gv_suppNo.Name = "gv_suppNo"; + this.gv_suppNo.OptionsColumn.AllowEdit = false; + this.gv_suppNo.Tag = "query_a.supp_no"; + this.gv_suppNo.Visible = true; + this.gv_suppNo.VisibleIndex = 4; + this.gv_suppNo.Width = 94; + // + // gridColumn1 + // + this.gridColumn1.Caption = "渚涘簲鍟嗗悕绉�"; + this.gridColumn1.FieldName = "suppName"; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 5; + this.gridColumn1.Width = 94; + // + // gridColumn3 + // + this.gridColumn3.Caption = "鍒涘缓浜�"; + this.gridColumn3.FieldName = "createBy"; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 6; + this.gridColumn3.Width = 94; + // + // gv_createDate + // + this.gv_createDate.AppearanceCell.Options.UseFont = true; + this.gv_createDate.Caption = "鍒涘缓鏃堕棿 "; + this.gv_createDate.FieldName = "createDate"; + 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 = 7; + this.gv_createDate.Width = 180; + // + // gridColumn4 + // + this.gridColumn4.Caption = "瀹℃牳浜�"; + this.gridColumn4.FieldName = "checkUser"; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 8; + this.gridColumn4.Width = 94; + // + // gv_checkDate + // + this.gv_checkDate.AppearanceCell.Options.UseFont = true; + this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡 "; + this.gv_checkDate.FieldName = "checkDate"; + this.gv_checkDate.Name = "gv_checkDate"; + this.gv_checkDate.OptionsColumn.AllowEdit = false; + this.gv_checkDate.Tag = "query_a.check_date"; + this.gv_checkDate.Visible = true; + this.gv_checkDate.VisibleIndex = 9; + this.gv_checkDate.Width = 180; + // + // gv_reason + // + this.gv_reason.AppearanceCell.Options.UseFont = true; + this.gv_reason.Caption = "閫�鏂欏師鍥�"; + this.gv_reason.FieldName = "reason"; + this.gv_reason.Name = "gv_reason"; + this.gv_reason.OptionsColumn.AllowEdit = false; + this.gv_reason.Tag = "query_a.reason"; + this.gv_reason.Visible = true; + this.gv_reason.VisibleIndex = 10; + this.gv_reason.Width = 94; + // + // gv_fmrmode + // + this.gv_fmrmode.AppearanceCell.Options.UseFont = true; + this.gv_fmrmode.Caption = "閫�鏂欐柟寮� "; + this.gv_fmrmode.FieldName = "fmrmode"; + this.gv_fmrmode.Name = "gv_fmrmode"; + this.gv_fmrmode.OptionsColumn.AllowEdit = false; + this.gv_fmrmode.Tag = "query_a.fmrmode"; + this.gv_fmrmode.Visible = true; + this.gv_fmrmode.VisibleIndex = 11; + this.gv_fmrmode.Width = 94; + // + // gridColumn19 + // + this.gridColumn19.Caption = "涓婚敭GUID"; + this.gridColumn19.FieldName = "guid"; + this.gridColumn19.MinWidth = 25; + this.gridColumn19.Name = "gridColumn19"; + this.gridColumn19.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.Controls.Add(this.tabMx); + this.splitMx1.Panel2.Text = "Panel2"; + this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; + this.splitMx1.Size = new System.Drawing.Size(1126, 570); + this.splitMx1.SplitterPosition = 103; + this.splitMx1.TabIndex = 0; + // + // layoutMx1 + // + this.layoutMx1.Controls.Add(this.lbGuid); + this.layoutMx1.Controls.Add(this.txt_checkUser); + this.layoutMx1.Controls.Add(this.txt_checkDate); + this.layoutMx1.Controls.Add(this.txt_suppName); + this.layoutMx1.Controls.Add(this.txt_reason); + this.layoutMx1.Controls.Add(this.txt_fmrmode); + this.layoutMx1.Controls.Add(this.txt_itemCgytNo); + this.layoutMx1.Controls.Add(this.txt_isOut); + this.layoutMx1.Controls.Add(this.txt_remark); + this.layoutMx1.Controls.Add(this.txt_status); + this.layoutMx1.Controls.Add(this.txt_guid); + this.layoutMx1.Controls.Add(this.txt_createBy); + this.layoutMx1.Controls.Add(this.txt_createDate); + this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.lb_guid, + this.layoutControlItem12}); + this.layoutMx1.Location = new System.Drawing.Point(0, 0); + this.layoutMx1.Name = "layoutMx1"; + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(792, 394, 812, 500); + this.layoutMx1.Root = this.Root; + this.layoutMx1.Size = new System.Drawing.Size(1126, 103); + this.layoutMx1.TabIndex = 0; + this.layoutMx1.Text = "layoutControl1"; + // + // lbGuid + // + this.lbGuid.Location = new System.Drawing.Point(825, 108); + this.lbGuid.Name = "lbGuid"; + this.lbGuid.Size = new System.Drawing.Size(268, 28); + this.lbGuid.TabIndex = 527; + this.lbGuid.Text = "lbGuid"; + // + // txt_checkUser + // + this.txt_checkUser.Location = new System.Drawing.Point(897, 40); + this.txt_checkUser.Name = "txt_checkUser"; + this.txt_checkUser.Properties.Appearance.Options.UseFont = true; + this.txt_checkUser.Size = new System.Drawing.Size(196, 24); + this.txt_checkUser.StyleController = this.layoutMx1; + this.txt_checkUser.TabIndex = 513; + // + // txt_checkDate + // + this.txt_checkDate.Location = new System.Drawing.Point(897, 68); + this.txt_checkDate.Name = "txt_checkDate"; + this.txt_checkDate.Properties.Appearance.Options.UseFont = true; + this.txt_checkDate.Size = new System.Drawing.Size(196, 24); + this.txt_checkDate.StyleController = this.layoutMx1; + this.txt_checkDate.TabIndex = 252; + // + // txt_suppName + // + this.txt_suppName.Location = new System.Drawing.Point(84, 40); + this.txt_suppName.Name = "txt_suppName"; + this.txt_suppName.Properties.Appearance.Options.UseFont = true; + this.txt_suppName.Size = new System.Drawing.Size(195, 24); + this.txt_suppName.StyleController = this.layoutMx1; + this.txt_suppName.TabIndex = 523; + // + // txt_reason + // + this.txt_reason.Location = new System.Drawing.Point(84, 68); + this.txt_reason.Name = "txt_reason"; + this.txt_reason.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txt_reason.Properties.Items.AddRange(new object[] { + "鏉ユ枡涓嶈壇", + "渚涘簲鍟嗗閫�", + "浣滀笟涓嶈壇", + "渚涘簲鍟嗙墿鍝佸彿閿欒", + "閲囪喘鏂欏彿鍙樻洿"}); + this.txt_reason.Size = new System.Drawing.Size(195, 24); + this.txt_reason.StyleController = this.layoutMx1; + this.txt_reason.TabIndex = 518; + // + // txt_fmrmode + // + this.txt_fmrmode.Location = new System.Drawing.Point(355, 40); + this.txt_fmrmode.Name = "txt_fmrmode"; + this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txt_fmrmode.Properties.Items.AddRange(new object[] { + "閫�鏂欒ˉ鏂�", + "閫�鏂欏苟鎵f"}); + this.txt_fmrmode.Size = new System.Drawing.Size(195, 24); + this.txt_fmrmode.StyleController = this.layoutMx1; + this.txt_fmrmode.TabIndex = 519; + // + // txt_itemCgytNo + // + this.txt_itemCgytNo.Location = new System.Drawing.Point(84, 12); + this.txt_itemCgytNo.Name = "txt_itemCgytNo"; + this.txt_itemCgytNo.Properties.Appearance.Options.UseFont = true; + this.txt_itemCgytNo.Size = new System.Drawing.Size(195, 24); + this.txt_itemCgytNo.StyleController = this.layoutMx1; + this.txt_itemCgytNo.TabIndex = 210; + // + // txt_isOut + // + this.txt_isOut.Location = new System.Drawing.Point(283, 12); + this.txt_isOut.Name = "txt_isOut"; + this.txt_isOut.Properties.Caption = "濮斿鏍囪瘑"; + this.txt_isOut.Size = new System.Drawing.Size(267, 24); + this.txt_isOut.StyleController = this.layoutMx1; + this.txt_isOut.TabIndex = 525; + this.txt_isOut.Tag = "readOnly"; + // + // txt_remark + // + this.txt_remark.Location = new System.Drawing.Point(355, 68); + this.txt_remark.Name = "txt_remark"; + this.txt_remark.Properties.Appearance.Options.UseFont = true; + this.txt_remark.Size = new System.Drawing.Size(466, 24); + this.txt_remark.StyleController = this.layoutMx1; + this.txt_remark.TabIndex = 235; + // + // txt_status + // + this.txt_status.Location = new System.Drawing.Point(825, 12); + this.txt_status.Name = "txt_status"; + this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑"; + this.txt_status.Size = new System.Drawing.Size(268, 24); + this.txt_status.StyleController = this.layoutMx1; + this.txt_status.TabIndex = 526; + // + // txt_guid + // + this.txt_guid.Location = new System.Drawing.Point(626, 108); + this.txt_guid.Name = "txt_guid"; + this.txt_guid.Size = new System.Drawing.Size(195, 24); + this.txt_guid.StyleController = this.layoutMx1; + this.txt_guid.TabIndex = 528; + // + // txt_createBy + // + this.txt_createBy.Location = new System.Drawing.Point(626, 12); + this.txt_createBy.Name = "txt_createBy"; + this.txt_createBy.Size = new System.Drawing.Size(195, 24); + this.txt_createBy.StyleController = this.layoutMx1; + this.txt_createBy.TabIndex = 530; + // + // txt_createDate + // + this.txt_createDate.Location = new System.Drawing.Point(626, 40); + this.txt_createDate.Name = "txt_createDate"; + this.txt_createDate.Size = new System.Drawing.Size(195, 24); + this.txt_createDate.StyleController = this.layoutMx1; + this.txt_createDate.TabIndex = 531; + // + // lb_guid + // + this.lb_guid.Control = this.txt_guid; + this.lb_guid.Location = new System.Drawing.Point(542, 96); + this.lb_guid.Name = "lb_guid"; + this.lb_guid.OptionsTableLayoutItem.ColumnIndex = 2; + this.lb_guid.OptionsTableLayoutItem.RowIndex = 3; + this.lb_guid.Size = new System.Drawing.Size(271, 32); + this.lb_guid.Text = "涓婚敭Guid"; + this.lb_guid.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.lbGuid; + this.layoutControlItem12.Location = new System.Drawing.Point(813, 96); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem12.Size = new System.Drawing.Size(272, 32); + this.layoutControlItem12.Text = "lbGuid"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem12.TextVisible = false; + // + // Root + // + this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.Root.GroupBordersVisible = false; + this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem2, + this.layoutControlItem1, + this.layoutControlItem3, + this.layoutControlItem7, + this.layoutControlItem9, + this.layoutControlItem10, + this.layoutControlItem11, + this.lab_createBy, + this.layoutControlItem15, + this.layoutControlItem5, + this.layoutControlItem8}); + this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; + this.Root.Name = "Root"; + columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5.Width = 100D; + columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition6.Width = 100D; + columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition7.Width = 100D; + columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition8.Width = 100D; + this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition5, + columnDefinition6, + columnDefinition7, + columnDefinition8}); + 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[] { + rowDefinition4, + rowDefinition5, + rowDefinition6}); + this.Root.Size = new System.Drawing.Size(1105, 104); + this.Root.TextVisible = false; + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txt_suppName; + this.layoutControlItem2.Location = new System.Drawing.Point(0, 28); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem2.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem2.Text = "渚涘簲鍟�"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem1 + // + this.layoutControlItem1.Control = this.txt_itemCgytNo; + this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem1.Text = "楠岄��鍗曞彿"; + this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txt_fmrmode; + this.layoutControlItem3.Location = new System.Drawing.Point(271, 28); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem3.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem3.Text = "閫�鏂欐柟寮�"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem7 + // + this.layoutControlItem7.Control = this.txt_isOut; + this.layoutControlItem7.Location = new System.Drawing.Point(271, 0); + this.layoutControlItem7.Name = "layoutControlItem7"; + this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem7.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem7.Text = "濮斿鏍囪瘑"; + this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem7.TextVisible = false; + // + // layoutControlItem9 + // + this.layoutControlItem9.Control = this.txt_checkUser; + this.layoutControlItem9.Location = new System.Drawing.Point(813, 28); + this.layoutControlItem9.Name = "layoutControlItem9"; + this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem9.Size = new System.Drawing.Size(272, 28); + this.layoutControlItem9.Text = "瀹℃牳浜�"; + this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem10 + // + this.layoutControlItem10.Control = this.txt_checkDate; + this.layoutControlItem10.Location = new System.Drawing.Point(813, 56); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem10.Size = new System.Drawing.Size(272, 28); + this.layoutControlItem10.Text = "瀹℃牳鏃ユ湡"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem11 + // + this.layoutControlItem11.Control = this.txt_status; + this.layoutControlItem11.Location = new System.Drawing.Point(813, 0); + this.layoutControlItem11.Name = "layoutControlItem11"; + this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem11.Size = new System.Drawing.Size(272, 28); + this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑"; + this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem11.TextVisible = false; + // + // lab_createBy + // + this.lab_createBy.Control = this.txt_createBy; + this.lab_createBy.Location = new System.Drawing.Point(542, 0); + this.lab_createBy.Name = "lab_createBy"; + this.lab_createBy.OptionsTableLayoutItem.ColumnIndex = 2; + this.lab_createBy.Size = new System.Drawing.Size(271, 28); + this.lab_createBy.Text = "鍒涘缓浜�"; + this.lab_createBy.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.txt_createDate; + this.layoutControlItem15.Location = new System.Drawing.Point(542, 28); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem15.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem15.Text = "鍒涘缓鏃堕棿"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.txt_reason; + this.layoutControlItem5.Location = new System.Drawing.Point(0, 56); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem5.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem5.Text = "楠岄��鍘熷洜"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem8 + // + this.layoutControlItem8.Control = this.txt_remark; + this.layoutControlItem8.Location = new System.Drawing.Point(271, 56); + this.layoutControlItem8.Name = "layoutControlItem8"; + this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem8.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem8.Size = new System.Drawing.Size(542, 28); + this.layoutControlItem8.Text = "楠岄��澶囨敞"; + this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); + // + // tabMx + // + this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabMx.Location = new System.Drawing.Point(0, 0); + this.tabMx.Name = "tabMx"; + this.tabMx.SelectedTabPage = this.tabMxPage2; + this.tabMx.Size = new System.Drawing.Size(1126, 455); + this.tabMx.TabIndex = 3; + this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.tabMxPage2, + this.xtraTabPage3}); + // + // tabMxPage2 + // + this.tabMxPage2.Controls.Add(this.gcMx1); + this.tabMxPage2.Name = "tabMxPage2"; + this.tabMxPage2.Size = new System.Drawing.Size(1124, 423); + this.tabMxPage2.Text = "閫�璐х墿鏂欐槑缁�"; + // + // gcMx1 + // + this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMx1.Location = new System.Drawing.Point(0, 0); + this.gcMx1.MainView = this.gvMx1; + this.gcMx1.Name = "gcMx1"; + this.gcMx1.Size = new System.Drawing.Size(1124, 423); + this.gcMx1.TabIndex = 0; + this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gvMx1}); + // + // gvMx1 + // + this.gvMx1.Appearance.Row.Options.UseFont = true; + this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn12, + this.gvMx2itemNo, + this.gridColumn5, + this.gridColumn6, + this.gvMx2quantity, + this.gvMx2remark, + this.gvMx2itemOutId, + this.gridColumn14, + this.gridColumn15}); + this.gvMx1.GridControl = this.gcMx1; + this.gvMx1.Name = "gvMx1"; + this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; + this.gvMx1.OptionsFind.ShowSearchNavButtons = false; + this.gvMx1.OptionsView.ShowGroupPanel = false; + // + // gridColumn12 + // + this.gridColumn12.Caption = "鏄庣粏涓婚敭"; + this.gridColumn12.FieldName = "guid"; + this.gridColumn12.MinWidth = 25; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.OptionsColumn.ReadOnly = true; + this.gridColumn12.Width = 94; + // + // gvMx2itemNo + // + this.gvMx2itemNo.AppearanceCell.Options.UseFont = true; + this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜"; + this.gvMx2itemNo.FieldName = "itemNo"; + this.gvMx2itemNo.Name = "gvMx2itemNo"; + this.gvMx2itemNo.OptionsColumn.ReadOnly = true; + this.gvMx2itemNo.Tag = "query_a.item_no"; + this.gvMx2itemNo.Visible = true; + this.gvMx2itemNo.VisibleIndex = 0; + this.gvMx2itemNo.Width = 94; + // + // gridColumn5 + // + this.gridColumn5.Caption = "鐗╂枡鍚嶇О"; + this.gridColumn5.FieldName = "itemName"; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.OptionsColumn.ReadOnly = true; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 1; + this.gridColumn5.Width = 94; + // + // gridColumn6 + // + this.gridColumn6.Caption = "瑙勬牸鍨嬪彿"; + this.gridColumn6.FieldName = "itemModel"; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.OptionsColumn.ReadOnly = true; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 2; + this.gridColumn6.Width = 94; + // + // gvMx2quantity + // + this.gvMx2quantity.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.gvMx2quantity.AppearanceCell.Options.UseFont = true; + this.gvMx2quantity.AppearanceCell.Options.UseForeColor = true; + this.gvMx2quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gvMx2quantity.AppearanceHeader.Options.UseForeColor = true; + this.gvMx2quantity.Caption = "鏁伴噺 "; + this.gvMx2quantity.FieldName = "quantity"; + this.gvMx2quantity.Name = "gvMx2quantity"; + this.gvMx2quantity.Tag = "query_a.quantity"; + this.gvMx2quantity.Visible = true; + this.gvMx2quantity.VisibleIndex = 3; + this.gvMx2quantity.Width = 94; + // + // gvMx2remark + // + this.gvMx2remark.AppearanceCell.Options.UseFont = true; + this.gvMx2remark.Caption = "鐢宠澶囨敞"; + this.gvMx2remark.FieldName = "remark"; + this.gvMx2remark.Name = "gvMx2remark"; + this.gvMx2remark.OptionsColumn.ReadOnly = true; + this.gvMx2remark.Tag = "query_a.remark"; + this.gvMx2remark.Visible = true; + this.gvMx2remark.VisibleIndex = 4; + this.gvMx2remark.Width = 94; + // + // gvMx2itemOutId + // + this.gvMx2itemOutId.AppearanceCell.Options.UseFont = true; + this.gvMx2itemOutId.Caption = "涓昏〃涓婚敭"; + this.gvMx2itemOutId.FieldName = "itemOutId"; + this.gvMx2itemOutId.Name = "gvMx2itemOutId"; + this.gvMx2itemOutId.OptionsColumn.ReadOnly = true; + this.gvMx2itemOutId.Tag = "query_a.item_out_id"; + this.gvMx2itemOutId.Width = 94; + // + // gridColumn14 + // + this.gridColumn14.Caption = "鍒涘缓浜�"; + this.gridColumn14.FieldName = "createBy"; + this.gridColumn14.MinWidth = 25; + this.gridColumn14.Name = "gridColumn14"; + this.gridColumn14.Visible = true; + this.gridColumn14.VisibleIndex = 5; + this.gridColumn14.Width = 94; + // + // gridColumn15 + // + this.gridColumn15.Caption = "鍒涘缓鏃堕棿"; + this.gridColumn15.FieldName = "createDate"; + this.gridColumn15.MinWidth = 25; + this.gridColumn15.Name = "gridColumn15"; + this.gridColumn15.Visible = true; + this.gridColumn15.VisibleIndex = 6; + this.gridColumn15.Width = 94; + // + // xtraTabPage3 + // + this.xtraTabPage3.Controls.Add(this.gcMx2); + this.xtraTabPage3.Name = "xtraTabPage3"; + this.xtraTabPage3.Size = new System.Drawing.Size(1124, 423); + this.xtraTabPage3.Text = "閫�璐х墿鏂欐壂鐮佹槑缁�"; + // + // gcMx2 + // + this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMx2.Location = new System.Drawing.Point(0, 0); + this.gcMx2.MainView = this.gvMx2; + this.gcMx2.Name = "gcMx2"; + this.gcMx2.Size = new System.Drawing.Size(1124, 423); + this.gcMx2.TabIndex = 1; + this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gvMx2}); + // + // gvMx2 + // + this.gvMx2.Appearance.Row.Options.UseFont = true; + this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gvMx1guid, + this.gvMx1itemBarcode, + this.gvMx1itemNo, + this.gridColumn8, + this.gridColumn9, + this.gvMx1quantity, + this.gridColumn10, + this.gridColumn16, + this.gridColumn17}); + this.gvMx2.GridControl = this.gcMx2; + this.gvMx2.Name = "gvMx2"; + this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; + this.gvMx2.OptionsFind.ShowSearchNavButtons = false; + this.gvMx2.OptionsView.ShowGroupPanel = false; + // + // gvMx1guid + // + this.gvMx1guid.AppearanceCell.Options.UseFont = true; + this.gvMx1guid.Caption = "guid "; + this.gvMx1guid.FieldName = "guid"; + this.gvMx1guid.MinWidth = 50; + this.gvMx1guid.Name = "gvMx1guid"; + this.gvMx1guid.Tag = "query_a.guid"; + this.gvMx1guid.Width = 94; + // + // gvMx1itemBarcode + // + this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true; + this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜 "; + this.gvMx1itemBarcode.FieldName = "itemBarcode"; + this.gvMx1itemBarcode.Name = "gvMx1itemBarcode"; + this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE"; + this.gvMx1itemBarcode.Visible = true; + this.gvMx1itemBarcode.VisibleIndex = 1; + this.gvMx1itemBarcode.Width = 94; + // + // gvMx1itemNo + // + this.gvMx1itemNo.AppearanceCell.Options.UseFont = true; + this.gvMx1itemNo.Caption = "鐗╂枡缂栫爜"; + this.gvMx1itemNo.FieldName = "itemNo"; + this.gvMx1itemNo.Name = "gvMx1itemNo"; + this.gvMx1itemNo.Tag = "query_a.ITEM_NO"; + this.gvMx1itemNo.Visible = true; + this.gvMx1itemNo.VisibleIndex = 0; + this.gvMx1itemNo.Width = 94; + // + // gridColumn8 + // + this.gridColumn8.Caption = "鐗╂枡鍚嶇О"; + this.gridColumn8.FieldName = "itemName"; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 2; + this.gridColumn8.Width = 94; + // + // gridColumn9 + // + this.gridColumn9.Caption = "瑙勬牸鍨嬪彿"; + this.gridColumn9.FieldName = "itemModel"; + this.gridColumn9.Name = "gridColumn9"; + this.gridColumn9.Visible = true; + this.gridColumn9.VisibleIndex = 3; + this.gridColumn9.Width = 94; + // + // gvMx1quantity + // + this.gvMx1quantity.AppearanceCell.Options.UseFont = true; + this.gvMx1quantity.Caption = "鏁伴噺"; + this.gvMx1quantity.FieldName = "quantity"; + this.gvMx1quantity.MinWidth = 50; + this.gvMx1quantity.Name = "gvMx1quantity"; + this.gvMx1quantity.Tag = "query_a.QUANTITY"; + this.gvMx1quantity.Visible = true; + this.gvMx1quantity.VisibleIndex = 4; + this.gvMx1quantity.Width = 94; + // + // gridColumn10 + // + this.gridColumn10.Caption = "鍗曚綅"; + this.gridColumn10.FieldName = "kcUnit"; + this.gridColumn10.MinWidth = 50; + this.gridColumn10.Name = "gridColumn10"; + this.gridColumn10.Visible = true; + this.gridColumn10.VisibleIndex = 5; + this.gridColumn10.Width = 94; + // + // gridColumn16 + // + this.gridColumn16.Caption = "鍒涘缓浜�"; + this.gridColumn16.FieldName = "createBy"; + this.gridColumn16.MinWidth = 25; + this.gridColumn16.Name = "gridColumn16"; + this.gridColumn16.Visible = true; + this.gridColumn16.VisibleIndex = 10; + this.gridColumn16.Width = 94; + // + // gridColumn17 + // + this.gridColumn17.Caption = "鍒涘缓鏃堕棿"; + this.gridColumn17.FieldName = "createDate"; + this.gridColumn17.MinWidth = 25; + this.gridColumn17.Name = "gridColumn17"; + this.gridColumn17.Visible = true; + this.gridColumn17.VisibleIndex = 11; + this.gridColumn17.Width = 94; + // + // picCheckBox + // + this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; + this.picCheckBox.Location = new System.Drawing.Point(968, 55); + this.picCheckBox.Name = "picCheckBox"; + this.picCheckBox.Size = new System.Drawing.Size(100, 50); + this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.picCheckBox.TabIndex = 11; + this.picCheckBox.TabStop = false; + this.picCheckBox.Visible = false; + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txt_reason; + this.layoutControlItem4.Location = new System.Drawing.Point(276, 0); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.Size = new System.Drawing.Size(138, 73); + this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20); // // Frm_MesYanTui // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(720, 260); + 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 = "Frm_MesYanTui"; - this.Text = "Frm_MesYanTui"; + 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(); + this.splitMx1.Panel2.ResumeLayout(false); + ((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_checkUser.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_itemCgytNo.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_isOut.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.lb_guid)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.lab_createBy)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); + this.tabMx.ResumeLayout(false); + this.tabMxPage2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); + this.xtraTabPage3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); this.ResumeLayout(false); } - #endregion + private UserControl.UcToolBarMenu toolBarMenu1; + private DevExpress.XtraTab.XtraTabControl xtraTabControl1; + private System.Windows.Forms.PictureBox picCheckBox; + private DevExpress.XtraTab.XtraTabPage xtraTabPage1; + private DevExpress.XtraEditors.SplitContainerControl split1; + private UserControls.Data.UcPageBar pageBar1; + private DevExpress.XtraGrid.GridControl gcMain1; + private DevExpress.XtraGrid.Views.Grid.GridView gridView1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; + private DevExpress.XtraGrid.Columns.GridColumn gv_status; + private DevExpress.XtraGrid.Columns.GridColumn gv_fType; + private DevExpress.XtraGrid.Columns.GridColumn gv_itemOutNo; + private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private DevExpress.XtraGrid.Columns.GridColumn gv_createDate; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate; + private DevExpress.XtraGrid.Columns.GridColumn gv_reason; + private DevExpress.XtraGrid.Columns.GridColumn gv_fmrmode; + private DevExpress.XtraTab.XtraTabPage xtraTabPage2; + private DevExpress.XtraEditors.SplitContainerControl splitMx1; + private DevExpress.XtraLayout.LayoutControl layoutMx1; + private DevExpress.XtraLayout.LayoutControlGroup Root; + private DevExpress.XtraEditors.TextEdit txt_suppName; + private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode; + private DevExpress.XtraEditors.ComboBoxEdit txt_reason; + private DevExpress.XtraEditors.TextEdit txt_checkUser; + private DevExpress.XtraEditors.TextEdit txt_checkDate; + private DevExpress.XtraEditors.TextEdit txt_remark; + private DevExpress.XtraEditors.TextEdit txt_itemCgytNo; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraEditors.CheckEdit txt_isOut; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; + private System.Windows.Forms.Label lbGuid; + private DevExpress.XtraEditors.CheckEdit txt_status; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraTab.XtraTabControl tabMx; + private DevExpress.XtraTab.XtraTabPage tabMxPage2; + private DevExpress.XtraGrid.GridControl gcMx1; + private DevExpress.XtraGrid.Views.Grid.GridView gvMx1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemOutId; + private DevExpress.XtraTab.XtraTabPage xtraTabPage3; + private DevExpress.XtraGrid.GridControl gcMx2; + private DevExpress.XtraGrid.Views.Grid.GridView gvMx2; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; + private DevExpress.XtraEditors.TextEdit txt_guid; + private DevExpress.XtraLayout.LayoutControlItem lb_guid; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; + private DevExpress.XtraEditors.TextEdit txt_createBy; + private DevExpress.XtraEditors.TextEdit txt_createDate; + private DevExpress.XtraLayout.LayoutControlItem lab_createBy; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; + private DevExpress.Utils.ToolTipController tips; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs index 81a880b..9243711 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs @@ -1,11 +1,11 @@ -锘縰sing DevExpress.XtraEditors; +锘縰sing Gs.DevApp.Entity; +using Gs.DevApp.ToolBox; +using Gs.DevApp.UserControl; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; 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; @@ -13,9 +13,306 @@ { public partial class Frm_MesYanTui : DevExpress.XtraEditors.XtraForm { + string _webServiceName = "MesCgytDjManager/"; + List<FilterEntity> _filterList = new List<FilterEntity>(); public Frm_MesYanTui() { InitializeComponent(); + this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; + this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; + this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; + toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; + toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; + this.toolBarMenu1.getXmlConfig(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "statusChk", "", (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; + } + private void GridView1_ColumnFilterChanged(object sender, EventArgs e) + { + _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); + 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_btnLogClick(object sender, EventArgs e) + { + toolBarMenu1.guidKey = ""; + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_itemCgytNo, gridView1); + toolBarMenu1.guidKey = rowGuid; + } + /// <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) + { + gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString()); + string json = JsonConvert.SerializeObject(pgq); + try + { + string 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.Warning("鎻愮ず锛�" + 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; + List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); + gvList.Add(gvMx2); + gvList.Add(gvMx1); + UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList); + JObject _job = JObject.Parse(strJson); + JArray array = new JArray(); + foreach (var a in _job["rtnData"]["list"]) + { + array.Add(a); + } + //杩欐槸閫�璐ф槑缁� 琛� + DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString()); + if (dt.Rows.Count > 0) + { + gcMx1.BindingContext = new BindingContext(); + gcMx1.DataSource = dt; + gcMx1.ForceInitialize(); + gvMx1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); + } + else + { + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + } + //杩欐槸鎵爜琛� + JArray array1 = new JArray(); + foreach (var a in _job["rtnData"]["list2"]) + { + array1.Add(a); + } + DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString()); + if (dt1.Rows.Count > 0) + { + gcMx2.BindingContext = new BindingContext(); + gcMx2.DataSource = dt1; + gcMx2.ForceInitialize(); + gvMx2.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2); + } + else + { + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2); + } + } + 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; + } + ; + toolBarMenu1.guidKey = ""; + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemCgytNo, gridView1, "itemCgytNo"); + if (string.IsNullOrEmpty(rowGuid)) + { + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) + return; + var _obj = new + { + guid = rowGuid, + inFieldValue = _inFieldValue, + }; + try + { + var strJson = UtilityHelper.HttpPost("", + _webServiceName + "EditModelSubmit", + JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); + if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) + { + if (xtraTabControl1.SelectedTabPageIndex == 1) + { + getModel(lbGuid.Text.Trim()); + } + int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); + gridView1.FocusedRowHandle = rowHandle; + UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString()); + } + } + catch (Exception ex) + { + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); + } } } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.resx b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.resx index 1af7de1..e7132ea 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.resx +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.resx @@ -117,4 +117,10 @@ <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> + <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>25</value> + </metadata> </root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user index ea14450..78c201e 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <ProjectView>ProjectFiles</ProjectView> + <ProjectView>ShowAllFiles</ProjectView> <PublishUrlHistory>publish\</PublishUrlHistory> <InstallUrlHistory /> <SupportUrlHistory /> diff --git a/DevApp/Gs.DevApp/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/XtraForm1.Designer.cs index b7e1014..4849e5e 100644 --- a/DevApp/Gs.DevApp/XtraForm1.Designer.cs +++ b/DevApp/Gs.DevApp/XtraForm1.Designer.cs @@ -28,154 +28,94 @@ /// </summary> private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.dropDownButton1 = new DevExpress.XtraEditors.DropDownButton(); - this.popupMenu1 = new DevExpress.XtraBars.PopupMenu(this.components); - this.barButtonItem1 = new DevExpress.XtraBars.BarButtonItem(); - this.barButtonItem2 = new DevExpress.XtraBars.BarButtonItem(); - this.barButtonItem3 = new DevExpress.XtraBars.BarButtonItem(); - this.barButtonItem4 = new DevExpress.XtraBars.BarButtonItem(); - this.barManager1 = new DevExpress.XtraBars.BarManager(this.components); - this.barDockControlTop = new DevExpress.XtraBars.BarDockControl(); - this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl(); - this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl(); - this.barDockControlRight = new DevExpress.XtraBars.BarDockControl(); this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton(); - ((System.ComponentModel.ISupportInitialize)(this.popupMenu1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit(); + this.simpleButton2 = new DevExpress.XtraEditors.SimpleButton(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.simpleButton3 = new DevExpress.XtraEditors.SimpleButton(); + this.buttonEdit1 = new DevExpress.XtraEditors.ButtonEdit(); + this.toggleSwitch1 = new DevExpress.XtraEditors.ToggleSwitch(); + ((System.ComponentModel.ISupportInitialize)(this.buttonEdit1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.toggleSwitch1.Properties)).BeginInit(); this.SuspendLayout(); - // - // dropDownButton1 - // - this.dropDownButton1.DropDownControl = this.popupMenu1; - this.dropDownButton1.Location = new System.Drawing.Point(238, 110); - this.dropDownButton1.Name = "dropDownButton1"; - this.dropDownButton1.Size = new System.Drawing.Size(154, 29); - this.dropDownButton1.TabIndex = 0; - this.dropDownButton1.Text = "dropDownButton1"; - // - // popupMenu1 - // - this.popupMenu1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { - new DevExpress.XtraBars.LinkPersistInfo(this.barButtonItem1), - new DevExpress.XtraBars.LinkPersistInfo(this.barButtonItem2), - new DevExpress.XtraBars.LinkPersistInfo(this.barButtonItem3), - new DevExpress.XtraBars.LinkPersistInfo(this.barButtonItem4)}); - this.popupMenu1.Manager = this.barManager1; - this.popupMenu1.Name = "popupMenu1"; - // - // barButtonItem1 - // - this.barButtonItem1.Caption = "barButtonItem1"; - this.barButtonItem1.Id = 0; - this.barButtonItem1.Name = "barButtonItem1"; - // - // barButtonItem2 - // - this.barButtonItem2.Caption = "barButtonItem2"; - this.barButtonItem2.Id = 1; - this.barButtonItem2.Name = "barButtonItem2"; - // - // barButtonItem3 - // - this.barButtonItem3.Caption = "barButtonItem3"; - this.barButtonItem3.Id = 2; - this.barButtonItem3.Name = "barButtonItem3"; - // - // barButtonItem4 - // - this.barButtonItem4.Caption = "barButtonItem4"; - this.barButtonItem4.Id = 3; - this.barButtonItem4.Name = "barButtonItem4"; - // - // barManager1 - // - this.barManager1.DockControls.Add(this.barDockControlTop); - this.barManager1.DockControls.Add(this.barDockControlBottom); - this.barManager1.DockControls.Add(this.barDockControlLeft); - this.barManager1.DockControls.Add(this.barDockControlRight); - this.barManager1.Form = this; - this.barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { - this.barButtonItem1, - this.barButtonItem2, - this.barButtonItem3, - this.barButtonItem4}); - this.barManager1.MaxItemId = 4; - // - // barDockControlTop - // - this.barDockControlTop.CausesValidation = false; - this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top; - this.barDockControlTop.Location = new System.Drawing.Point(0, 0); - this.barDockControlTop.Manager = this.barManager1; - this.barDockControlTop.Size = new System.Drawing.Size(887, 0); - // - // barDockControlBottom - // - this.barDockControlBottom.CausesValidation = false; - this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.barDockControlBottom.Location = new System.Drawing.Point(0, 659); - this.barDockControlBottom.Manager = this.barManager1; - this.barDockControlBottom.Size = new System.Drawing.Size(887, 0); - // - // barDockControlLeft - // - this.barDockControlLeft.CausesValidation = false; - this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left; - this.barDockControlLeft.Location = new System.Drawing.Point(0, 0); - this.barDockControlLeft.Manager = this.barManager1; - this.barDockControlLeft.Size = new System.Drawing.Size(0, 659); - // - // barDockControlRight - // - this.barDockControlRight.CausesValidation = false; - this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right; - this.barDockControlRight.Location = new System.Drawing.Point(887, 0); - this.barDockControlRight.Manager = this.barManager1; - this.barDockControlRight.Size = new System.Drawing.Size(0, 659); // // simpleButton1 // - this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.fullstackedbar3d_16x16; - this.simpleButton1.Location = new System.Drawing.Point(225, 257); + this.simpleButton1.Location = new System.Drawing.Point(57, 107); this.simpleButton1.Name = "simpleButton1"; this.simpleButton1.Size = new System.Drawing.Size(94, 29); - this.simpleButton1.TabIndex = 5; - this.simpleButton1.Text = "simpleButton1"; + this.simpleButton1.TabIndex = 0; + this.simpleButton1.Text = "鐢垫鏁版嵁"; + + // + // simpleButton2 + // + this.simpleButton2.Location = new System.Drawing.Point(57, 173); + this.simpleButton2.Name = "simpleButton2"; + this.simpleButton2.Size = new System.Drawing.Size(94, 29); + this.simpleButton2.TabIndex = 1; + this.simpleButton2.Text = "姘存鏁版嵁"; + this.simpleButton2.Click += new System.EventHandler(this.simpleButton2_Click); + // + // richTextBox1 + // + this.richTextBox1.Location = new System.Drawing.Point(57, 227); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.Size = new System.Drawing.Size(740, 240); + this.richTextBox1.TabIndex = 2; + this.richTextBox1.Text = ""; + // + // simpleButton3 + // + this.simpleButton3.Location = new System.Drawing.Point(471, 85); + this.simpleButton3.Name = "simpleButton3"; + this.simpleButton3.Size = new System.Drawing.Size(94, 29); + this.simpleButton3.TabIndex = 3; + this.simpleButton3.Text = "simpleButton3"; + // + // buttonEdit1 + // + this.buttonEdit1.Location = new System.Drawing.Point(312, 147); + this.buttonEdit1.Name = "buttonEdit1"; + this.buttonEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.buttonEdit1.Size = new System.Drawing.Size(125, 24); + this.buttonEdit1.TabIndex = 4; + // + // toggleSwitch1 + // + this.toggleSwitch1.Location = new System.Drawing.Point(293, 13); + this.toggleSwitch1.Name = "toggleSwitch1"; + this.toggleSwitch1.Properties.OffText = "Off"; + this.toggleSwitch1.Properties.OnText = "On"; + this.toggleSwitch1.Size = new System.Drawing.Size(288, 24); + this.toggleSwitch1.TabIndex = 5; // // XtraForm1 // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(887, 659); + this.Controls.Add(this.toggleSwitch1); + this.Controls.Add(this.buttonEdit1); + this.Controls.Add(this.simpleButton3); + this.Controls.Add(this.richTextBox1); + this.Controls.Add(this.simpleButton2); this.Controls.Add(this.simpleButton1); - this.Controls.Add(this.dropDownButton1); - this.Controls.Add(this.barDockControlLeft); - this.Controls.Add(this.barDockControlRight); - this.Controls.Add(this.barDockControlBottom); - this.Controls.Add(this.barDockControlTop); this.Name = "XtraForm1"; this.Text = "XtraForm1"; - ((System.ComponentModel.ISupportInitialize)(this.popupMenu1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.buttonEdit1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.toggleSwitch1.Properties)).EndInit(); this.ResumeLayout(false); - this.PerformLayout(); } #endregion - private DevExpress.XtraEditors.DropDownButton dropDownButton1; - private DevExpress.XtraBars.PopupMenu popupMenu1; - private DevExpress.XtraBars.BarButtonItem barButtonItem1; - private DevExpress.XtraBars.BarButtonItem barButtonItem2; - private DevExpress.XtraBars.BarButtonItem barButtonItem3; - private DevExpress.XtraBars.BarButtonItem barButtonItem4; - private DevExpress.XtraBars.BarManager barManager1; - private DevExpress.XtraBars.BarDockControl barDockControlTop; - private DevExpress.XtraBars.BarDockControl barDockControlBottom; - private DevExpress.XtraBars.BarDockControl barDockControlLeft; - private DevExpress.XtraBars.BarDockControl barDockControlRight; private DevExpress.XtraEditors.SimpleButton simpleButton1; + private DevExpress.XtraEditors.SimpleButton simpleButton2; + private System.Windows.Forms.RichTextBox richTextBox1; + private DevExpress.XtraEditors.SimpleButton simpleButton3; + private DevExpress.XtraEditors.ButtonEdit buttonEdit1; + private DevExpress.XtraEditors.ToggleSwitch toggleSwitch1; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/XtraForm1.cs b/DevApp/Gs.DevApp/XtraForm1.cs index c2a041c..b78e750 100644 --- a/DevApp/Gs.DevApp/XtraForm1.cs +++ b/DevApp/Gs.DevApp/XtraForm1.cs @@ -15,6 +15,105 @@ InitializeComponent(); } - + + + /// <summary> + /// 姘存 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + + private void simpleButton2_Click(object sender, EventArgs e) + { + string strCsl1 = ""; + string strSw1 = ""; + string strCsl2 = ""; + string strSw2 = ""; + string strCsl3 = ""; + string strSw3 = ""; + string strCsl4 = ""; + string strSw4 = ""; + string strCsl5 = ""; + string strSw5 = ""; + string SJJG = ""; + try//姘存鍙栨暟锛屽悗闈㈣ˉ鍏� + { + System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder(); + string hostname = "192.168.60.51"; + ModbusFactory modbusFactory = new ModbusFactory(); + IModbusMaster master = modbusFactory.CreateMaster(new TcpClient(hostname, 502)); + master.Transport.ReadTimeout = 10000; + master.Transport.Retries = 10000; + DataTable dt = new DataTable(); + //鍙傛暟(鍒嗗埆涓轰粠绔欏湴鍧�,璧峰鍦板潃,闀垮害) + byte slaveAddress = byte.Parse(1.ToString()); + ushort numberOfPoints = ushort.Parse("1"); + float fsw = 0; + DataTable dt1 = new DataTable(); + ushort[] csl1 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(32.ToString()), numberOfPoints); + strCsl1 = csl1[0].ToString(); + + ushort[] sw1 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(31.ToString()), numberOfPoints); + strSw1 = (float.Parse(sw1[0].ToString()) / 10).ToString(); + + ushort[] csl2 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(34.ToString()), numberOfPoints); + strCsl2 = csl2[0].ToString(); + + ushort[] sw2 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(33.ToString()), numberOfPoints); + strSw2 = (float.Parse(sw2[0].ToString()) / 10).ToString(); + + ushort[] csl3 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(36.ToString()), numberOfPoints); + strCsl3 = csl3[0].ToString(); + + ushort[] sw3 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(35.ToString()), numberOfPoints); + strSw3 = (float.Parse(sw3[0].ToString()) / 10).ToString(); + + ushort[] csl4 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(38.ToString()), numberOfPoints); + strCsl4 = csl4[0].ToString(); + + ushort[] sw4 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(37.ToString()), numberOfPoints); + strSw4 = (float.Parse(sw4[0].ToString()) / 10).ToString(); + + ushort[] csl5 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(40.ToString()), numberOfPoints); + strCsl5 = csl5[0].ToString(); + + ushort[] sw5 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(39.ToString()), numberOfPoints); + strSw5 = (float.Parse(sw5[0].ToString()) / 10).ToString(); + + bool[] sjjg = master.ReadCoils(slaveAddress, ushort.Parse(77.ToString()), numberOfPoints); + SJJG = sjjg[0].ToString(); + /////////////////// + /// + + // 3. 璇诲彇浠庣珯璁惧鐨勫瘎瀛樺櫒 + ushort startAddress = 0; // 瀵勫瓨鍣ㄨ捣濮嬪湴鍧� + ushort numRegisters = 125; // 璇诲彇 10 涓瘎瀛樺櫒 + try + { + // 璇诲彇淇濇寔瀵勫瓨鍣紙浠庣珯鍦板潃涓� 1锛� + ushort[] registers = master.ReadHoldingRegisters(1, startAddress, numRegisters); + // 杈撳嚭缁撴灉 + Console.WriteLine("璇诲彇鍒扮殑瀵勫瓨鍣ㄥ�硷細"); + foreach (var register in registers) + { + Console.WriteLine(register); + stringBuilder.Append(register.ToString()); + } + richTextBox1.Text = stringBuilder.ToString(); + } + catch (Exception ex) + { + Console.WriteLine($"璇诲彇閿欒: {ex.Message}"); + } + + } + catch (Exception ex) + { + //VisiblePanel(txtDQBarCode.EditValue.ToString(), ex.Message, "NG", Color.Yellow); + //txtGWM.EditValue = ""; + return; + } + + } } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/XtraForm1.resx b/DevApp/Gs.DevApp/XtraForm1.resx index 2b48534..1af7de1 100644 --- a/DevApp/Gs.DevApp/XtraForm1.resx +++ b/DevApp/Gs.DevApp/XtraForm1.resx @@ -117,10 +117,4 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <metadata name="popupMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>17, 17</value> - </metadata> - <metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>177, 17</value> - </metadata> </root> \ No newline at end of file -- Gitblit v1.9.3