From 8dfc8d054b5b14e3fcde6415dd22cedf10c09915 Mon Sep 17 00:00:00 2001 From: 啊鑫 <t2856754968@163.com> Date: 星期二, 05 十一月 2024 14:13:17 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 149 ++- DevApp/Gs.DevApp/UserControl/UCUpFile.Designer.cs | 110 +++ DevApp/Gs.DevApp/UserControl/UCUpFile.resx | 120 +++ DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx | 22 DevApp/Gs.DevApp/UserControl/UCUpFile.cs | 111 +++ DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | 4 DevApp/Gs.DevApp/Gs.DevApp.csproj | 18 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 1146 +++++++++++++++++++-------------- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 250 +++++- DevApp/Gs.DevApp/Program.cs | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 1 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 1 12 files changed, 1,319 insertions(+), 615 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs index e3095ca..1f5aac0 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs @@ -29,6 +29,17 @@ /// </summary> private void InitializeComponent() { + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01Check)); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -112,12 +123,19 @@ this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl(); - this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); - this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); - this.btnUp = new DevExpress.XtraEditors.SimpleButton(); - this.btnUpSelect = new System.Windows.Forms.Button(); - this.txtUpUrl = new System.Windows.Forms.TextBox(); - this.label7 = new System.Windows.Forms.Label(); + this.tabMxPage3 = new DevExpress.XtraTab.XtraTabPage(); + this.gcMx3 = new DevExpress.XtraGrid.GridControl(); + this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile(); this.panel1 = new System.Windows.Forms.Panel(); this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit(); this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems(); @@ -133,6 +151,7 @@ this.txt_modify1Flag = new DevExpress.XtraEditors.TextEdit(); this.lb_lotNo = new DevExpress.XtraEditors.LabelControl(); this.txt_lotNo = new DevExpress.XtraEditors.TextEdit(); + this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit(); @@ -165,9 +184,11 @@ this.xtraTabPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit(); this.xtraTabControl2.SuspendLayout(); - this.xtraTabPage3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit(); - this.panelControl1.SuspendLayout(); + this.tabMxPage3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit(); @@ -1213,61 +1234,147 @@ this.xtraTabControl2.TabIndex = 2; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, - this.xtraTabPage3}); + this.tabMxPage3}); // - // xtraTabPage3 + // tabMxPage3 // - this.xtraTabPage3.Controls.Add(this.panelControl1); - this.xtraTabPage3.Name = "xtraTabPage3"; - this.xtraTabPage3.Size = new System.Drawing.Size(1340, 448); - this.xtraTabPage3.Text = "闄勪欢淇℃伅"; + this.tabMxPage3.Controls.Add(this.gcMx3); + this.tabMxPage3.Controls.Add(this.ucUpFile1); + this.tabMxPage3.Name = "tabMxPage3"; + this.tabMxPage3.Size = new System.Drawing.Size(1340, 448); + this.tabMxPage3.Text = "闄勪欢淇℃伅"; // - // panelControl1 + // gcMx3 // - this.panelControl1.Controls.Add(this.btnUp); - this.panelControl1.Controls.Add(this.btnUpSelect); - this.panelControl1.Controls.Add(this.txtUpUrl); - this.panelControl1.Controls.Add(this.label7); - this.panelControl1.Location = new System.Drawing.Point(297, 11); - this.panelControl1.Name = "panelControl1"; - this.panelControl1.Size = new System.Drawing.Size(609, 151); - this.panelControl1.TabIndex = 1; + this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMx3.Location = new System.Drawing.Point(0, 57); + this.gcMx3.MainView = this.gvMx3; + this.gcMx3.Name = "gcMx3"; + this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.repositoryItemButtonEdit1, + this.repositoryItemButtonEdit2}); + this.gcMx3.Size = new System.Drawing.Size(1340, 391); + this.gcMx3.TabIndex = 1; + this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gvMx3}); // - // btnUp + // gvMx3 // - this.btnUp.Location = new System.Drawing.Point(157, 81); - this.btnUp.Name = "btnUp"; - this.btnUp.Size = new System.Drawing.Size(94, 29); - this.btnUp.TabIndex = 270; - this.btnUp.Text = "纭畾涓婁紶"; + this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn4, + this.gridColumn5, + this.gridColumn11, + this.gridColumn6, + this.gridColumn7, + this.gridColumn8, + this.gridColumn10, + this.gridColumn9}); + this.gvMx3.GridControl = this.gcMx3; + this.gvMx3.Name = "gvMx3"; // - // btnUpSelect + // gridColumn4 // - this.btnUpSelect.Location = new System.Drawing.Point(452, 48); - this.btnUpSelect.Margin = new System.Windows.Forms.Padding(4); - this.btnUpSelect.Name = "btnUpSelect"; - this.btnUpSelect.Size = new System.Drawing.Size(79, 26); - this.btnUpSelect.TabIndex = 269; - this.btnUpSelect.Text = "閫夋嫨璺緞"; - this.btnUpSelect.UseVisualStyleBackColor = true; + this.gridColumn4.Caption = "guid涓嶈兘鍒犻櫎"; + this.gridColumn4.FieldName = "guid"; + this.gridColumn4.MinWidth = 25; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.OptionsColumn.ReadOnly = true; + this.gridColumn4.Width = 94; // - // txtUpUrl + // gridColumn5 // - this.txtUpUrl.Location = new System.Drawing.Point(125, 48); - this.txtUpUrl.Margin = new System.Windows.Forms.Padding(4); - this.txtUpUrl.Name = "txtUpUrl"; - this.txtUpUrl.Size = new System.Drawing.Size(307, 26); - this.txtUpUrl.TabIndex = 268; + this.gridColumn5.Caption = "闄勪欢鍚嶇О"; + this.gridColumn5.FieldName = "fileTitle"; + this.gridColumn5.MinWidth = 100; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.OptionsColumn.ReadOnly = true; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 0; + this.gridColumn5.Width = 100; // - // label7 + // gridColumn6 // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(12, 52); - this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(83, 18); - this.label7.TabIndex = 267; - this.label7.Text = "閫夋嫨鏂囦欢锛�"; + this.gridColumn6.Caption = "娴忚鍦板潃"; + this.gridColumn6.FieldName = "urlPath"; + this.gridColumn6.MinWidth = 200; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.OptionsColumn.ReadOnly = true; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 2; + this.gridColumn6.Width = 200; + // + // gridColumn7 + // + this.gridColumn7.Caption = "涓婁紶鑰�"; + this.gridColumn7.FieldName = "createBy"; + this.gridColumn7.MinWidth = 25; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.OptionsColumn.ReadOnly = true; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 3; + this.gridColumn7.Width = 94; + // + // gridColumn8 + // + this.gridColumn8.Caption = "涓婁紶鏃堕棿"; + this.gridColumn8.FieldName = "createDate"; + this.gridColumn8.MinWidth = 25; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.OptionsColumn.ReadOnly = true; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 4; + this.gridColumn8.Width = 94; + // + // gridColumn10 + // + this.gridColumn10.Caption = "娴忚"; + this.gridColumn10.ColumnEdit = this.repositoryItemButtonEdit2; + this.gridColumn10.MinWidth = 25; + this.gridColumn10.Name = "gridColumn10"; + this.gridColumn10.Visible = true; + this.gridColumn10.VisibleIndex = 5; + this.gridColumn10.Width = 94; + // + // repositoryItemButtonEdit2 + // + this.repositoryItemButtonEdit2.AutoHeight = false; + editorButtonImageOptions3.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions3.Image"))); + editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娴忚", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2"; + this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick); + // + // gridColumn9 + // + this.gridColumn9.Caption = "绉诲嚭"; + this.gridColumn9.ColumnEdit = this.repositoryItemButtonEdit1; + this.gridColumn9.MinWidth = 25; + this.gridColumn9.Name = "gridColumn9"; + this.gridColumn9.Visible = true; + this.gridColumn9.VisibleIndex = 6; + this.gridColumn9.Width = 94; + // + // repositoryItemButtonEdit1 + // + this.repositoryItemButtonEdit1.AutoHeight = false; + editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍒犻櫎", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; + this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); + // + // ucUpFile1 + // + this.ucUpFile1.Dock = System.Windows.Forms.DockStyle.Top; + this.ucUpFile1.Location = new System.Drawing.Point(0, 0); + this.ucUpFile1.Name = "ucUpFile1"; + this.ucUpFile1.parentGuid = null; + this.ucUpFile1.Size = new System.Drawing.Size(1340, 57); + this.ucUpFile1.TabIndex = 0; // // panel1 // @@ -1446,6 +1553,16 @@ this.txt_lotNo.Size = new System.Drawing.Size(150, 28); this.txt_lotNo.TabIndex = 262; // + // gridColumn11 + // + this.gridColumn11.Caption = "闄勪欢绫诲瀷"; + this.gridColumn11.FieldName = "fileType"; + this.gridColumn11.MinWidth = 25; + this.gridColumn11.Name = "gridColumn11"; + this.gridColumn11.Visible = true; + this.gridColumn11.VisibleIndex = 1; + this.gridColumn11.Width = 94; + // // Frm_MesQaItemsDetect01Check // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1486,10 +1603,11 @@ this.xtraTabPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit(); this.xtraTabControl2.ResumeLayout(false); - this.xtraTabPage3.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit(); - this.panelControl1.ResumeLayout(false); - this.panelControl1.PerformLayout(); + this.tabMxPage3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit(); @@ -1572,12 +1690,7 @@ private DevExpress.XtraEditors.LabelControl lb_releaseNo; private DevExpress.XtraEditors.TextEdit txt_releaseNo; private DevExpress.XtraGrid.Columns.GridColumn gv_releaseNo; - private DevExpress.XtraTab.XtraTabPage xtraTabPage3; - private DevExpress.XtraEditors.PanelControl panelControl1; - private DevExpress.XtraEditors.SimpleButton btnUp; - private System.Windows.Forms.Button btnUpSelect; - private System.Windows.Forms.TextBox txtUpUrl; - private System.Windows.Forms.Label label7; + private DevExpress.XtraTab.XtraTabPage tabMxPage3; private DevExpress.XtraEditors.MemoEdit txt_itemModel; private UserControl.UcLookItems txt_itemId; private DevExpress.XtraEditors.LabelControl lb_itemModel; @@ -1615,5 +1728,18 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private UserControl.UCUpFile ucUpFile1; + private DevExpress.XtraGrid.GridControl gcMx3; + private DevExpress.XtraGrid.Views.Grid.GridView gvMx3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs index 3b95868..a5f261f 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs @@ -5,12 +5,8 @@ using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; -using System.Configuration; using System.Data; using System.Drawing; -using System.IO; -using System.Net.Http; -using System.Threading.Tasks; using System.Windows.Forms; namespace Gs.DevApp.DevFrm.QC @@ -28,6 +24,7 @@ this.toolBarMenu1.btnZhiLiangFchkClick += ToolBarMenu1_btnZhiLiangFchkClick; this.toolBarMenu1.btnCaiGouChkClick += ToolBarMenu1_btnCaiGouChkClick; this.toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick; + this.toolBarMenu1.btnBoHuiClick += ToolBarMenu1_btnBoHuiClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; gcMain.MouseDoubleClick += GcMain_MouseDoubleClick; gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged; @@ -47,15 +44,15 @@ Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5); e.Graphics.DrawString(str, f, Brushes.Gray, r); }; - //涓婁紶闄勪欢 - btnUpSelect.Click += BtnUpSelect_Click; - btnUp.Click += BtnUp_Click; //鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷� gvMx2.OptionsFind.ShowSearchNavButtons = false; gvMx2.OptionsView.ShowGroupPanel = false; + gvMx3.OptionsFind.ShowSearchNavButtons = false; + gvMx3.OptionsView.ShowGroupPanel = false; _setIno(); + ucUpFile1.UpChanged += UcUpFile1_UpChanged; + xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged; } - /// <summary> /// 鍙屽嚮浜嬩欢 @@ -99,6 +96,14 @@ getPageList(1, pageBar1.RowsCount); } private void ToolBarMenu1_btnLogClick(object sender, EventArgs e) + { + toolBarMenu1.guidKey = ""; + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + lbGuid, txt_releaseNo, gridView1); + toolBarMenu1.guidKey = rowGuid; + } + private void ToolBarMenu1_btnBoHuiClick(object sender, EventArgs e) { toolBarMenu1.guidKey = ""; string rowGuid, rowName; @@ -152,7 +157,7 @@ UtilityHelper.JumpToTab(xtraTabControl1, 0); getPageList(1, UtilityHelper.GetPageSize()); } - + /// <summary> /// /// </summary> @@ -231,6 +236,7 @@ gcMx1.BindingContext = new BindingContext(); gcMx1.DataSource = dt; gcMx1.ForceInitialize(); + ucUpFile1.parentGuid = lbGuid.Text.Trim(); } else { @@ -245,82 +251,62 @@ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } - - - - #region 鏂囦欢涓婁紶 - /// <summary> - /// 閫夋嫨涓婁紶鏂囦欢 + /// 閫夐」鍗″垏鎹� /// </summary> /// <param name="sender"></param> /// <param name="e"></param> - private void BtnUpSelect_Click(object sender, EventArgs e) + private void XtraTabControl2_SelectedPageChanged(object sender, DevExpress.XtraTab.TabPageChangedEventArgs e) { - var openFileDialog = new OpenFileDialog(); - // 璁剧疆鍒濆鐩綍 - openFileDialog.InitialDirectory = "c:\\"; - // 璁剧疆鏂囦欢杩囨护閫夐」锛屽锛�"鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*" - openFileDialog.Filter = "鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*"; - // 璁剧疆鏍囬 - openFileDialog.Title = "閫夋嫨鏂囦欢"; - // 鏄剧ず瀵硅瘽妗� - var result = openFileDialog.ShowDialog(); - // 纭鐢ㄦ埛娌℃湁鍙栨秷鎿嶄綔 - if (result == DialogResult.OK) + if (e.Page.Name == "tabMxPage3") { - // 鑾峰彇閫変腑鐨勬枃浠惰矾寰� - var filePath = openFileDialog.FileName; - Console.WriteLine($"閫変腑鐨勬枃浠�: {filePath}"); - txtUpUrl.Text = filePath; + getFileList(); } } - /// <summary> - /// 纭畾涓婁紶 + /// 涓婁紶鍚庡埛鏂版枃浠跺垪琛� /// </summary> /// <param name="sender"></param> /// <param name="e"></param> - private async void BtnUp_Click(object sender, EventArgs e) + private void UcUpFile1_UpChanged(object sender, EventArgs e) { - var WebApiUrl = ConfigurationSettings.AppSettings.Get("WebApiUrl"); - var address = WebApiUrl + "Upload/UploadFile"; - var filePath = txtUpUrl.Text.Trim(); - var apiUrl = address; // 鏇挎崲涓轰綘鐨凙PI鍦板潃 - await UploadFileAsync(apiUrl, filePath); + getFileList(); } - - private async Task UploadFileAsync(string url, string filePath) + private void getFileList() { - UcLoading _loading = new UcLoading(); - using (var httpClient = new HttpClient()) - using (var form = new MultipartFormDataContent()) + System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); + _sbSqlWhere.Append(" and parent_Guid='" + lbGuid.Text.Trim() + "'"); + PageQueryModel pgq = new PageQueryModel(1, 100, "create_date", "asc", "", _sbSqlWhere.ToString()); + string json = JsonConvert.SerializeObject(pgq); + try { - httpClient.DefaultRequestHeaders.Add("token", - UtilityHelper.GetBasicAuthTicket()); - using (var fs = File.OpenRead(filePath)) - using (var streamContent = new StreamContent(fs)) + string strReturn = UtilityHelper.HttpPost("", "MesFile/GetListPage", json); + ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn); + if (dd.rtnCode > 0) { - form.Add(streamContent, "file", Path.GetFileName(filePath)); - var response = await httpClient.PostAsync(url, form); - var responseString = - await response.Content.ReadAsStringAsync(); - MessageBox.Show(responseString); + DataTable dt = dd.rtnData.list; + gcMx3.BindingContext = new BindingContext(); + gcMx3.DataSource = dt; + gcMx3.ForceInitialize(); + } + else + { + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg); } } - _loading.Close(); + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } } - - #endregion - private void _setIno() { txt_itemId.KeyFile = "id"; - txt_itemId.EditChanged += (s, e) => - { - txt_itemModel.Text = this.txt_itemId.GetModel(); - txt_itemNo.Text = this.txt_itemId.GetCode(); - }; + //txt_itemId.EditChanged += (s, e) => + //{ + // txt_itemModel.Text = this.txt_itemId.GetModel(); + // txt_itemNo.Text = this.txt_itemId.GetCode(); + //}; } /// <summary> /// 璇诲彇妫�楠岀粨鏋� @@ -352,6 +338,43 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } - + private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + { + var rowhandle = gvMx3.FocusedRowHandle; + if (rowhandle < 0) + return; + if (e.Button.Index == 0) + { + var dr = gvMx3.GetDataRow(rowhandle); + var mxGuid = dr["guid"].ToString(); + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵")) + return; + var strJson = ""; + var lst = new List<string>(); + lst.Add(mxGuid); + try + { + strJson = UtilityHelper.HttpPost("", "MesFile/DeleteModel", + JsonConvert.SerializeObject(lst)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) gvMx3.DeleteRow(rowhandle); + MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + } + private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + { + var rowhandle = gvMx3.FocusedRowHandle; + if (rowhandle < 0) + return; + if (e.Button.Index == 0) + { + MsgHelper.Warning("鎻愮ず锛�" + "寮�鍙戜腑"); + } + } } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx index 1af7de1..5cb86e4 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx @@ -117,4 +117,26 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="editorButtonImageOptions3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0 + bGUAV2ViO1dvcmxkO0V5ZQdEODoAAAONSURBVDhPVZJtTNNXFIcvoHOyLhMTt2Qsm4oMI5luEE3jZlsR + lDGrVWBzo7oBRibyYgWmWYtQoams4gAHghawaMABAgGZIg1CacUWKxUISqG8jBUrMJaVFFwz99v9M4fx + JE/uh3POc8/NPUSpMxAAhIarXLXNr/A6v1ZWEW09XdsNeY1pXFZlrD2YKfWnebdyjZwU03qam+953kdc + dkYluQtPHpGeqRI49cM/oGukHdPOZxidcaJcdwPppaHOM1cDT/n4v/0qU59Z1fWSYNHnx+OKxFfq8fMd + Baaf9mLgcQ+ezP0NG+WR1QR13zmobocjVs67QOsXSy7rXwj2JHgFHUjdgWy1GlrzfRgtOvRa+zFkd84z + MD0L/XA3SlrjIL64HQHC0B1U4vpCcNTrmrzyMxy/JIbRNgfTxBx6Jp+iZ+o/NA876JMaoRlLhFIdBt5X + W2uo4JUFQdBB38eKmt04ppSiyWJH+5gDut8oY7PQjEzimrYSV1ou4WpnDEravkBQJNtGBe4Lgi0RUc79 + p2IgrtOiQD+Fhn47Gs12VNxRo/hGISo6tMjX2xBfkApFbSg4wo1OKmB9zM8h7JCzhIQkqGyHL3QiVtWD + 9OZxnNVOoMT4O1RNlzE40YIuSxtM5ge4/6iX0oeK67ccVPAGxWVTcDYh3hxuPT/uAMIzC/B1vgGiygHc + HvwT3UMWVN9sR1bRLxAr6hErqUNSRh3iU6tm+RFZCSyPVa9TiRtZyX5z96Z9K/GtIhx80TfIrW6A1jSG + 9Dw1SquNaDcM4nt5GfZGZ8yfrR1m/HixDRu3y4dWfyBcSyWE5cXzrORFeiMx91O03DMiq7AVpr5x2B1/ + IUmqRKftD6Skn0NimhKHUnJhm5pBQ/MDrOekaRmBm/vypW+t+uSdIp+A4Ge39ANIljVictoB65MZBISm + QCTJYVYOYfuPgCM4BsuvUzCYhrGem+EgEZITjMSVwlq+2jcku+SmWRhf9k+zph/9IxOIEmXP3/xl5FHE + fJeLsEgJjL2jKKu+i3WbxTqyJjiTvMeJZiQulMWUZe/6BLN5gpxRUVoNfiptBn9fMrw+3IWd9MwrbkJM + cjk2cKUjnu8LfBd2mmFr2HnC3ZvPyNxWePp7bOCeSPAPlN31C5RZ/badpiNLx9dtlhjWfHQ4ieXhvYLW + LXpJwKHNWwR5hFkSGv9P9BplGcXjOcz3LaG4rmWfJP8CiUU9Vuoq7pwAAAAASUVORK5CYII= +</value> + </data> </root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs index c85eaf1..19ab028 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs @@ -65,6 +65,7 @@ return; } System.Text.StringBuilder sbWhere = new StringBuilder(); + sbWhere.Append(" and A.SUPPLIER=" + this.txt_suppNo.GetId()); var frm = new SelectCgMx(this.txt_suppNo.GetCode(), sbWhere.ToString()); frm.UpdateParent += (ss, ee) => { diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs index 7cce194..cf7ea74 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs @@ -64,103 +64,119 @@ this.gvMx1purchaseQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1orderLineId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gv_erpid = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_changereason = new DevExpress.XtraEditors.LabelControl(); this.txt_changereason = new DevExpress.XtraEditors.TextEdit(); - this.gv_changereason = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_checkFalg = new DevExpress.XtraEditors.LabelControl(); - this.gv_checkFalg = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_checkBy = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_ebelnK3id = new DevExpress.XtraEditors.LabelControl(); this.txt_ebelnK3id = new DevExpress.XtraEditors.TextEdit(); this.lb_erpCheckDate = new DevExpress.XtraEditors.LabelControl(); this.txt_erpCheckDate = new DevExpress.XtraEditors.TextEdit(); - this.gv_erpCheckDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_erpCheckBy = new DevExpress.XtraEditors.LabelControl(); this.txt_erpCheckBy = new DevExpress.XtraEditors.TextEdit(); - this.gv_erpCheckBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl(); this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit(); - this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl(); this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit(); - this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_createDate = new DevExpress.XtraEditors.LabelControl(); this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); - this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_createBy = new DevExpress.XtraEditors.LabelControl(); this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); - this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_cancellationDate = new DevExpress.XtraEditors.LabelControl(); this.txt_cancellationDate = new DevExpress.XtraEditors.TextEdit(); - this.gv_cancellationDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_cancellationPerson = new DevExpress.XtraEditors.LabelControl(); this.txt_cancellationPerson = new DevExpress.XtraEditors.TextEdit(); - this.gv_cancellationPerson = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_cancellationStatus = new DevExpress.XtraEditors.LabelControl(); this.txt_cancellationStatus = new DevExpress.XtraEditors.TextEdit(); - this.gv_cancellationStatus = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_remarks = new DevExpress.XtraEditors.LabelControl(); this.txt_remarks = new DevExpress.XtraEditors.TextEdit(); - this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_transportMethod = new DevExpress.XtraEditors.LabelControl(); this.txt_transportMethod = new DevExpress.XtraEditors.TextEdit(); - this.gv_transportMethod = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_email = new DevExpress.XtraEditors.LabelControl(); this.txt_email = new DevExpress.XtraEditors.TextEdit(); this.lb_paymentParty = new DevExpress.XtraEditors.LabelControl(); this.txt_paymentParty = new DevExpress.XtraEditors.TextEdit(); - this.gv_paymentParty = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_settlementParty = new DevExpress.XtraEditors.LabelControl(); this.txt_settlementParty = new DevExpress.XtraEditors.TextEdit(); - this.gv_settlementParty = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_qualityReq = new DevExpress.XtraEditors.LabelControl(); this.txt_qualityReq = new DevExpress.XtraEditors.TextEdit(); - this.gv_qualityReq = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_purchaser = new DevExpress.XtraEditors.LabelControl(); this.txt_purchaser = new DevExpress.XtraEditors.TextEdit(); - this.gv_purchaser = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_qtyAcceptance = new DevExpress.XtraEditors.LabelControl(); this.txt_qtyAcceptance = new DevExpress.XtraEditors.TextEdit(); - this.gv_qtyAcceptance = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_purchaseGroup = new DevExpress.XtraEditors.LabelControl(); this.txt_purchaseGroup = new DevExpress.XtraEditors.TextEdit(); this.lb_purchaseDept = new DevExpress.XtraEditors.LabelControl(); this.txt_purchaseDept = new DevExpress.XtraEditors.TextEdit(); - this.gv_purchaseDept = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_purchaseOrg = new DevExpress.XtraEditors.LabelControl(); this.txt_purchaseOrg = new DevExpress.XtraEditors.TextEdit(); this.lb_closeStatus = new DevExpress.XtraEditors.LabelControl(); this.txt_closeStatus = new DevExpress.XtraEditors.TextEdit(); - this.gv_closeStatus = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_supplier = new DevExpress.XtraEditors.LabelControl(); this.txt_supplier = new DevExpress.XtraEditors.TextEdit(); - this.gv_supplier = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_purchaseDate = new DevExpress.XtraEditors.LabelControl(); this.txt_purchaseDate = new DevExpress.XtraEditors.TextEdit(); - this.gv_purchaseDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_businessType = new DevExpress.XtraEditors.LabelControl(); this.txt_businessType = new DevExpress.XtraEditors.TextEdit(); - this.gv_businessType = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_documentType = new DevExpress.XtraEditors.LabelControl(); this.txt_documentType = new DevExpress.XtraEditors.TextEdit(); - this.gv_documentType = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_documentStatus = new DevExpress.XtraEditors.LabelControl(); this.txt_documentStatus = new DevExpress.XtraEditors.TextEdit(); - this.gv_documentStatus = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_billNo = new DevExpress.XtraEditors.LabelControl(); this.txt_billNo = new DevExpress.XtraEditors.TextEdit(); - this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.gcMain = new DevExpress.XtraGrid.GridControl(); - this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView(); + this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gv_factory = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_qtyAcceptance = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_settlementParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_paymentParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_transportMethod = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_remarks = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_cancellationStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_cancellationPerson = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_cancellationDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_lastupdateBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_erpCheckBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_erpCheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_checkBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_checkFalg = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gv_changereason = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gv_documentStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gv_documentType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gv_businessType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gv_purchaseDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gv_supplier = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gv_closeStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gv_purchaseDept = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gv_purchaser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); + this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); + this.gv_qualityReq = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); this.pageBar1 = new UserControls.Data.UcPageBar(); @@ -170,7 +186,8 @@ this.txt_checkFalg = new DevExpress.XtraEditors.CheckEdit(); this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); - this.gv_erpid = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); @@ -661,27 +678,14 @@ // this.gvMx1itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1itemId.AppearanceCell.Options.UseFont = true; - this.gvMx1itemId.Caption = "鐗╂枡缂栫爜"; + this.gvMx1itemId.Caption = "鐗╂枡ID"; this.gvMx1itemId.FieldName = "itemId"; this.gvMx1itemId.MinWidth = 100; this.gvMx1itemId.Name = "gvMx1itemId"; this.gvMx1itemId.Tag = "query_a.ITEM_ID"; this.gvMx1itemId.Visible = true; - this.gvMx1itemId.VisibleIndex = 3; + this.gvMx1itemId.VisibleIndex = 2; this.gvMx1itemId.Width = 100; - // - // gvMx1orderLineId - // - this.gvMx1orderLineId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1orderLineId.AppearanceCell.Options.UseFont = true; - this.gvMx1orderLineId.Caption = "閲囪喘璁㈠崟琛屽彿"; - this.gvMx1orderLineId.FieldName = "orderLineId"; - this.gvMx1orderLineId.MinWidth = 100; - this.gvMx1orderLineId.Name = "gvMx1orderLineId"; - this.gvMx1orderLineId.Tag = "query_a.ORDER_LINE_ID"; - this.gvMx1orderLineId.Visible = true; - this.gvMx1orderLineId.VisibleIndex = 2; - this.gvMx1orderLineId.Width = 100; // // gvMx1salesOrderId // @@ -731,8 +735,9 @@ this.gv_erpid, this.gvMx1guid, this.gvMx1salesOrderId, - this.gvMx1orderLineId, this.gvMx1itemId, + this.gridColumn2, + this.gridColumn1, this.gvMx1purchaseQty, this.gvMx1purchaseUnit, this.gvMx1inventoryUnit, @@ -774,6 +779,16 @@ this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom; this.gvMx1.OptionsView.ShowGroupPanel = false; // + // gv_erpid + // + this.gv_erpid.Caption = "ERP涓ID"; + this.gv_erpid.FieldName = "ebelnK3id"; + this.gv_erpid.MinWidth = 100; + this.gv_erpid.Name = "gv_erpid"; + this.gv_erpid.Visible = true; + this.gv_erpid.VisibleIndex = 0; + this.gv_erpid.Width = 100; + // // lb_changereason // this.lb_changereason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -793,20 +808,6 @@ this.txt_changereason.Size = new System.Drawing.Size(150, 28); this.txt_changereason.TabIndex = 450; // - // gv_changereason - // - this.gv_changereason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_changereason.AppearanceCell.Options.UseFont = true; - this.gv_changereason.Caption = "鍙樻洿鍘熷洜"; - this.gv_changereason.FieldName = "changereason"; - this.gv_changereason.MinWidth = 100; - this.gv_changereason.Name = "gv_changereason"; - this.gv_changereason.OptionsColumn.AllowEdit = false; - this.gv_changereason.Tag = "query_a.CHANGEREASON"; - this.gv_changereason.Visible = true; - this.gv_changereason.VisibleIndex = 28; - this.gv_changereason.Width = 100; - // // lb_checkFalg // this.lb_checkFalg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -816,48 +817,6 @@ this.lb_checkFalg.Size = new System.Drawing.Size(73, 21); this.lb_checkFalg.TabIndex = 387; this.lb_checkFalg.Text = "瀹℃牳鏍囪瘑 "; - // - // gv_checkFalg - // - this.gv_checkFalg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_checkFalg.AppearanceCell.Options.UseFont = true; - this.gv_checkFalg.Caption = "瀹℃牳鏍囪瘑"; - this.gv_checkFalg.FieldName = "checkFalg"; - this.gv_checkFalg.MinWidth = 80; - this.gv_checkFalg.Name = "gv_checkFalg"; - this.gv_checkFalg.OptionsColumn.AllowEdit = false; - this.gv_checkFalg.Tag = "query_a.CHECK_FALG"; - this.gv_checkFalg.Visible = true; - this.gv_checkFalg.VisibleIndex = 27; - this.gv_checkFalg.Width = 100; - // - // gv_checkBy - // - this.gv_checkBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_checkBy.AppearanceCell.Options.UseFont = true; - this.gv_checkBy.Caption = "瀹℃牳浜�"; - this.gv_checkBy.FieldName = "checkBy"; - this.gv_checkBy.MinWidth = 100; - this.gv_checkBy.Name = "gv_checkBy"; - this.gv_checkBy.OptionsColumn.AllowEdit = false; - this.gv_checkBy.Tag = "query_a.CHECK_BY"; - this.gv_checkBy.Visible = true; - this.gv_checkBy.VisibleIndex = 26; - this.gv_checkBy.Width = 100; - // - // gv_checkDate - // - this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_checkDate.AppearanceCell.Options.UseFont = true; - this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡"; - this.gv_checkDate.FieldName = "checkDate"; - this.gv_checkDate.MinWidth = 120; - 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 = 25; - this.gv_checkDate.Width = 120; // // lb_ebelnK3id // @@ -897,20 +856,6 @@ this.txt_erpCheckDate.Size = new System.Drawing.Size(174, 28); this.txt_erpCheckDate.TabIndex = 351; // - // gv_erpCheckDate - // - this.gv_erpCheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_erpCheckDate.AppearanceCell.Options.UseFont = true; - this.gv_erpCheckDate.Caption = "瀹℃牳鏃堕棿"; - this.gv_erpCheckDate.FieldName = "erpCheckDate"; - this.gv_erpCheckDate.MinWidth = 200; - this.gv_erpCheckDate.Name = "gv_erpCheckDate"; - this.gv_erpCheckDate.OptionsColumn.AllowEdit = false; - this.gv_erpCheckDate.Tag = "query_a.ERP_CHECK_DATE"; - this.gv_erpCheckDate.Visible = true; - this.gv_erpCheckDate.VisibleIndex = 24; - this.gv_erpCheckDate.Width = 200; - // // lb_erpCheckBy // this.lb_erpCheckBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -929,20 +874,6 @@ this.txt_erpCheckBy.Properties.Appearance.Options.UseFont = true; this.txt_erpCheckBy.Size = new System.Drawing.Size(174, 28); this.txt_erpCheckBy.TabIndex = 343; - // - // gv_erpCheckBy - // - this.gv_erpCheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_erpCheckBy.AppearanceCell.Options.UseFont = true; - this.gv_erpCheckBy.Caption = "瀹℃牳浜�"; - this.gv_erpCheckBy.FieldName = "erpCheckBy"; - this.gv_erpCheckBy.MinWidth = 100; - this.gv_erpCheckBy.Name = "gv_erpCheckBy"; - this.gv_erpCheckBy.OptionsColumn.AllowEdit = false; - this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY"; - this.gv_erpCheckBy.Visible = true; - this.gv_erpCheckBy.VisibleIndex = 23; - this.gv_erpCheckBy.Width = 100; // // lb_lastupdateBy // @@ -963,20 +894,6 @@ this.txt_lastupdateBy.Size = new System.Drawing.Size(174, 28); this.txt_lastupdateBy.TabIndex = 336; // - // gv_lastupdateBy - // - this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true; - this.gv_lastupdateBy.Caption = "鏈�鍚庝慨鏀逛汉"; - this.gv_lastupdateBy.FieldName = "lastupdateBy"; - this.gv_lastupdateBy.MinWidth = 100; - 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 = 22; - this.gv_lastupdateBy.Width = 100; - // // lb_lastupdateDate // this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -995,20 +912,6 @@ this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true; this.txt_lastupdateDate.Size = new System.Drawing.Size(174, 28); this.txt_lastupdateDate.TabIndex = 327; - // - // gv_lastupdateDate - // - this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true; - this.gv_lastupdateDate.Caption = "鏈�鍚庝慨鏀规椂闂�"; - this.gv_lastupdateDate.FieldName = "lastupdateDate"; - this.gv_lastupdateDate.MinWidth = 200; - 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 = 21; - this.gv_lastupdateDate.Width = 200; // // lb_createDate // @@ -1029,20 +932,6 @@ this.txt_createDate.Size = new System.Drawing.Size(174, 28); this.txt_createDate.TabIndex = 319; // - // gv_createDate - // - this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_createDate.AppearanceCell.Options.UseFont = true; - this.gv_createDate.Caption = "鍒涘缓鏃ユ湡"; - this.gv_createDate.FieldName = "createDate"; - this.gv_createDate.MinWidth = 200; - 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 = 20; - this.gv_createDate.Width = 200; - // // lb_createBy // this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -1061,20 +950,6 @@ this.txt_createBy.Properties.Appearance.Options.UseFont = true; this.txt_createBy.Size = new System.Drawing.Size(174, 28); this.txt_createBy.TabIndex = 312; - // - // gv_createBy - // - this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_createBy.AppearanceCell.Options.UseFont = true; - this.gv_createBy.Caption = "鍒涘缓浜�"; - this.gv_createBy.FieldName = "createBy"; - this.gv_createBy.MinWidth = 100; - 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 = 19; - this.gv_createBy.Width = 100; // // lb_cancellationDate // @@ -1095,25 +970,11 @@ this.txt_cancellationDate.Size = new System.Drawing.Size(150, 28); this.txt_cancellationDate.TabIndex = 306; // - // gv_cancellationDate - // - this.gv_cancellationDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_cancellationDate.AppearanceCell.Options.UseFont = true; - this.gv_cancellationDate.Caption = "浣滃簾鏃ユ湡"; - this.gv_cancellationDate.FieldName = "cancellationDate"; - this.gv_cancellationDate.MinWidth = 200; - this.gv_cancellationDate.Name = "gv_cancellationDate"; - this.gv_cancellationDate.OptionsColumn.AllowEdit = false; - this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE"; - this.gv_cancellationDate.Visible = true; - this.gv_cancellationDate.VisibleIndex = 18; - this.gv_cancellationDate.Width = 200; - // // lb_cancellationPerson // this.lb_cancellationPerson.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_cancellationPerson.Appearance.Options.UseFont = true; - this.lb_cancellationPerson.Location = new System.Drawing.Point(270, 182); + this.lb_cancellationPerson.Location = new System.Drawing.Point(287, 182); this.lb_cancellationPerson.Name = "lb_cancellationPerson"; this.lb_cancellationPerson.Size = new System.Drawing.Size(56, 21); this.lb_cancellationPerson.TabIndex = 298; @@ -1127,20 +988,6 @@ this.txt_cancellationPerson.Properties.Appearance.Options.UseFont = true; this.txt_cancellationPerson.Size = new System.Drawing.Size(150, 28); this.txt_cancellationPerson.TabIndex = 298; - // - // gv_cancellationPerson - // - this.gv_cancellationPerson.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_cancellationPerson.AppearanceCell.Options.UseFont = true; - this.gv_cancellationPerson.Caption = "浣滃簾浜�"; - this.gv_cancellationPerson.FieldName = "cancellationPerson"; - this.gv_cancellationPerson.MinWidth = 100; - this.gv_cancellationPerson.Name = "gv_cancellationPerson"; - this.gv_cancellationPerson.OptionsColumn.AllowEdit = false; - this.gv_cancellationPerson.Tag = "query_a.CANCELLATION_PERSON"; - this.gv_cancellationPerson.Visible = true; - this.gv_cancellationPerson.VisibleIndex = 17; - this.gv_cancellationPerson.Width = 100; // // lb_cancellationStatus // @@ -1161,20 +1008,6 @@ this.txt_cancellationStatus.Size = new System.Drawing.Size(150, 28); this.txt_cancellationStatus.TabIndex = 291; // - // gv_cancellationStatus - // - this.gv_cancellationStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_cancellationStatus.AppearanceCell.Options.UseFont = true; - this.gv_cancellationStatus.Caption = "浣滃簾鐘舵��"; - this.gv_cancellationStatus.FieldName = "cancellationStatus"; - this.gv_cancellationStatus.MinWidth = 50; - this.gv_cancellationStatus.Name = "gv_cancellationStatus"; - this.gv_cancellationStatus.OptionsColumn.AllowEdit = false; - this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS"; - this.gv_cancellationStatus.Visible = true; - this.gv_cancellationStatus.VisibleIndex = 16; - this.gv_cancellationStatus.Width = 50; - // // lb_remarks // this.lb_remarks.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -1193,20 +1026,6 @@ this.txt_remarks.Properties.Appearance.Options.UseFont = true; this.txt_remarks.Size = new System.Drawing.Size(150, 28); this.txt_remarks.TabIndex = 280; - // - // gv_remarks - // - this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_remarks.AppearanceCell.Options.UseFont = true; - this.gv_remarks.Caption = "澶囨敞"; - this.gv_remarks.FieldName = "remarks"; - this.gv_remarks.MinWidth = 100; - this.gv_remarks.Name = "gv_remarks"; - this.gv_remarks.OptionsColumn.AllowEdit = false; - this.gv_remarks.Tag = "query_a.REMARKS"; - this.gv_remarks.Visible = true; - this.gv_remarks.VisibleIndex = 15; - this.gv_remarks.Width = 100; // // lb_transportMethod // @@ -1227,25 +1046,11 @@ this.txt_transportMethod.Size = new System.Drawing.Size(150, 28); this.txt_transportMethod.TabIndex = 273; // - // gv_transportMethod - // - this.gv_transportMethod.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_transportMethod.AppearanceCell.Options.UseFont = true; - this.gv_transportMethod.Caption = "杩愯緭鏂瑰紡"; - this.gv_transportMethod.FieldName = "transportMethod"; - this.gv_transportMethod.MinWidth = 100; - this.gv_transportMethod.Name = "gv_transportMethod"; - this.gv_transportMethod.OptionsColumn.AllowEdit = false; - this.gv_transportMethod.Tag = "query_a.TRANSPORT_METHOD"; - this.gv_transportMethod.Visible = true; - this.gv_transportMethod.VisibleIndex = 14; - this.gv_transportMethod.Width = 100; - // // lb_email // this.lb_email.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_email.Appearance.Options.UseFont = true; - this.lb_email.Location = new System.Drawing.Point(270, 148); + this.lb_email.Location = new System.Drawing.Point(304, 148); this.lb_email.Name = "lb_email"; this.lb_email.Size = new System.Drawing.Size(39, 21); this.lb_email.TabIndex = 267; @@ -1264,7 +1069,7 @@ // this.lb_paymentParty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_paymentParty.Appearance.Options.UseFont = true; - this.lb_paymentParty.Location = new System.Drawing.Point(20, 148); + this.lb_paymentParty.Location = new System.Drawing.Point(37, 148); this.lb_paymentParty.Name = "lb_paymentParty"; this.lb_paymentParty.Size = new System.Drawing.Size(56, 21); this.lb_paymentParty.TabIndex = 262; @@ -1278,20 +1083,6 @@ this.txt_paymentParty.Properties.Appearance.Options.UseFont = true; this.txt_paymentParty.Size = new System.Drawing.Size(150, 28); this.txt_paymentParty.TabIndex = 262; - // - // gv_paymentParty - // - this.gv_paymentParty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_paymentParty.AppearanceCell.Options.UseFont = true; - this.gv_paymentParty.Caption = "鏀舵鏂�"; - this.gv_paymentParty.FieldName = "paymentParty"; - this.gv_paymentParty.MinWidth = 100; - this.gv_paymentParty.Name = "gv_paymentParty"; - this.gv_paymentParty.OptionsColumn.AllowEdit = false; - this.gv_paymentParty.Tag = "query_a.PAYMENT_PARTY"; - this.gv_paymentParty.Visible = true; - this.gv_paymentParty.VisibleIndex = 13; - this.gv_paymentParty.Width = 100; // // lb_settlementParty // @@ -1312,20 +1103,6 @@ this.txt_settlementParty.Size = new System.Drawing.Size(150, 28); this.txt_settlementParty.TabIndex = 258; // - // gv_settlementParty - // - this.gv_settlementParty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_settlementParty.AppearanceCell.Options.UseFont = true; - this.gv_settlementParty.Caption = "缁撶畻鏂�"; - this.gv_settlementParty.FieldName = "settlementParty"; - this.gv_settlementParty.MinWidth = 100; - this.gv_settlementParty.Name = "gv_settlementParty"; - this.gv_settlementParty.OptionsColumn.AllowEdit = false; - this.gv_settlementParty.Tag = "query_a.SETTLEMENT_PARTY"; - this.gv_settlementParty.Visible = true; - this.gv_settlementParty.VisibleIndex = 12; - this.gv_settlementParty.Width = 100; - // // lb_qualityReq // this.lb_qualityReq.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -1345,25 +1122,11 @@ this.txt_qualityReq.Size = new System.Drawing.Size(150, 28); this.txt_qualityReq.TabIndex = 252; // - // gv_qualityReq - // - this.gv_qualityReq.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_qualityReq.AppearanceCell.Options.UseFont = true; - this.gv_qualityReq.Caption = "璐ㄩ噺瑕佹眰"; - this.gv_qualityReq.FieldName = "qualityReq"; - this.gv_qualityReq.MinWidth = 100; - this.gv_qualityReq.Name = "gv_qualityReq"; - this.gv_qualityReq.OptionsColumn.AllowEdit = false; - this.gv_qualityReq.Tag = "query_a.QUALITY_REQ"; - this.gv_qualityReq.Visible = true; - this.gv_qualityReq.VisibleIndex = 11; - this.gv_qualityReq.Width = 100; - // // lb_purchaser // this.lb_purchaser.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_purchaser.Appearance.Options.UseFont = true; - this.lb_purchaser.Location = new System.Drawing.Point(270, 116); + this.lb_purchaser.Location = new System.Drawing.Point(287, 116); this.lb_purchaser.Name = "lb_purchaser"; this.lb_purchaser.Size = new System.Drawing.Size(56, 21); this.lb_purchaser.TabIndex = 247; @@ -1377,20 +1140,6 @@ this.txt_purchaser.Properties.Appearance.Options.UseFont = true; this.txt_purchaser.Size = new System.Drawing.Size(150, 28); this.txt_purchaser.TabIndex = 247; - // - // gv_purchaser - // - this.gv_purchaser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_purchaser.AppearanceCell.Options.UseFont = true; - this.gv_purchaser.Caption = "閲囪喘鍛�"; - this.gv_purchaser.FieldName = "purchaser"; - this.gv_purchaser.MinWidth = 100; - this.gv_purchaser.Name = "gv_purchaser"; - this.gv_purchaser.OptionsColumn.AllowEdit = false; - this.gv_purchaser.Tag = "query_a.PURCHASER"; - this.gv_purchaser.Visible = true; - this.gv_purchaser.VisibleIndex = 10; - this.gv_purchaser.Width = 100; // // lb_qtyAcceptance // @@ -1410,20 +1159,6 @@ this.txt_qtyAcceptance.Properties.Appearance.Options.UseFont = true; this.txt_qtyAcceptance.Size = new System.Drawing.Size(150, 28); this.txt_qtyAcceptance.TabIndex = 243; - // - // gv_qtyAcceptance - // - this.gv_qtyAcceptance.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_qtyAcceptance.AppearanceCell.Options.UseFont = true; - this.gv_qtyAcceptance.Caption = "鏁伴噺楠屾敹"; - this.gv_qtyAcceptance.FieldName = "qtyAcceptance"; - this.gv_qtyAcceptance.MinWidth = 100; - this.gv_qtyAcceptance.Name = "gv_qtyAcceptance"; - this.gv_qtyAcceptance.OptionsColumn.AllowEdit = false; - this.gv_qtyAcceptance.Tag = "query_a.QTY_ACCEPTANCE"; - this.gv_qtyAcceptance.Visible = true; - this.gv_qtyAcceptance.VisibleIndex = 9; - this.gv_qtyAcceptance.Width = 100; // // lb_purchaseGroup // @@ -1463,20 +1198,6 @@ this.txt_purchaseDept.Size = new System.Drawing.Size(150, 28); this.txt_purchaseDept.TabIndex = 235; // - // gv_purchaseDept - // - this.gv_purchaseDept.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_purchaseDept.AppearanceCell.Options.UseFont = true; - this.gv_purchaseDept.Caption = "閲囪喘閮ㄩ棬"; - this.gv_purchaseDept.FieldName = "purchaseDept"; - this.gv_purchaseDept.MinWidth = 110; - this.gv_purchaseDept.Name = "gv_purchaseDept"; - this.gv_purchaseDept.OptionsColumn.AllowEdit = false; - this.gv_purchaseDept.Tag = "query_a.PURCHASE_DEPT"; - this.gv_purchaseDept.Visible = true; - this.gv_purchaseDept.VisibleIndex = 8; - this.gv_purchaseDept.Width = 110; - // // lb_purchaseOrg // this.lb_purchaseOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -1515,20 +1236,6 @@ this.txt_closeStatus.Size = new System.Drawing.Size(150, 28); this.txt_closeStatus.TabIndex = 228; // - // gv_closeStatus - // - this.gv_closeStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_closeStatus.AppearanceCell.Options.UseFont = true; - this.gv_closeStatus.Caption = "鍏抽棴鐘舵��"; - this.gv_closeStatus.FieldName = "closeStatus"; - this.gv_closeStatus.MinWidth = 100; - this.gv_closeStatus.Name = "gv_closeStatus"; - this.gv_closeStatus.OptionsColumn.AllowEdit = false; - this.gv_closeStatus.Tag = "query_a.CLOSE_STATUS"; - this.gv_closeStatus.Visible = true; - this.gv_closeStatus.VisibleIndex = 7; - this.gv_closeStatus.Width = 100; - // // lb_supplier // this.lb_supplier.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -1547,20 +1254,6 @@ this.txt_supplier.Properties.Appearance.Options.UseFont = true; this.txt_supplier.Size = new System.Drawing.Size(150, 28); this.txt_supplier.TabIndex = 226; - // - // gv_supplier - // - this.gv_supplier.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_supplier.AppearanceCell.Options.UseFont = true; - this.gv_supplier.Caption = "渚涘簲鍟�"; - this.gv_supplier.FieldName = "supplier"; - this.gv_supplier.MinWidth = 110; - this.gv_supplier.Name = "gv_supplier"; - this.gv_supplier.OptionsColumn.AllowEdit = false; - this.gv_supplier.Tag = "query_a.SUPPLIER"; - this.gv_supplier.Visible = true; - this.gv_supplier.VisibleIndex = 6; - this.gv_supplier.Width = 110; // // lb_purchaseDate // @@ -1581,20 +1274,6 @@ this.txt_purchaseDate.Size = new System.Drawing.Size(150, 28); this.txt_purchaseDate.TabIndex = 222; // - // gv_purchaseDate - // - this.gv_purchaseDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_purchaseDate.AppearanceCell.Options.UseFont = true; - this.gv_purchaseDate.Caption = "閲囪喘鏃ユ湡"; - this.gv_purchaseDate.FieldName = "purchaseDate"; - this.gv_purchaseDate.MinWidth = 200; - this.gv_purchaseDate.Name = "gv_purchaseDate"; - this.gv_purchaseDate.OptionsColumn.AllowEdit = false; - this.gv_purchaseDate.Tag = "query_a.PURCHASE_DATE"; - this.gv_purchaseDate.Visible = true; - this.gv_purchaseDate.VisibleIndex = 5; - this.gv_purchaseDate.Width = 200; - // // lb_businessType // this.lb_businessType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -1613,20 +1292,6 @@ this.txt_businessType.Properties.Appearance.Options.UseFont = true; this.txt_businessType.Size = new System.Drawing.Size(150, 28); this.txt_businessType.TabIndex = 219; - // - // gv_businessType - // - this.gv_businessType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_businessType.AppearanceCell.Options.UseFont = true; - this.gv_businessType.Caption = "涓氬姟绫诲瀷"; - this.gv_businessType.FieldName = "businessType"; - this.gv_businessType.MinWidth = 100; - this.gv_businessType.Name = "gv_businessType"; - this.gv_businessType.OptionsColumn.AllowEdit = false; - this.gv_businessType.Tag = "query_a.BUSINESS_TYPE"; - this.gv_businessType.Visible = true; - this.gv_businessType.VisibleIndex = 4; - this.gv_businessType.Width = 100; // // lb_documentType // @@ -1647,20 +1312,6 @@ this.txt_documentType.Size = new System.Drawing.Size(150, 28); this.txt_documentType.TabIndex = 217; // - // gv_documentType - // - this.gv_documentType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_documentType.AppearanceCell.Options.UseFont = true; - this.gv_documentType.Caption = "鍗曟嵁绫诲瀷"; - this.gv_documentType.FieldName = "documentType"; - this.gv_documentType.MinWidth = 110; - this.gv_documentType.Name = "gv_documentType"; - this.gv_documentType.OptionsColumn.AllowEdit = false; - this.gv_documentType.Tag = "query_a.DOCUMENT_TYPE"; - this.gv_documentType.Visible = true; - this.gv_documentType.VisibleIndex = 3; - this.gv_documentType.Width = 110; - // // lb_documentStatus // this.lb_documentStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -1680,20 +1331,6 @@ this.txt_documentStatus.Size = new System.Drawing.Size(150, 28); this.txt_documentStatus.TabIndex = 216; // - // gv_documentStatus - // - this.gv_documentStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_documentStatus.AppearanceCell.Options.UseFont = true; - this.gv_documentStatus.Caption = "鍗曟嵁鐘舵��"; - this.gv_documentStatus.FieldName = "documentStatus"; - this.gv_documentStatus.MinWidth = 100; - this.gv_documentStatus.Name = "gv_documentStatus"; - this.gv_documentStatus.OptionsColumn.AllowEdit = false; - this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS"; - this.gv_documentStatus.Visible = true; - this.gv_documentStatus.VisibleIndex = 2; - this.gv_documentStatus.Width = 100; - // // lb_billNo // this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -1712,20 +1349,6 @@ this.txt_billNo.Properties.Appearance.Options.UseFont = true; this.txt_billNo.Size = new System.Drawing.Size(150, 28); this.txt_billNo.TabIndex = 213; - // - // gv_billNo - // - this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_billNo.AppearanceCell.Options.UseFont = true; - this.gv_billNo.Caption = "閲囪喘鍗曞彿"; - this.gv_billNo.FieldName = "billNo"; - this.gv_billNo.MinWidth = 120; - this.gv_billNo.Name = "gv_billNo"; - this.gv_billNo.OptionsColumn.AllowEdit = false; - this.gv_billNo.Tag = "query_a.BILL_NO"; - this.gv_billNo.Visible = true; - this.gv_billNo.VisibleIndex = 1; - this.gv_billNo.Width = 120; // // toolBarMenu1 // @@ -1755,9 +1378,25 @@ // // gridView1 // + this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; + this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); this.gridView1.Appearance.Row.Options.UseFont = true; - this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] { + this.gridBand1, + this.gridBand2, + this.gridBand3, + this.gridBand4, + this.gridBand5, + this.gridBand8, + this.gridBand6, + this.gridBand9, + this.gridBand10, + this.gridBand14, + this.gridBand15, + this.gridBand16}); + this.gridView1.ColumnPanelRowHeight = 90; + this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] { this.gv_factory, this.gv_billNo, this.gv_documentStatus, @@ -1792,18 +1431,526 @@ this.gridView1.Name = "gridView1"; this.gridView1.OptionsFind.ShowSearchNavButtons = false; this.gridView1.OptionsView.ShowAutoFilterRow = true; + this.gridView1.OptionsView.ShowColumnHeaders = false; this.gridView1.OptionsView.ShowGroupPanel = false; + // + // gridBand1 + // + this.gridBand1.Caption = "ERPID鍙�"; + this.gridBand1.Columns.Add(this.gv_factory); + this.gridBand1.Columns.Add(this.gv_qtyAcceptance); + this.gridBand1.Columns.Add(this.gv_settlementParty); + this.gridBand1.Columns.Add(this.gv_paymentParty); + this.gridBand1.Columns.Add(this.gv_transportMethod); + this.gridBand1.Columns.Add(this.gv_remarks); + this.gridBand1.Columns.Add(this.gv_cancellationStatus); + this.gridBand1.Columns.Add(this.gv_cancellationPerson); + this.gridBand1.Columns.Add(this.gv_cancellationDate); + this.gridBand1.Columns.Add(this.gv_createBy); + this.gridBand1.Columns.Add(this.gv_createDate); + this.gridBand1.Columns.Add(this.gv_lastupdateDate); + this.gridBand1.Columns.Add(this.gv_lastupdateBy); + this.gridBand1.Columns.Add(this.gv_erpCheckBy); + this.gridBand1.Columns.Add(this.gv_erpCheckDate); + this.gridBand1.Columns.Add(this.gv_checkDate); + this.gridBand1.Columns.Add(this.gv_checkBy); + this.gridBand1.Columns.Add(this.gv_checkFalg); + this.gridBand1.Columns.Add(this.gv_changereason); + this.gridBand1.Name = "gridBand1"; + this.gridBand1.VisibleIndex = 0; + this.gridBand1.Width = 82; // // gv_factory // this.gv_factory.Caption = "ERPID鍙�"; this.gv_factory.FieldName = "ebelnK3id"; - this.gv_factory.MinWidth = 100; + this.gv_factory.MinWidth = 70; this.gv_factory.Name = "gv_factory"; this.gv_factory.OptionsColumn.AllowEdit = false; this.gv_factory.Visible = true; - this.gv_factory.VisibleIndex = 0; - this.gv_factory.Width = 100; + this.gv_factory.Width = 82; + // + // gv_qtyAcceptance + // + this.gv_qtyAcceptance.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_qtyAcceptance.AppearanceCell.Options.UseFont = true; + this.gv_qtyAcceptance.Caption = "鏁伴噺楠屾敹"; + this.gv_qtyAcceptance.FieldName = "qtyAcceptance"; + this.gv_qtyAcceptance.MinWidth = 100; + this.gv_qtyAcceptance.Name = "gv_qtyAcceptance"; + this.gv_qtyAcceptance.OptionsColumn.AllowEdit = false; + this.gv_qtyAcceptance.Tag = "query_a.QTY_ACCEPTANCE"; + this.gv_qtyAcceptance.Width = 100; + // + // gv_settlementParty + // + this.gv_settlementParty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_settlementParty.AppearanceCell.Options.UseFont = true; + this.gv_settlementParty.Caption = "缁撶畻鏂�"; + this.gv_settlementParty.FieldName = "settlementParty"; + this.gv_settlementParty.MinWidth = 100; + this.gv_settlementParty.Name = "gv_settlementParty"; + this.gv_settlementParty.OptionsColumn.AllowEdit = false; + this.gv_settlementParty.Tag = "query_a.SETTLEMENT_PARTY"; + this.gv_settlementParty.Width = 100; + // + // gv_paymentParty + // + this.gv_paymentParty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_paymentParty.AppearanceCell.Options.UseFont = true; + this.gv_paymentParty.Caption = "鏀舵鏂�"; + this.gv_paymentParty.FieldName = "paymentParty"; + this.gv_paymentParty.MinWidth = 100; + this.gv_paymentParty.Name = "gv_paymentParty"; + this.gv_paymentParty.OptionsColumn.AllowEdit = false; + this.gv_paymentParty.Tag = "query_a.PAYMENT_PARTY"; + this.gv_paymentParty.Width = 100; + // + // gv_transportMethod + // + this.gv_transportMethod.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_transportMethod.AppearanceCell.Options.UseFont = true; + this.gv_transportMethod.Caption = "杩愯緭鏂瑰紡"; + this.gv_transportMethod.FieldName = "transportMethod"; + this.gv_transportMethod.MinWidth = 100; + this.gv_transportMethod.Name = "gv_transportMethod"; + this.gv_transportMethod.OptionsColumn.AllowEdit = false; + this.gv_transportMethod.Tag = "query_a.TRANSPORT_METHOD"; + this.gv_transportMethod.Width = 100; + // + // gv_remarks + // + this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_remarks.AppearanceCell.Options.UseFont = true; + this.gv_remarks.Caption = "澶囨敞"; + this.gv_remarks.FieldName = "remarks"; + this.gv_remarks.MinWidth = 100; + this.gv_remarks.Name = "gv_remarks"; + this.gv_remarks.OptionsColumn.AllowEdit = false; + this.gv_remarks.Tag = "query_a.REMARKS"; + this.gv_remarks.Width = 100; + // + // gv_cancellationStatus + // + this.gv_cancellationStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_cancellationStatus.AppearanceCell.Options.UseFont = true; + this.gv_cancellationStatus.Caption = "浣滃簾鐘舵��"; + this.gv_cancellationStatus.FieldName = "cancellationStatus"; + this.gv_cancellationStatus.MinWidth = 50; + this.gv_cancellationStatus.Name = "gv_cancellationStatus"; + this.gv_cancellationStatus.OptionsColumn.AllowEdit = false; + this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS"; + this.gv_cancellationStatus.Width = 50; + // + // gv_cancellationPerson + // + this.gv_cancellationPerson.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_cancellationPerson.AppearanceCell.Options.UseFont = true; + this.gv_cancellationPerson.Caption = "浣滃簾浜�"; + this.gv_cancellationPerson.FieldName = "cancellationPerson"; + this.gv_cancellationPerson.MinWidth = 100; + this.gv_cancellationPerson.Name = "gv_cancellationPerson"; + this.gv_cancellationPerson.OptionsColumn.AllowEdit = false; + this.gv_cancellationPerson.Tag = "query_a.CANCELLATION_PERSON"; + this.gv_cancellationPerson.Width = 100; + // + // gv_cancellationDate + // + this.gv_cancellationDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_cancellationDate.AppearanceCell.Options.UseFont = true; + this.gv_cancellationDate.Caption = "浣滃簾鏃ユ湡"; + this.gv_cancellationDate.FieldName = "cancellationDate"; + this.gv_cancellationDate.MinWidth = 200; + this.gv_cancellationDate.Name = "gv_cancellationDate"; + this.gv_cancellationDate.OptionsColumn.AllowEdit = false; + this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE"; + this.gv_cancellationDate.Width = 200; + // + // gv_createBy + // + this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_createBy.AppearanceCell.Options.UseFont = true; + this.gv_createBy.Caption = "鍒涘缓浜�"; + this.gv_createBy.FieldName = "createBy"; + this.gv_createBy.MinWidth = 100; + this.gv_createBy.Name = "gv_createBy"; + this.gv_createBy.OptionsColumn.AllowEdit = false; + this.gv_createBy.Tag = "query_a.CREATE_BY"; + this.gv_createBy.Width = 100; + // + // gv_createDate + // + this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_createDate.AppearanceCell.Options.UseFont = true; + this.gv_createDate.Caption = "鍒涘缓鏃ユ湡"; + this.gv_createDate.FieldName = "createDate"; + this.gv_createDate.MinWidth = 200; + this.gv_createDate.Name = "gv_createDate"; + this.gv_createDate.OptionsColumn.AllowEdit = false; + this.gv_createDate.Tag = "query_a.CREATE_DATE"; + this.gv_createDate.Width = 200; + // + // gv_lastupdateDate + // + this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true; + this.gv_lastupdateDate.Caption = "鏈�鍚庝慨鏀规椂闂�"; + this.gv_lastupdateDate.FieldName = "lastupdateDate"; + this.gv_lastupdateDate.MinWidth = 200; + this.gv_lastupdateDate.Name = "gv_lastupdateDate"; + this.gv_lastupdateDate.OptionsColumn.AllowEdit = false; + this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE"; + this.gv_lastupdateDate.Width = 200; + // + // gv_lastupdateBy + // + this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true; + this.gv_lastupdateBy.Caption = "鏈�鍚庝慨鏀逛汉"; + this.gv_lastupdateBy.FieldName = "lastupdateBy"; + this.gv_lastupdateBy.MinWidth = 100; + this.gv_lastupdateBy.Name = "gv_lastupdateBy"; + this.gv_lastupdateBy.OptionsColumn.AllowEdit = false; + this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY"; + this.gv_lastupdateBy.Width = 100; + // + // gv_erpCheckBy + // + this.gv_erpCheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_erpCheckBy.AppearanceCell.Options.UseFont = true; + this.gv_erpCheckBy.Caption = "瀹℃牳浜�"; + this.gv_erpCheckBy.FieldName = "erpCheckBy"; + this.gv_erpCheckBy.MinWidth = 100; + this.gv_erpCheckBy.Name = "gv_erpCheckBy"; + this.gv_erpCheckBy.OptionsColumn.AllowEdit = false; + this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY"; + this.gv_erpCheckBy.Width = 100; + // + // gv_erpCheckDate + // + this.gv_erpCheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_erpCheckDate.AppearanceCell.Options.UseFont = true; + this.gv_erpCheckDate.Caption = "瀹℃牳鏃堕棿"; + this.gv_erpCheckDate.FieldName = "erpCheckDate"; + this.gv_erpCheckDate.MinWidth = 200; + this.gv_erpCheckDate.Name = "gv_erpCheckDate"; + this.gv_erpCheckDate.OptionsColumn.AllowEdit = false; + this.gv_erpCheckDate.Tag = "query_a.ERP_CHECK_DATE"; + this.gv_erpCheckDate.Width = 200; + // + // gv_checkDate + // + this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_checkDate.AppearanceCell.Options.UseFont = true; + this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡"; + this.gv_checkDate.FieldName = "checkDate"; + this.gv_checkDate.MinWidth = 120; + this.gv_checkDate.Name = "gv_checkDate"; + this.gv_checkDate.OptionsColumn.AllowEdit = false; + this.gv_checkDate.Tag = "query_a.CHECK_DATE"; + this.gv_checkDate.Width = 120; + // + // gv_checkBy + // + this.gv_checkBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_checkBy.AppearanceCell.Options.UseFont = true; + this.gv_checkBy.Caption = "瀹℃牳浜�"; + this.gv_checkBy.FieldName = "checkBy"; + this.gv_checkBy.MinWidth = 100; + this.gv_checkBy.Name = "gv_checkBy"; + this.gv_checkBy.OptionsColumn.AllowEdit = false; + this.gv_checkBy.Tag = "query_a.CHECK_BY"; + this.gv_checkBy.Width = 100; + // + // gv_checkFalg + // + this.gv_checkFalg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_checkFalg.AppearanceCell.Options.UseFont = true; + this.gv_checkFalg.Caption = "瀹℃牳鏍囪瘑"; + this.gv_checkFalg.FieldName = "checkFalg"; + this.gv_checkFalg.MinWidth = 80; + this.gv_checkFalg.Name = "gv_checkFalg"; + this.gv_checkFalg.OptionsColumn.AllowEdit = false; + this.gv_checkFalg.Tag = "query_a.CHECK_FALG"; + this.gv_checkFalg.Width = 100; + // + // gv_changereason + // + this.gv_changereason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_changereason.AppearanceCell.Options.UseFont = true; + this.gv_changereason.Caption = "鍙樻洿鍘熷洜"; + this.gv_changereason.FieldName = "changereason"; + this.gv_changereason.MinWidth = 100; + this.gv_changereason.Name = "gv_changereason"; + this.gv_changereason.OptionsColumn.AllowEdit = false; + this.gv_changereason.Tag = "query_a.CHANGEREASON"; + this.gv_changereason.Width = 100; + // + // gridBand2 + // + this.gridBand2.Caption = "閲囪喘鍗曞彿"; + this.gridBand2.Columns.Add(this.gv_billNo); + this.gridBand2.Name = "gridBand2"; + this.gridBand2.VisibleIndex = 1; + this.gridBand2.Width = 141; + // + // gv_billNo + // + this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_billNo.AppearanceCell.Options.UseFont = true; + this.gv_billNo.Caption = "閲囪喘鍗曞彿"; + this.gv_billNo.FieldName = "billNo"; + this.gv_billNo.MinWidth = 120; + this.gv_billNo.Name = "gv_billNo"; + this.gv_billNo.OptionsColumn.AllowEdit = false; + this.gv_billNo.Tag = "query_a.BILL_NO"; + this.gv_billNo.Visible = true; + this.gv_billNo.Width = 141; + // + // gridBand3 + // + this.gridBand3.AppearanceHeader.Options.UseTextOptions = true; + this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; + this.gridBand3.Caption = "鍗曟嵁鐘舵��:A鍒涘缓,B瀹℃牳涓�,C宸插鏍�,D閲嶆柊瀹℃牳,Z鏆傚瓨"; + this.gridBand3.Columns.Add(this.gv_documentStatus); + this.gridBand3.Name = "gridBand3"; + this.gridBand3.RowCount = 2; + this.gridBand3.VisibleIndex = 2; + this.gridBand3.Width = 117; + // + // gv_documentStatus + // + this.gv_documentStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_documentStatus.AppearanceCell.Options.UseFont = true; + this.gv_documentStatus.Caption = "鍗曟嵁鐘舵��:A鍒涘缓,B瀹℃牳涓�,C宸插鏍�,D閲嶆柊瀹℃牳,Z鏆傚瓨"; + this.gv_documentStatus.FieldName = "documentStatus"; + this.gv_documentStatus.MinWidth = 100; + this.gv_documentStatus.Name = "gv_documentStatus"; + this.gv_documentStatus.OptionsColumn.AllowEdit = false; + this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS"; + this.gv_documentStatus.Visible = true; + this.gv_documentStatus.Width = 117; + // + // gridBand4 + // + this.gridBand4.AppearanceHeader.Options.UseTextOptions = true; + this.gridBand4.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; + this.gridBand4.Caption = "鍗曟嵁绫诲瀷:1閲囪喘,2濮斿"; + this.gridBand4.Columns.Add(this.gv_documentType); + this.gridBand4.Name = "gridBand4"; + this.gridBand4.RowCount = 2; + this.gridBand4.VisibleIndex = 3; + this.gridBand4.Width = 82; + // + // gv_documentType + // + this.gv_documentType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_documentType.AppearanceCell.Options.UseFont = true; + this.gv_documentType.Caption = "鍗曟嵁绫诲瀷:1閲囪喘,2濮斿"; + this.gv_documentType.FieldName = "documentType"; + this.gv_documentType.MinWidth = 70; + this.gv_documentType.Name = "gv_documentType"; + this.gv_documentType.OptionsColumn.AllowEdit = false; + this.gv_documentType.Tag = "query_a.DOCUMENT_TYPE"; + this.gv_documentType.Visible = true; + this.gv_documentType.Width = 82; + // + // gridBand5 + // + this.gridBand5.Caption = "涓氬姟绫诲瀷"; + this.gridBand5.Columns.Add(this.gv_businessType); + this.gridBand5.Name = "gridBand5"; + this.gridBand5.VisibleIndex = 4; + this.gridBand5.Width = 117; + // + // gv_businessType + // + this.gv_businessType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_businessType.AppearanceCell.Options.UseFont = true; + this.gv_businessType.Caption = "涓氬姟绫诲瀷"; + this.gv_businessType.FieldName = "businessType"; + this.gv_businessType.MinWidth = 100; + this.gv_businessType.Name = "gv_businessType"; + this.gv_businessType.OptionsColumn.AllowEdit = false; + this.gv_businessType.Tag = "query_a.BUSINESS_TYPE"; + this.gv_businessType.Visible = true; + this.gv_businessType.Width = 117; + // + // gridBand8 + // + this.gridBand8.Caption = "閲囪喘鏃ユ湡"; + this.gridBand8.Columns.Add(this.gv_purchaseDate); + this.gridBand8.Name = "gridBand8"; + this.gridBand8.VisibleIndex = 5; + this.gridBand8.Width = 126; + // + // gv_purchaseDate + // + this.gv_purchaseDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_purchaseDate.AppearanceCell.Options.UseFont = true; + this.gv_purchaseDate.Caption = "閲囪喘鏃ユ湡"; + this.gv_purchaseDate.FieldName = "purchaseDate"; + this.gv_purchaseDate.MinWidth = 100; + this.gv_purchaseDate.Name = "gv_purchaseDate"; + this.gv_purchaseDate.OptionsColumn.AllowEdit = false; + this.gv_purchaseDate.Tag = "query_a.PURCHASE_DATE"; + this.gv_purchaseDate.Visible = true; + this.gv_purchaseDate.Width = 126; + // + // gridBand6 + // + this.gridBand6.AppearanceHeader.Options.UseTextOptions = true; + this.gridBand6.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + this.gridBand6.Caption = "渚涘簲鍟�"; + this.gridBand6.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] { + this.gridBand11, + this.gridBand7}); + this.gridBand6.Name = "gridBand6"; + this.gridBand6.VisibleIndex = 6; + this.gridBand6.Width = 200; + // + // gridBand11 + // + this.gridBand11.Caption = "ID"; + this.gridBand11.Columns.Add(this.gv_supplier); + this.gridBand11.Name = "gridBand11"; + this.gridBand11.VisibleIndex = 0; + this.gridBand11.Width = 80; + // + // gv_supplier + // + this.gv_supplier.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_supplier.AppearanceCell.Options.UseFont = true; + this.gv_supplier.Caption = "渚涘簲鍟�"; + this.gv_supplier.FieldName = "supplier"; + this.gv_supplier.MinWidth = 50; + this.gv_supplier.Name = "gv_supplier"; + this.gv_supplier.OptionsColumn.AllowEdit = false; + this.gv_supplier.Tag = "query_a.SUPPLIER"; + this.gv_supplier.Visible = true; + this.gv_supplier.Width = 80; + // + // gridBand7 + // + this.gridBand7.Caption = "鍚嶇О"; + this.gridBand7.Name = "gridBand7"; + this.gridBand7.VisibleIndex = 1; + this.gridBand7.Width = 120; + // + // gridBand9 + // + this.gridBand9.AppearanceHeader.Options.UseTextOptions = true; + this.gridBand9.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; + this.gridBand9.Caption = "鍏抽棴鏍囪瘑:A鏄�,B鍚�"; + this.gridBand9.Columns.Add(this.gv_closeStatus); + this.gridBand9.Name = "gridBand9"; + this.gridBand9.RowCount = 3; + this.gridBand9.VisibleIndex = 7; + this.gridBand9.Width = 50; + // + // gv_closeStatus + // + this.gv_closeStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_closeStatus.AppearanceCell.Options.UseFont = true; + this.gv_closeStatus.Caption = "鍏抽棴鐘舵��"; + this.gv_closeStatus.FieldName = "closeStatus"; + this.gv_closeStatus.MinWidth = 50; + this.gv_closeStatus.Name = "gv_closeStatus"; + this.gv_closeStatus.OptionsColumn.AllowEdit = false; + this.gv_closeStatus.Tag = "query_a.CLOSE_STATUS"; + this.gv_closeStatus.Visible = true; + this.gv_closeStatus.Width = 50; + // + // gridBand10 + // + this.gridBand10.AppearanceHeader.Options.UseTextOptions = true; + this.gridBand10.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + this.gridBand10.Caption = "閲囪喘閮ㄩ棬"; + this.gridBand10.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] { + this.gridBand12, + this.gridBand13}); + this.gridBand10.Name = "gridBand10"; + this.gridBand10.VisibleIndex = 8; + this.gridBand10.Width = 310; + // + // gridBand12 + // + this.gridBand12.Caption = "缂栧彿"; + this.gridBand12.Columns.Add(this.gv_purchaseDept); + this.gridBand12.Name = "gridBand12"; + this.gridBand12.VisibleIndex = 0; + this.gridBand12.Width = 110; + // + // gv_purchaseDept + // + this.gv_purchaseDept.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_purchaseDept.AppearanceCell.Options.UseFont = true; + this.gv_purchaseDept.Caption = "閲囪喘閮ㄩ棬"; + this.gv_purchaseDept.FieldName = "purchaseDept"; + this.gv_purchaseDept.MinWidth = 60; + this.gv_purchaseDept.Name = "gv_purchaseDept"; + this.gv_purchaseDept.OptionsColumn.AllowEdit = false; + this.gv_purchaseDept.Tag = "query_a.PURCHASE_DEPT"; + this.gv_purchaseDept.Visible = true; + this.gv_purchaseDept.Width = 110; + // + // gridBand13 + // + this.gridBand13.Caption = "鍚嶇О"; + this.gridBand13.Name = "gridBand13"; + this.gridBand13.VisibleIndex = 1; + this.gridBand13.Width = 200; + // + // gridBand14 + // + this.gridBand14.AppearanceHeader.Options.UseTextOptions = true; + this.gridBand14.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; + this.gridBand14.Caption = "鏁伴噺楠屾敹"; + this.gridBand14.Name = "gridBand14"; + this.gridBand14.VisibleIndex = 9; + this.gridBand14.Width = 55; + // + // gridBand15 + // + this.gridBand15.Caption = "閲囪喘鍛�"; + this.gridBand15.Columns.Add(this.gv_purchaser); + this.gridBand15.Name = "gridBand15"; + this.gridBand15.VisibleIndex = 10; + this.gridBand15.Width = 142; + // + // gv_purchaser + // + this.gv_purchaser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_purchaser.AppearanceCell.Options.UseFont = true; + this.gv_purchaser.Caption = "閲囪喘鍛�"; + this.gv_purchaser.FieldName = "purchaser"; + this.gv_purchaser.MinWidth = 100; + this.gv_purchaser.Name = "gv_purchaser"; + this.gv_purchaser.OptionsColumn.AllowEdit = false; + this.gv_purchaser.Tag = "query_a.PURCHASER"; + this.gv_purchaser.Visible = true; + this.gv_purchaser.Width = 142; + // + // gridBand16 + // + this.gridBand16.Caption = "璐ㄩ噺瑕佹眰"; + this.gridBand16.Columns.Add(this.gv_qualityReq); + this.gridBand16.Name = "gridBand16"; + this.gridBand16.VisibleIndex = 11; + this.gridBand16.Width = 164; + // + // gv_qualityReq + // + this.gv_qualityReq.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_qualityReq.AppearanceCell.Options.UseFont = true; + this.gv_qualityReq.Caption = "璐ㄩ噺瑕佹眰"; + this.gv_qualityReq.FieldName = "qualityReq"; + this.gv_qualityReq.MinWidth = 100; + this.gv_qualityReq.Name = "gv_qualityReq"; + this.gv_qualityReq.OptionsColumn.AllowEdit = false; + this.gv_qualityReq.Tag = "query_a.QUALITY_REQ"; + this.gv_qualityReq.Visible = true; + this.gv_qualityReq.Width = 164; // // xtraTabControl1 // @@ -1957,15 +2104,23 @@ this.lbGuid.TabIndex = 1; this.lbGuid.Visible = false; // - // gv_erpid + // gridColumn1 // - this.gv_erpid.Caption = "ERP涓璉D"; - this.gv_erpid.FieldName = "ebelnK3id"; - this.gv_erpid.MinWidth = 100; - this.gv_erpid.Name = "gv_erpid"; - this.gv_erpid.Visible = true; - this.gv_erpid.VisibleIndex = 0; - this.gv_erpid.Width = 100; + this.gridColumn1.Caption = "鐗╂枡鍚嶇О"; + this.gridColumn1.MinWidth = 100; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 4; + this.gridColumn1.Width = 100; + // + // gridColumn2 + // + this.gridColumn2.Caption = "鐗╂枡缂栫爜"; + this.gridColumn2.MinWidth = 100; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 3; + this.gridColumn2.Width = 100; // // Frm_MesRohIn // @@ -2024,7 +2179,6 @@ #endregion private UserControl.UcToolBarMenu toolBarMenu1; private DevExpress.XtraGrid.GridControl gcMain; - private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private DevExpress.XtraTab.XtraTabControl xtraTabControl1; private DevExpress.XtraTab.XtraTabPage xtraTabPage1; private DevExpress.XtraTab.XtraTabPage xtraTabPage2; @@ -2068,7 +2222,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMx1purchaseQty; private DevExpress.XtraGrid.Columns.GridColumn gvMx1purchaseUnit; private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1orderLineId; private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesOrderId; private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid; private DevExpress.XtraTab.XtraTabPage tabMxPage1; @@ -2077,122 +2230,141 @@ private DevExpress.XtraEditors.LabelControl lb_changereason; private DevExpress.XtraEditors.TextEdit txt_changereason; - private DevExpress.XtraGrid.Columns.GridColumn gv_changereason; private DevExpress.XtraEditors.LabelControl lb_checkFalg; - private DevExpress.XtraGrid.Columns.GridColumn gv_checkFalg; - private DevExpress.XtraGrid.Columns.GridColumn gv_checkBy; - private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate; private DevExpress.XtraEditors.LabelControl lb_ebelnK3id; private DevExpress.XtraEditors.TextEdit txt_ebelnK3id; private DevExpress.XtraEditors.LabelControl lb_erpCheckDate; private DevExpress.XtraEditors.TextEdit txt_erpCheckDate; - private DevExpress.XtraGrid.Columns.GridColumn gv_erpCheckDate; private DevExpress.XtraEditors.LabelControl lb_erpCheckBy; private DevExpress.XtraEditors.TextEdit txt_erpCheckBy; - private DevExpress.XtraGrid.Columns.GridColumn gv_erpCheckBy; private DevExpress.XtraEditors.LabelControl lb_lastupdateBy; private DevExpress.XtraEditors.TextEdit txt_lastupdateBy; - private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy; private DevExpress.XtraEditors.LabelControl lb_lastupdateDate; private DevExpress.XtraEditors.TextEdit txt_lastupdateDate; - private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate; private DevExpress.XtraEditors.LabelControl lb_createDate; private DevExpress.XtraEditors.TextEdit txt_createDate; - private DevExpress.XtraGrid.Columns.GridColumn gv_createDate; private DevExpress.XtraEditors.LabelControl lb_createBy; private DevExpress.XtraEditors.TextEdit txt_createBy; - private DevExpress.XtraGrid.Columns.GridColumn gv_createBy; private DevExpress.XtraEditors.LabelControl lb_cancellationDate; private DevExpress.XtraEditors.TextEdit txt_cancellationDate; - private DevExpress.XtraGrid.Columns.GridColumn gv_cancellationDate; private DevExpress.XtraEditors.LabelControl lb_cancellationPerson; private DevExpress.XtraEditors.TextEdit txt_cancellationPerson; - private DevExpress.XtraGrid.Columns.GridColumn gv_cancellationPerson; private DevExpress.XtraEditors.LabelControl lb_cancellationStatus; private DevExpress.XtraEditors.TextEdit txt_cancellationStatus; - private DevExpress.XtraGrid.Columns.GridColumn gv_cancellationStatus; private DevExpress.XtraEditors.LabelControl lb_remarks; private DevExpress.XtraEditors.TextEdit txt_remarks; - private DevExpress.XtraGrid.Columns.GridColumn gv_remarks; private DevExpress.XtraEditors.LabelControl lb_transportMethod; private DevExpress.XtraEditors.TextEdit txt_transportMethod; - private DevExpress.XtraGrid.Columns.GridColumn gv_transportMethod; private DevExpress.XtraEditors.LabelControl lb_email; private DevExpress.XtraEditors.TextEdit txt_email; private DevExpress.XtraEditors.LabelControl lb_paymentParty; private DevExpress.XtraEditors.TextEdit txt_paymentParty; - private DevExpress.XtraGrid.Columns.GridColumn gv_paymentParty; private DevExpress.XtraEditors.LabelControl lb_settlementParty; private DevExpress.XtraEditors.TextEdit txt_settlementParty; - private DevExpress.XtraGrid.Columns.GridColumn gv_settlementParty; private DevExpress.XtraEditors.LabelControl lb_qualityReq; private DevExpress.XtraEditors.TextEdit txt_qualityReq; - private DevExpress.XtraGrid.Columns.GridColumn gv_qualityReq; private DevExpress.XtraEditors.LabelControl lb_purchaser; private DevExpress.XtraEditors.TextEdit txt_purchaser; - private DevExpress.XtraGrid.Columns.GridColumn gv_purchaser; private DevExpress.XtraEditors.LabelControl lb_qtyAcceptance; private DevExpress.XtraEditors.TextEdit txt_qtyAcceptance; - private DevExpress.XtraGrid.Columns.GridColumn gv_qtyAcceptance; private DevExpress.XtraEditors.LabelControl lb_purchaseGroup; private DevExpress.XtraEditors.TextEdit txt_purchaseGroup; private DevExpress.XtraEditors.LabelControl lb_purchaseDept; private DevExpress.XtraEditors.TextEdit txt_purchaseDept; - private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseDept; private DevExpress.XtraEditors.LabelControl lb_purchaseOrg; private DevExpress.XtraEditors.TextEdit txt_purchaseOrg; private DevExpress.XtraEditors.LabelControl lb_closeStatus; private DevExpress.XtraEditors.TextEdit txt_closeStatus; - private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus; private DevExpress.XtraEditors.LabelControl lb_supplier; private DevExpress.XtraEditors.TextEdit txt_supplier; - private DevExpress.XtraGrid.Columns.GridColumn gv_supplier; private DevExpress.XtraEditors.LabelControl lb_purchaseDate; private DevExpress.XtraEditors.TextEdit txt_purchaseDate; - private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseDate; private DevExpress.XtraEditors.LabelControl lb_businessType; private DevExpress.XtraEditors.TextEdit txt_businessType; - private DevExpress.XtraGrid.Columns.GridColumn gv_businessType; private DevExpress.XtraEditors.LabelControl lb_documentType; private DevExpress.XtraEditors.TextEdit txt_documentType; - private DevExpress.XtraGrid.Columns.GridColumn gv_documentType; private DevExpress.XtraEditors.LabelControl lb_documentStatus; private DevExpress.XtraEditors.TextEdit txt_documentStatus; - private DevExpress.XtraGrid.Columns.GridColumn gv_documentStatus; private DevExpress.XtraEditors.LabelControl lb_billNo; private DevExpress.XtraEditors.TextEdit txt_billNo; - private DevExpress.XtraGrid.Columns.GridColumn gv_billNo; - private DevExpress.XtraGrid.Columns.GridColumn gv_factory; private DevExpress.XtraEditors.CheckEdit txt_checkFalg; private DevExpress.XtraGrid.Columns.GridColumn gv_erpid; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridView gridView1; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_factory; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_billNo; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_documentStatus; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_documentType; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_businessType; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_purchaseDate; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_supplier; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_closeStatus; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_purchaseDept; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_qtyAcceptance; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_purchaser; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_qualityReq; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_settlementParty; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_paymentParty; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_transportMethod; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_remarks; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_cancellationStatus; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_cancellationPerson; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_cancellationDate; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_createBy; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_createDate; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_lastupdateDate; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_lastupdateBy; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_erpCheckBy; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_erpCheckDate; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkDate; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkBy; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkFalg; + private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_changereason; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand8; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand11; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand9; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand10; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand12; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand13; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15; + private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand16; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs index 8380788..4257eea 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs @@ -40,6 +40,7 @@ e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5); e.Graphics.DrawString(str, f, Brushes.Gray, r); }; + } /// <summary> diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 8a27c39..ba7bffa 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -419,6 +419,12 @@ <Compile Include="TestForm\XtraForm1.Designer.cs"> <DependentUpon>XtraForm1.cs</DependentUpon> </Compile> + <Compile Include="TestForm\XtraForm2.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="TestForm\XtraForm2.Designer.cs"> + <DependentUpon>XtraForm2.cs</DependentUpon> + </Compile> <Compile Include="ToolBox\LogHelper.cs" /> <Compile Include="ToolBox\MsgHelper.cs" /> <Compile Include="ToolBox\UpdateParentEventArgs.cs" /> @@ -500,6 +506,12 @@ </Compile> <Compile Include="UserControl\UcToolBarMenu.Designer.cs"> <DependentUpon>UcToolBarMenu.cs</DependentUpon> + </Compile> + <Compile Include="UserControl\UCUpFile.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="UserControl\UCUpFile.Designer.cs"> + <DependentUpon>UCUpFile.cs</DependentUpon> </Compile> <Compile Include="UserControl\XtraUserControl1.cs"> <SubType>UserControl</SubType> @@ -625,6 +637,9 @@ <EmbeddedResource Include="TestForm\XtraForm1.resx"> <DependentUpon>XtraForm1.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="TestForm\XtraForm2.resx"> + <DependentUpon>XtraForm2.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="UserControl\SelectCgMx.resx"> <DependentUpon>SelectCgMx.cs</DependentUpon> </EmbeddedResource> @@ -664,6 +679,9 @@ <EmbeddedResource Include="UserControl\UcToolBarMenu.resx"> <DependentUpon>UcToolBarMenu.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="UserControl\UCUpFile.resx"> + <DependentUpon>UCUpFile.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="UserControl\XtraUserControl1.resx"> <DependentUpon>XtraUserControl1.cs</DependentUpon> </EmbeddedResource> diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs index 23bb13f..e411b96 100644 --- a/DevApp/Gs.DevApp/Program.cs +++ b/DevApp/Gs.DevApp/Program.cs @@ -36,7 +36,7 @@ /// </summary> private static void _startLogin() { - //Application.Run(new TestForm.FluentDesignForm1()); + //Application.Run(new TestForm.XtraForm2()); //return; var fmLogin = new FrmLogin(); diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs index ce7be0b..677d751 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs @@ -75,11 +75,11 @@ private void getPageList(int curPage, int pageSize) { var _sbSqlWhere = new StringBuilder(); - _sbSqlWhere.Append(" "); + _sbSqlWhere.Append(strWhere); foreach (var itm in _filterList) _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'"); - var pgq = new PageQueryModel(curPage, pageSize, "BILL_NO", "asc", + var pgq = new PageQueryModel(curPage, pageSize, "B.BILL_NO", "asc", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); try diff --git a/DevApp/Gs.DevApp/UserControl/UCUpFile.Designer.cs b/DevApp/Gs.DevApp/UserControl/UCUpFile.Designer.cs new file mode 100644 index 0000000..69688dd --- /dev/null +++ b/DevApp/Gs.DevApp/UserControl/UCUpFile.Designer.cs @@ -0,0 +1,110 @@ +锘縩amespace Gs.DevApp.UserControl +{ + partial class UCUpFile + { + /// <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 Component 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.panelControl1 = new DevExpress.XtraEditors.PanelControl(); + this.btnUp = new DevExpress.XtraEditors.SimpleButton(); + this.btnUpSelect = new System.Windows.Forms.Button(); + this.txtUpUrl = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit(); + this.panelControl1.SuspendLayout(); + this.SuspendLayout(); + // + // panelControl1 + // + this.panelControl1.Controls.Add(this.btnUp); + this.panelControl1.Controls.Add(this.btnUpSelect); + this.panelControl1.Controls.Add(this.txtUpUrl); + this.panelControl1.Controls.Add(this.label7); + this.panelControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panelControl1.Location = new System.Drawing.Point(0, 0); + this.panelControl1.Name = "panelControl1"; + this.panelControl1.Size = new System.Drawing.Size(618, 59); + this.panelControl1.TabIndex = 2; + // + // btnUp + // + this.btnUp.Location = new System.Drawing.Point(509, 17); + this.btnUp.Name = "btnUp"; + this.btnUp.Size = new System.Drawing.Size(94, 29); + this.btnUp.TabIndex = 270; + this.btnUp.Text = "纭畾涓婁紶"; + // + // btnUpSelect + // + this.btnUpSelect.Location = new System.Drawing.Point(411, 18); + this.btnUpSelect.Margin = new System.Windows.Forms.Padding(4); + this.btnUpSelect.Name = "btnUpSelect"; + this.btnUpSelect.Size = new System.Drawing.Size(79, 26); + this.btnUpSelect.TabIndex = 269; + this.btnUpSelect.Text = "閫夋嫨璺緞"; + this.btnUpSelect.UseVisualStyleBackColor = true; + // + // txtUpUrl + // + this.txtUpUrl.Location = new System.Drawing.Point(96, 18); + this.txtUpUrl.Margin = new System.Windows.Forms.Padding(4); + this.txtUpUrl.Name = "txtUpUrl"; + this.txtUpUrl.Size = new System.Drawing.Size(307, 26); + this.txtUpUrl.TabIndex = 268; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(11, 22); + this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(83, 18); + this.label7.TabIndex = 267; + this.label7.Text = "閫夋嫨鏂囦欢锛�"; + // + // UCUpFile + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.panelControl1); + this.Name = "UCUpFile"; + this.Size = new System.Drawing.Size(618, 59); + ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit(); + this.panelControl1.ResumeLayout(false); + this.panelControl1.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private DevExpress.XtraEditors.PanelControl panelControl1; + private DevExpress.XtraEditors.SimpleButton btnUp; + private System.Windows.Forms.Button btnUpSelect; + private System.Windows.Forms.TextBox txtUpUrl; + private System.Windows.Forms.Label label7; + } +} diff --git a/DevApp/Gs.DevApp/UserControl/UCUpFile.cs b/DevApp/Gs.DevApp/UserControl/UCUpFile.cs new file mode 100644 index 0000000..5ea7d68 --- /dev/null +++ b/DevApp/Gs.DevApp/UserControl/UCUpFile.cs @@ -0,0 +1,111 @@ +锘縰sing DevExpress.Utils.DirectXPaint; +using DevExpress.XtraEditors; +using Gs.DevApp.ToolBox; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Configuration; +using System.Data; +using System.Drawing; +using System.IO; +using System.Linq; +using System.Net.Http; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Gs.DevApp.UserControl +{ + public partial class UCUpFile : DevExpress.XtraEditors.XtraUserControl + { + public UCUpFile() + { + InitializeComponent(); + //涓婁紶闄勪欢 + btnUpSelect.Click += BtnUpSelect_Click; + btnUp.Click += BtnUp_Click; + } + public string parentGuid + { + get; + set; + } + + /// <summary> + /// 鏀瑰彉浜嬩欢 + /// </summary> + public event EventHandler UpChanged; + + #region 鏂囦欢涓婁紶 + + /// <summary> + /// 閫夋嫨涓婁紶鏂囦欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void BtnUpSelect_Click(object sender, EventArgs e) + { + var openFileDialog = new OpenFileDialog(); + // 璁剧疆鍒濆鐩綍 + openFileDialog.InitialDirectory = "c:\\"; + // 璁剧疆鏂囦欢杩囨护閫夐」锛屽锛�"鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*" + openFileDialog.Filter = "鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*"; + // 璁剧疆鏍囬 + openFileDialog.Title = "閫夋嫨鏂囦欢"; + // 鏄剧ず瀵硅瘽妗� + var result = openFileDialog.ShowDialog(); + // 纭鐢ㄦ埛娌℃湁鍙栨秷鎿嶄綔 + if (result == DialogResult.OK) + { + // 鑾峰彇閫変腑鐨勬枃浠惰矾寰� + var filePath = openFileDialog.FileName; + Console.WriteLine($"閫変腑鐨勬枃浠�: {filePath}"); + txtUpUrl.Text = filePath; + } + } + + /// <summary> + /// 纭畾涓婁紶 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private async void BtnUp_Click(object sender, EventArgs e) + { + var WebApiUrl = ConfigurationSettings.AppSettings.Get("WebApiUrl"); + var address = WebApiUrl + "MesFile/UploadFile"; + var filePath = txtUpUrl.Text.Trim(); + if (string.IsNullOrEmpty(filePath)) { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犻渶瑕佷笂浼犵殑鏂囦欢锛�"); + return; + } + var apiUrl = address; // 鏇挎崲涓轰綘鐨凙PI鍦板潃 + await UploadFileAsync(apiUrl, filePath); + if (UpChanged != null) UpChanged(this, e); + } + + private async Task UploadFileAsync(string url, string filePath) + { + UcLoading _loading = new UcLoading(); + string _parentGuid = parentGuid; + using (var httpClient = new HttpClient()) + using (var form = new MultipartFormDataContent()) + { + httpClient.DefaultRequestHeaders.Add("token", + UtilityHelper.GetBasicAuthTicket()); + using (var fs = File.OpenRead(filePath)) + using (var streamContent = new StreamContent(fs)) + { + form.Add(streamContent, "file", _parentGuid + "~" + Path.GetFileName(filePath)); + var response = await httpClient.PostAsync(url, form); + var responseString = + await response.Content.ReadAsStringAsync(); + // MessageBox.Show(responseString); + txtUpUrl.Text = ""; + } + } + _loading.Close(); + } + + #endregion + } +} diff --git a/DevApp/Gs.DevApp/UserControl/UCUpFile.resx b/DevApp/Gs.DevApp/UserControl/UCUpFile.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DevApp/Gs.DevApp/UserControl/UCUpFile.resx @@ -0,0 +1,120 @@ +锘�<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file -- Gitblit v1.9.3