From 9bab986662b5829388c797879114a549446731a5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期日, 08 十二月 2024 18:03:38 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 58
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 729 +++++++++---------
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs | 1
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 28
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 80 +
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 26
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 94 +
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs | 20
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 1025 +++++++++++++-------------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 62 +
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 131 +-
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 4
15 files changed, 1,179 insertions(+), 1,090 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
index 8768e45..14dac7e 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
@@ -32,6 +32,7 @@
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "checkStatus", "");
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index a516b15..f5e70ad 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -93,34 +93,64 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
+ this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridColumn13 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_fsubmit = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_modify1Flag = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_lotNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_lifnr = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_releaseNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_itemId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_itemNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_boardStyle = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridColumn14 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_fbatchQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_ftype = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_fcheckResu = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_fcovertQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_remarks = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_fcheckBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridColumn15 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_fcheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_freceQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_checkQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_lastupdateBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_fngHandle = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_releaseNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_itemId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_itemNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_boardStyle = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_lifnr = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_fbatchQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_ftype = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_fversion = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gv_states = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridColumn15 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_fcheckBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_checkQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_fcheckResu = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_freceQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_iqcDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_lastupdateBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_states = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_fcovertQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand30 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_remarks = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_fngHandle = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -162,36 +192,6 @@
this.lb_modify1Flag = new DevExpress.XtraEditors.LabelControl();
this.lb_lotNo = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
- this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand30 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -574,6 +574,7 @@
//
this.gridColumn3.Caption = "椤圭洰";
this.gridColumn3.FieldName = "fcheckItem";
+ this.gridColumn3.MaxWidth = 192;
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
@@ -585,23 +586,25 @@
//
this.gridColumn2.Caption = "鎶芥缁撴灉";
this.gridColumn2.FieldName = "fcheckResu";
+ this.gridColumn2.MaxWidth = 80;
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
- this.gridColumn2.Width = 158;
+ this.gridColumn2.Width = 80;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn1.FieldName = "fstand";
+ this.gridColumn1.MaxWidth = 80;
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 2;
- this.gridColumn1.Width = 958;
+ this.gridColumn1.Width = 80;
//
// panMsg
//
@@ -863,6 +866,17 @@
this.gridView1.OptionsView.ShowColumnHeaders = false;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridBand11
+ //
+ this.gridBand11.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand11.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand11.Caption = "鏄惁鎬ユ枡";
+ this.gridBand11.Columns.Add(this.gridColumn13);
+ this.gridBand11.MinWidth = 50;
+ this.gridBand11.Name = "gridBand11";
+ this.gridBand11.VisibleIndex = 0;
+ this.gridBand11.Width = 60;
+ //
// gridColumn13
//
this.gridColumn13.Caption = "鏄惁鎬ユ枡";
@@ -873,6 +887,17 @@
this.gridColumn13.UnboundDataType = typeof(bool);
this.gridColumn13.Visible = true;
this.gridColumn13.Width = 60;
+ //
+ // gridBand12
+ //
+ this.gridBand12.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand12.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand12.Caption = "鎻愪氦鏍囪瘑";
+ this.gridBand12.Columns.Add(this.gv_fsubmit);
+ this.gridBand12.MinWidth = 50;
+ this.gridBand12.Name = "gridBand12";
+ this.gridBand12.VisibleIndex = 1;
+ this.gridBand12.Width = 50;
//
// gv_fsubmit
//
@@ -888,6 +913,17 @@
this.gv_fsubmit.Visible = true;
this.gv_fsubmit.Width = 30;
//
+ // gridBand13
+ //
+ this.gridBand13.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand13.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand13.Caption = "瀹℃牳鏍囪瘑";
+ this.gridBand13.Columns.Add(this.gv_modify1Flag);
+ this.gridBand13.MinWidth = 50;
+ this.gridBand13.Name = "gridBand13";
+ this.gridBand13.VisibleIndex = 2;
+ this.gridBand13.Width = 50;
+ //
// gv_modify1Flag
//
this.gv_modify1Flag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -902,6 +938,15 @@
this.gv_modify1Flag.Visible = true;
this.gv_modify1Flag.Width = 30;
//
+ // gridBand14
+ //
+ this.gridBand14.Caption = "閫佹鎵规";
+ this.gridBand14.Columns.Add(this.gv_lotNo);
+ this.gridBand14.MinWidth = 120;
+ this.gridBand14.Name = "gridBand14";
+ this.gridBand14.VisibleIndex = 3;
+ this.gridBand14.Width = 120;
+ //
// gv_lotNo
//
this.gv_lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -915,18 +960,36 @@
this.gv_lotNo.Visible = true;
this.gv_lotNo.Width = 30;
//
- // gv_lifnr
+ // gridBand1
//
- this.gv_lifnr.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lifnr.AppearanceCell.Options.UseFont = true;
- this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
- this.gv_lifnr.FieldName = "suppName";
- this.gv_lifnr.MinWidth = 30;
- this.gv_lifnr.Name = "gv_lifnr";
- this.gv_lifnr.OptionsColumn.AllowEdit = false;
- this.gv_lifnr.Tag = "query_a.lifnr";
- this.gv_lifnr.Visible = true;
- this.gv_lifnr.Width = 42;
+ this.gridBand1.Caption = "妫�楠屾棩鏈�";
+ this.gridBand1.Columns.Add(this.gv_fcheckDate);
+ this.gridBand1.MinWidth = 180;
+ this.gridBand1.Name = "gridBand1";
+ this.gridBand1.VisibleIndex = 4;
+ this.gridBand1.Width = 180;
+ //
+ // gv_fcheckDate
+ //
+ this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
+ this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
+ this.gv_fcheckDate.FieldName = "fcheckDate";
+ this.gv_fcheckDate.MinWidth = 30;
+ this.gv_fcheckDate.Name = "gv_fcheckDate";
+ this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
+ this.gv_fcheckDate.Tag = "query_a.fcheck_date";
+ this.gv_fcheckDate.Visible = true;
+ this.gv_fcheckDate.Width = 30;
+ //
+ // gridBand16
+ //
+ this.gridBand16.Caption = "妫�楠屽崟鍙�";
+ this.gridBand16.Columns.Add(this.gv_releaseNo);
+ this.gridBand16.MinWidth = 100;
+ this.gridBand16.Name = "gridBand16";
+ this.gridBand16.VisibleIndex = 5;
+ this.gridBand16.Width = 100;
//
// gv_releaseNo
//
@@ -941,6 +1004,29 @@
this.gv_releaseNo.Visible = true;
this.gv_releaseNo.Width = 31;
//
+ // gridBand18
+ //
+ this.gridBand18.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand18.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand18.Caption = "鐗╂枡淇℃伅";
+ this.gridBand18.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand2,
+ this.gridBand5,
+ this.gridBand3});
+ this.gridBand18.MinWidth = 300;
+ this.gridBand18.Name = "gridBand18";
+ this.gridBand18.VisibleIndex = 6;
+ this.gridBand18.Width = 300;
+ //
+ // gridBand2
+ //
+ this.gridBand2.Caption = "鐗╂枡ID";
+ this.gridBand2.Columns.Add(this.gv_itemId);
+ this.gridBand2.MinWidth = 60;
+ this.gridBand2.Name = "gridBand2";
+ this.gridBand2.VisibleIndex = 0;
+ this.gridBand2.Width = 60;
+ //
// gv_itemId
//
this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -953,6 +1039,15 @@
this.gv_itemId.Tag = "query_a.item_id";
this.gv_itemId.Visible = true;
this.gv_itemId.Width = 30;
+ //
+ // gridBand5
+ //
+ this.gridBand5.Caption = "鐗╂枡缂栫爜";
+ this.gridBand5.Columns.Add(this.gv_itemNo);
+ this.gridBand5.MinWidth = 100;
+ this.gridBand5.Name = "gridBand5";
+ this.gridBand5.VisibleIndex = 1;
+ this.gridBand5.Width = 100;
//
// gv_itemNo
//
@@ -967,6 +1062,15 @@
this.gv_itemNo.Visible = true;
this.gv_itemNo.Width = 30;
//
+ // gridBand3
+ //
+ this.gridBand3.Caption = "鐗╂枡鍚嶇О";
+ this.gridBand3.Columns.Add(this.gv_boardStyle);
+ this.gridBand3.MinWidth = 120;
+ this.gridBand3.Name = "gridBand3";
+ this.gridBand3.VisibleIndex = 2;
+ this.gridBand3.Width = 120;
+ //
// gv_boardStyle
//
this.gv_boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -980,14 +1084,36 @@
this.gv_boardStyle.Visible = true;
this.gv_boardStyle.Width = 30;
//
- // gridColumn14
+ // gridBand19
//
- this.gridColumn14.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn14.FieldName = "itemModel";
- this.gridColumn14.MinWidth = 30;
- this.gridColumn14.Name = "gridColumn14";
- this.gridColumn14.OptionsColumn.ReadOnly = true;
- this.gridColumn14.Width = 200;
+ this.gridBand19.Caption = "渚涘簲鍟嗗悕绉�";
+ this.gridBand19.Columns.Add(this.gv_lifnr);
+ this.gridBand19.MinWidth = 200;
+ this.gridBand19.Name = "gridBand19";
+ this.gridBand19.VisibleIndex = 7;
+ this.gridBand19.Width = 200;
+ //
+ // gv_lifnr
+ //
+ this.gv_lifnr.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lifnr.AppearanceCell.Options.UseFont = true;
+ this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
+ this.gv_lifnr.FieldName = "suppName";
+ this.gv_lifnr.MinWidth = 30;
+ this.gv_lifnr.Name = "gv_lifnr";
+ this.gv_lifnr.OptionsColumn.AllowEdit = false;
+ this.gv_lifnr.Tag = "query_a.lifnr";
+ this.gv_lifnr.Visible = true;
+ this.gv_lifnr.Width = 42;
+ //
+ // gridBand20
+ //
+ this.gridBand20.Caption = "閲囪喘鏁伴噺";
+ this.gridBand20.Columns.Add(this.gv_fbatchQty);
+ this.gridBand20.MinWidth = 80;
+ this.gridBand20.Name = "gridBand20";
+ this.gridBand20.VisibleIndex = 8;
+ this.gridBand20.Width = 80;
//
// gv_fbatchQty
//
@@ -1002,6 +1128,17 @@
this.gv_fbatchQty.Visible = true;
this.gv_fbatchQty.Width = 30;
//
+ // gridBand21
+ //
+ this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand21.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand21.Caption = "绫诲瀷(0鏉ユ枡,1鍦ㄥ簱)";
+ this.gridBand21.Columns.Add(this.gv_ftype);
+ this.gridBand21.MinWidth = 60;
+ this.gridBand21.Name = "gridBand21";
+ this.gridBand21.VisibleIndex = 9;
+ this.gridBand21.Width = 60;
+ //
// gv_ftype
//
this.gv_ftype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1015,6 +1152,116 @@
this.gv_ftype.Visible = true;
this.gv_ftype.Width = 30;
//
+ // gridBand4
+ //
+ this.gridBand4.Caption = "鐗堟湰";
+ this.gridBand4.Columns.Add(this.gv_fversion);
+ this.gridBand4.MinWidth = 60;
+ this.gridBand4.Name = "gridBand4";
+ this.gridBand4.VisibleIndex = 10;
+ this.gridBand4.Width = 60;
+ //
+ // gv_fversion
+ //
+ this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fversion.AppearanceCell.Options.UseFont = true;
+ this.gv_fversion.Caption = "鐗堟湰";
+ this.gv_fversion.FieldName = "fversion";
+ this.gv_fversion.MinWidth = 30;
+ this.gv_fversion.Name = "gv_fversion";
+ this.gv_fversion.OptionsColumn.AllowEdit = false;
+ this.gv_fversion.Tag = "query_a.fversion";
+ this.gv_fversion.Visible = true;
+ this.gv_fversion.Width = 30;
+ //
+ // gridBand8
+ //
+ this.gridBand8.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand8.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand8.Caption = "妫�楠屼俊鎭�";
+ this.gridBand8.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand7,
+ this.gridBand10,
+ this.gridBand6,
+ this.gridBand9,
+ this.gridBand15});
+ this.gridBand8.MinWidth = 300;
+ this.gridBand8.Name = "gridBand8";
+ this.gridBand8.VisibleIndex = 11;
+ this.gridBand8.Width = 330;
+ //
+ // gridBand7
+ //
+ this.gridBand7.Caption = "妫�楠屾棩鏈�";
+ this.gridBand7.Columns.Add(this.gridColumn15);
+ this.gridBand7.MinWidth = 120;
+ this.gridBand7.Name = "gridBand7";
+ this.gridBand7.VisibleIndex = 0;
+ this.gridBand7.Width = 120;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "鎻愪氦妫�楠屾棩鏈�";
+ this.gridColumn15.FieldName = "date01";
+ this.gridColumn15.MinWidth = 30;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.OptionsColumn.ReadOnly = true;
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.Width = 32;
+ //
+ // gridBand10
+ //
+ this.gridBand10.Caption = "妫�楠屼汉鍛�";
+ this.gridBand10.Columns.Add(this.gv_fcheckBy);
+ this.gridBand10.MinWidth = 60;
+ this.gridBand10.Name = "gridBand10";
+ this.gridBand10.VisibleIndex = 1;
+ this.gridBand10.Width = 60;
+ //
+ // gv_fcheckBy
+ //
+ this.gv_fcheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
+ this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
+ this.gv_fcheckBy.FieldName = "fcheckBy";
+ this.gv_fcheckBy.MinWidth = 30;
+ this.gv_fcheckBy.Name = "gv_fcheckBy";
+ this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
+ this.gv_fcheckBy.Tag = "query_a.fcheck_by";
+ this.gv_fcheckBy.Visible = true;
+ this.gv_fcheckBy.Width = 30;
+ //
+ // gridBand6
+ //
+ this.gridBand6.Caption = "鎶芥鏁伴噺";
+ this.gridBand6.Columns.Add(this.gv_checkQty);
+ this.gridBand6.MinWidth = 50;
+ this.gridBand6.Name = "gridBand6";
+ this.gridBand6.VisibleIndex = 2;
+ this.gridBand6.Width = 50;
+ //
+ // gv_checkQty
+ //
+ this.gv_checkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_checkQty.AppearanceCell.Options.UseFont = true;
+ this.gv_checkQty.Caption = "鎶芥鏁伴噺";
+ this.gv_checkQty.FieldName = "checkQty";
+ this.gv_checkQty.MinWidth = 30;
+ this.gv_checkQty.Name = "gv_checkQty";
+ this.gv_checkQty.OptionsColumn.AllowEdit = false;
+ this.gv_checkQty.Tag = "query_a.check_qty";
+ this.gv_checkQty.Visible = true;
+ this.gv_checkQty.Width = 30;
+ //
+ // gridBand9
+ //
+ this.gridBand9.Caption = "妫�楠岀粨鏋�";
+ this.gridBand9.Columns.Add(this.gv_fcheckResu);
+ this.gridBand9.MinWidth = 50;
+ this.gridBand9.Name = "gridBand9";
+ this.gridBand9.VisibleIndex = 3;
+ this.gridBand9.Width = 50;
+ //
// gv_fcheckResu
//
this.gv_fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1027,6 +1274,135 @@
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
this.gv_fcheckResu.Width = 30;
+ //
+ // gridBand15
+ //
+ this.gridBand15.Caption = "鍒ゅ畾缁撴灉";
+ this.gridBand15.Columns.Add(this.gv_freceQty);
+ this.gridBand15.MinWidth = 50;
+ this.gridBand15.Name = "gridBand15";
+ this.gridBand15.VisibleIndex = 4;
+ this.gridBand15.Width = 50;
+ //
+ // gv_freceQty
+ //
+ this.gv_freceQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_freceQty.AppearanceCell.Options.UseFont = true;
+ this.gv_freceQty.Caption = "鍒ゅ畾缁撴灉";
+ this.gv_freceQty.FieldName = "freceQty";
+ this.gv_freceQty.MinWidth = 30;
+ this.gv_freceQty.Name = "gv_freceQty";
+ this.gv_freceQty.OptionsColumn.AllowEdit = false;
+ this.gv_freceQty.Tag = "query_a.frece_qty";
+ this.gv_freceQty.Visible = true;
+ this.gv_freceQty.Width = 30;
+ //
+ // gridBand23
+ //
+ this.gridBand23.Caption = "IQC鎻愪氦鏃堕棿";
+ this.gridBand23.Columns.Add(this.gv_iqcDate);
+ this.gridBand23.MinWidth = 120;
+ this.gridBand23.Name = "gridBand23";
+ this.gridBand23.VisibleIndex = 12;
+ this.gridBand23.Width = 120;
+ //
+ // gv_iqcDate
+ //
+ this.gv_iqcDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_iqcDate.AppearanceCell.Options.UseFont = true;
+ this.gv_iqcDate.Caption = "IQC鎻愪氦鏃堕棿";
+ this.gv_iqcDate.FieldName = "iqcDate";
+ this.gv_iqcDate.MinWidth = 30;
+ this.gv_iqcDate.Name = "gv_iqcDate";
+ this.gv_iqcDate.OptionsColumn.AllowEdit = false;
+ this.gv_iqcDate.Tag = "query_a.iqc_date";
+ this.gv_iqcDate.Visible = true;
+ this.gv_iqcDate.Width = 74;
+ //
+ // gridBand26
+ //
+ this.gridBand26.Caption = "鏇存柊浜�";
+ this.gridBand26.Columns.Add(this.gv_lastupdateBy);
+ this.gridBand26.MinWidth = 60;
+ this.gridBand26.Name = "gridBand26";
+ this.gridBand26.VisibleIndex = 13;
+ this.gridBand26.Width = 60;
+ //
+ // 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 = 30;
+ 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.Width = 30;
+ //
+ // gridBand27
+ //
+ this.gridBand27.Caption = "鏇存柊鏃ユ湡";
+ this.gridBand27.Columns.Add(this.gv_lastupdateDate);
+ this.gridBand27.MinWidth = 120;
+ this.gridBand27.Name = "gridBand27";
+ this.gridBand27.VisibleIndex = 14;
+ this.gridBand27.Width = 120;
+ //
+ // 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 = 30;
+ 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.Width = 30;
+ //
+ // gridBand28
+ //
+ this.gridBand28.Caption = "鐘舵��";
+ this.gridBand28.Columns.Add(this.gv_states);
+ this.gridBand28.Columns.Add(this.gridColumn14);
+ this.gridBand28.MinWidth = 60;
+ this.gridBand28.Name = "gridBand28";
+ this.gridBand28.VisibleIndex = 15;
+ this.gridBand28.Width = 60;
+ //
+ // gv_states
+ //
+ this.gv_states.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_states.AppearanceCell.Options.UseFont = true;
+ this.gv_states.Caption = "鐘舵��";
+ this.gv_states.FieldName = "states";
+ this.gv_states.MinWidth = 30;
+ this.gv_states.Name = "gv_states";
+ this.gv_states.OptionsColumn.AllowEdit = false;
+ this.gv_states.Tag = "query_a.states";
+ this.gv_states.Visible = true;
+ this.gv_states.Width = 30;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn14.FieldName = "itemModel";
+ this.gridColumn14.MinWidth = 30;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.OptionsColumn.ReadOnly = true;
+ this.gridColumn14.Width = 200;
+ //
+ // gridBand29
+ //
+ this.gridBand29.Caption = "杞崲鏁伴噺";
+ this.gridBand29.Columns.Add(this.gv_fcovertQty);
+ this.gridBand29.MinWidth = 60;
+ this.gridBand29.Name = "gridBand29";
+ this.gridBand29.VisibleIndex = 16;
+ this.gridBand29.Width = 60;
//
// gv_fcovertQty
//
@@ -1042,93 +1418,27 @@
this.gv_fcovertQty.Visible = true;
this.gv_fcovertQty.Width = 30;
//
- // gv_remarks
+ // gridBand30
//
- 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 = 30;
- 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.Width = 30;
+ this.gridBand30.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand30.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand30.Caption = "寤虹珛淇℃伅";
+ this.gridBand30.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand22,
+ this.gridBand17});
+ this.gridBand30.MinWidth = 200;
+ this.gridBand30.Name = "gridBand30";
+ this.gridBand30.VisibleIndex = 17;
+ this.gridBand30.Width = 200;
//
- // gv_createBy
+ // gridBand22
//
- 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 = 30;
- 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.Width = 42;
- //
- // gv_fcheckBy
- //
- this.gv_fcheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
- this.gv_fcheckBy.FieldName = "fcheckBy";
- this.gv_fcheckBy.MinWidth = 30;
- this.gv_fcheckBy.Name = "gv_fcheckBy";
- this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
- this.gv_fcheckBy.Tag = "query_a.fcheck_by";
- this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.Width = 30;
- //
- // gridColumn15
- //
- this.gridColumn15.Caption = "鎻愪氦妫�楠屾棩鏈�";
- this.gridColumn15.FieldName = "date01";
- this.gridColumn15.MinWidth = 30;
- this.gridColumn15.Name = "gridColumn15";
- this.gridColumn15.OptionsColumn.ReadOnly = true;
- this.gridColumn15.Visible = true;
- this.gridColumn15.Width = 32;
- //
- // gv_fcheckDate
- //
- this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
- this.gv_fcheckDate.FieldName = "fcheckDate";
- this.gv_fcheckDate.MinWidth = 30;
- this.gv_fcheckDate.Name = "gv_fcheckDate";
- this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
- this.gv_fcheckDate.Tag = "query_a.fcheck_date";
- this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.Width = 30;
- //
- // gv_freceQty
- //
- this.gv_freceQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_freceQty.AppearanceCell.Options.UseFont = true;
- this.gv_freceQty.Caption = "鍒ゅ畾缁撴灉";
- this.gv_freceQty.FieldName = "freceQty";
- this.gv_freceQty.MinWidth = 30;
- this.gv_freceQty.Name = "gv_freceQty";
- this.gv_freceQty.OptionsColumn.AllowEdit = false;
- this.gv_freceQty.Tag = "query_a.frece_qty";
- this.gv_freceQty.Visible = true;
- this.gv_freceQty.Width = 30;
- //
- // gv_checkQty
- //
- this.gv_checkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_checkQty.AppearanceCell.Options.UseFont = true;
- this.gv_checkQty.Caption = "鎶芥鏁伴噺";
- this.gv_checkQty.FieldName = "checkQty";
- this.gv_checkQty.MinWidth = 30;
- this.gv_checkQty.Name = "gv_checkQty";
- this.gv_checkQty.OptionsColumn.AllowEdit = false;
- this.gv_checkQty.Tag = "query_a.check_qty";
- this.gv_checkQty.Visible = true;
- this.gv_checkQty.Width = 30;
+ this.gridBand22.Caption = "鏃ユ湡";
+ this.gridBand22.Columns.Add(this.gv_createDate);
+ this.gridBand22.MinWidth = 120;
+ this.gridBand22.Name = "gridBand22";
+ this.gridBand22.VisibleIndex = 0;
+ this.gridBand22.Width = 120;
//
// gv_createDate
//
@@ -1143,31 +1453,58 @@
this.gv_createDate.Visible = true;
this.gv_createDate.Width = 76;
//
- // gv_lastupdateBy
+ // gridBand17
//
- 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 = 30;
- 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.Width = 30;
+ this.gridBand17.Caption = "寤虹珛鑰�";
+ this.gridBand17.Columns.Add(this.gv_createBy);
+ this.gridBand17.MinWidth = 60;
+ this.gridBand17.Name = "gridBand17";
+ this.gridBand17.VisibleIndex = 1;
+ this.gridBand17.Width = 60;
//
- // gv_lastupdateDate
+ // gv_createBy
//
- 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 = 30;
- 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.Width = 30;
+ 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 = 30;
+ 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.Width = 42;
+ //
+ // gridBand24
+ //
+ this.gridBand24.Caption = "涓嶈壇鎻忚堪";
+ this.gridBand24.Columns.Add(this.gv_remarks);
+ this.gridBand24.MinWidth = 100;
+ this.gridBand24.Name = "gridBand24";
+ this.gridBand24.VisibleIndex = 18;
+ this.gridBand24.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 = 30;
+ 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.Width = 30;
+ //
+ // gridBand25
+ //
+ this.gridBand25.Caption = "涓嶈壇澶勭悊鏂规硶";
+ this.gridBand25.Columns.Add(this.gv_fngHandle);
+ this.gridBand25.MinWidth = 100;
+ this.gridBand25.Name = "gridBand25";
+ this.gridBand25.VisibleIndex = 19;
+ this.gridBand25.Width = 100;
//
// gv_fngHandle
//
@@ -1181,45 +1518,6 @@
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
this.gv_fngHandle.Width = 30;
- //
- // gv_fversion
- //
- this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fversion.AppearanceCell.Options.UseFont = true;
- this.gv_fversion.Caption = "鐗堟湰";
- this.gv_fversion.FieldName = "fversion";
- this.gv_fversion.MinWidth = 30;
- this.gv_fversion.Name = "gv_fversion";
- this.gv_fversion.OptionsColumn.AllowEdit = false;
- this.gv_fversion.Tag = "query_a.fversion";
- this.gv_fversion.Visible = true;
- this.gv_fversion.Width = 30;
- //
- // gv_states
- //
- this.gv_states.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_states.AppearanceCell.Options.UseFont = true;
- this.gv_states.Caption = "鐘舵��";
- this.gv_states.FieldName = "states";
- this.gv_states.MinWidth = 30;
- this.gv_states.Name = "gv_states";
- this.gv_states.OptionsColumn.AllowEdit = false;
- this.gv_states.Tag = "query_a.states";
- this.gv_states.Visible = true;
- this.gv_states.Width = 30;
- //
- // gv_iqcDate
- //
- this.gv_iqcDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_iqcDate.AppearanceCell.Options.UseFont = true;
- this.gv_iqcDate.Caption = "IQC鎻愪氦鏃堕棿";
- this.gv_iqcDate.FieldName = "iqcDate";
- this.gv_iqcDate.MinWidth = 30;
- this.gv_iqcDate.Name = "gv_iqcDate";
- this.gv_iqcDate.OptionsColumn.AllowEdit = false;
- this.gv_iqcDate.Tag = "query_a.iqc_date";
- this.gv_iqcDate.Visible = true;
- this.gv_iqcDate.Width = 74;
//
// xtraTabControl1
//
@@ -1674,301 +1972,6 @@
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
this.txt_lotNo.Size = new System.Drawing.Size(150, 28);
this.txt_lotNo.TabIndex = 262;
- //
- // gridBand11
- //
- this.gridBand11.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand11.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand11.Caption = "鏄惁鎬ユ枡";
- this.gridBand11.Columns.Add(this.gridColumn13);
- this.gridBand11.MinWidth = 50;
- this.gridBand11.Name = "gridBand11";
- this.gridBand11.VisibleIndex = 0;
- this.gridBand11.Width = 60;
- //
- // gridBand12
- //
- this.gridBand12.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand12.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand12.Caption = "鎻愪氦鏍囪瘑";
- this.gridBand12.Columns.Add(this.gv_fsubmit);
- this.gridBand12.MinWidth = 50;
- this.gridBand12.Name = "gridBand12";
- this.gridBand12.VisibleIndex = 1;
- this.gridBand12.Width = 50;
- //
- // gridBand13
- //
- this.gridBand13.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand13.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand13.Caption = "瀹℃牳鏍囪瘑";
- this.gridBand13.Columns.Add(this.gv_modify1Flag);
- this.gridBand13.MinWidth = 50;
- this.gridBand13.Name = "gridBand13";
- this.gridBand13.VisibleIndex = 2;
- this.gridBand13.Width = 50;
- //
- // gridBand14
- //
- this.gridBand14.Caption = "閫佹鎵规";
- this.gridBand14.Columns.Add(this.gv_lotNo);
- this.gridBand14.MinWidth = 120;
- this.gridBand14.Name = "gridBand14";
- this.gridBand14.VisibleIndex = 3;
- this.gridBand14.Width = 120;
- //
- // gridBand1
- //
- this.gridBand1.Caption = "妫�楠屾棩鏈�";
- this.gridBand1.Columns.Add(this.gv_fcheckDate);
- this.gridBand1.MinWidth = 180;
- this.gridBand1.Name = "gridBand1";
- this.gridBand1.VisibleIndex = 4;
- this.gridBand1.Width = 180;
- //
- // gridBand16
- //
- this.gridBand16.Caption = "妫�楠屽崟鍙�";
- this.gridBand16.Columns.Add(this.gv_releaseNo);
- this.gridBand16.MinWidth = 100;
- this.gridBand16.Name = "gridBand16";
- this.gridBand16.VisibleIndex = 5;
- this.gridBand16.Width = 100;
- //
- // gridBand18
- //
- this.gridBand18.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand18.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand18.Caption = "鐗╂枡淇℃伅";
- this.gridBand18.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand2,
- this.gridBand5,
- this.gridBand3});
- this.gridBand18.MinWidth = 300;
- this.gridBand18.Name = "gridBand18";
- this.gridBand18.VisibleIndex = 6;
- this.gridBand18.Width = 300;
- //
- // gridBand2
- //
- this.gridBand2.Caption = "鐗╂枡ID";
- this.gridBand2.Columns.Add(this.gv_itemId);
- this.gridBand2.MinWidth = 60;
- this.gridBand2.Name = "gridBand2";
- this.gridBand2.VisibleIndex = 0;
- this.gridBand2.Width = 60;
- //
- // gridBand5
- //
- this.gridBand5.Caption = "鐗╂枡缂栫爜";
- this.gridBand5.Columns.Add(this.gv_itemNo);
- this.gridBand5.MinWidth = 100;
- this.gridBand5.Name = "gridBand5";
- this.gridBand5.VisibleIndex = 1;
- this.gridBand5.Width = 100;
- //
- // gridBand3
- //
- this.gridBand3.Caption = "鐗╂枡鍚嶇О";
- this.gridBand3.Columns.Add(this.gv_boardStyle);
- this.gridBand3.MinWidth = 120;
- this.gridBand3.Name = "gridBand3";
- this.gridBand3.VisibleIndex = 2;
- this.gridBand3.Width = 120;
- //
- // gridBand19
- //
- this.gridBand19.Caption = "渚涘簲鍟嗗悕绉�";
- this.gridBand19.Columns.Add(this.gv_lifnr);
- this.gridBand19.MinWidth = 200;
- this.gridBand19.Name = "gridBand19";
- this.gridBand19.VisibleIndex = 7;
- this.gridBand19.Width = 200;
- //
- // gridBand20
- //
- this.gridBand20.Caption = "閲囪喘鏁伴噺";
- this.gridBand20.Columns.Add(this.gv_fbatchQty);
- this.gridBand20.MinWidth = 80;
- this.gridBand20.Name = "gridBand20";
- this.gridBand20.VisibleIndex = 8;
- this.gridBand20.Width = 80;
- //
- // gridBand21
- //
- this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand21.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand21.Caption = "绫诲瀷(0鏉ユ枡,1鍦ㄥ簱)";
- this.gridBand21.Columns.Add(this.gv_ftype);
- this.gridBand21.MinWidth = 60;
- this.gridBand21.Name = "gridBand21";
- this.gridBand21.VisibleIndex = 9;
- this.gridBand21.Width = 60;
- //
- // gridBand4
- //
- this.gridBand4.Caption = "鐗堟湰";
- this.gridBand4.Columns.Add(this.gv_fversion);
- this.gridBand4.MinWidth = 60;
- this.gridBand4.Name = "gridBand4";
- this.gridBand4.VisibleIndex = 10;
- this.gridBand4.Width = 60;
- //
- // gridBand8
- //
- this.gridBand8.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand8.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand8.Caption = "妫�楠屼俊鎭�";
- this.gridBand8.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand7,
- this.gridBand10,
- this.gridBand6,
- this.gridBand9,
- this.gridBand15});
- this.gridBand8.MinWidth = 300;
- this.gridBand8.Name = "gridBand8";
- this.gridBand8.VisibleIndex = 11;
- this.gridBand8.Width = 330;
- //
- // gridBand7
- //
- this.gridBand7.Caption = "妫�楠屾棩鏈�";
- this.gridBand7.Columns.Add(this.gridColumn15);
- this.gridBand7.MinWidth = 120;
- this.gridBand7.Name = "gridBand7";
- this.gridBand7.VisibleIndex = 0;
- this.gridBand7.Width = 120;
- //
- // gridBand10
- //
- this.gridBand10.Caption = "妫�楠屼汉鍛�";
- this.gridBand10.Columns.Add(this.gv_fcheckBy);
- this.gridBand10.MinWidth = 60;
- this.gridBand10.Name = "gridBand10";
- this.gridBand10.VisibleIndex = 1;
- this.gridBand10.Width = 60;
- //
- // gridBand6
- //
- this.gridBand6.Caption = "鎶芥鏁伴噺";
- this.gridBand6.Columns.Add(this.gv_checkQty);
- this.gridBand6.MinWidth = 50;
- this.gridBand6.Name = "gridBand6";
- this.gridBand6.VisibleIndex = 2;
- this.gridBand6.Width = 50;
- //
- // gridBand9
- //
- this.gridBand9.Caption = "妫�楠岀粨鏋�";
- this.gridBand9.Columns.Add(this.gv_fcheckResu);
- this.gridBand9.MinWidth = 50;
- this.gridBand9.Name = "gridBand9";
- this.gridBand9.VisibleIndex = 3;
- this.gridBand9.Width = 50;
- //
- // gridBand15
- //
- this.gridBand15.Caption = "鍒ゅ畾缁撴灉";
- this.gridBand15.Columns.Add(this.gv_freceQty);
- this.gridBand15.MinWidth = 50;
- this.gridBand15.Name = "gridBand15";
- this.gridBand15.VisibleIndex = 4;
- this.gridBand15.Width = 50;
- //
- // gridBand23
- //
- this.gridBand23.Caption = "IQC鎻愪氦鏃堕棿";
- this.gridBand23.Columns.Add(this.gv_iqcDate);
- this.gridBand23.MinWidth = 120;
- this.gridBand23.Name = "gridBand23";
- this.gridBand23.VisibleIndex = 12;
- this.gridBand23.Width = 120;
- //
- // gridBand26
- //
- this.gridBand26.Caption = "鏇存柊浜�";
- this.gridBand26.Columns.Add(this.gv_lastupdateBy);
- this.gridBand26.MinWidth = 60;
- this.gridBand26.Name = "gridBand26";
- this.gridBand26.VisibleIndex = 13;
- this.gridBand26.Width = 60;
- //
- // gridBand27
- //
- this.gridBand27.Caption = "鏇存柊鏃ユ湡";
- this.gridBand27.Columns.Add(this.gv_lastupdateDate);
- this.gridBand27.MinWidth = 120;
- this.gridBand27.Name = "gridBand27";
- this.gridBand27.VisibleIndex = 14;
- this.gridBand27.Width = 120;
- //
- // gridBand28
- //
- this.gridBand28.Caption = "鐘舵��";
- this.gridBand28.Columns.Add(this.gv_states);
- this.gridBand28.Columns.Add(this.gridColumn14);
- this.gridBand28.MinWidth = 60;
- this.gridBand28.Name = "gridBand28";
- this.gridBand28.VisibleIndex = 15;
- this.gridBand28.Width = 60;
- //
- // gridBand29
- //
- this.gridBand29.Caption = "杞崲鏁伴噺";
- this.gridBand29.Columns.Add(this.gv_fcovertQty);
- this.gridBand29.MinWidth = 60;
- this.gridBand29.Name = "gridBand29";
- this.gridBand29.VisibleIndex = 16;
- this.gridBand29.Width = 60;
- //
- // gridBand30
- //
- this.gridBand30.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand30.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand30.Caption = "寤虹珛淇℃伅";
- this.gridBand30.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand22,
- this.gridBand17});
- this.gridBand30.MinWidth = 200;
- this.gridBand30.Name = "gridBand30";
- this.gridBand30.VisibleIndex = 17;
- this.gridBand30.Width = 200;
- //
- // gridBand22
- //
- this.gridBand22.Caption = "鏃ユ湡";
- this.gridBand22.Columns.Add(this.gv_createDate);
- this.gridBand22.MinWidth = 120;
- this.gridBand22.Name = "gridBand22";
- this.gridBand22.VisibleIndex = 0;
- this.gridBand22.Width = 120;
- //
- // gridBand17
- //
- this.gridBand17.Caption = "寤虹珛鑰�";
- this.gridBand17.Columns.Add(this.gv_createBy);
- this.gridBand17.MinWidth = 60;
- this.gridBand17.Name = "gridBand17";
- this.gridBand17.VisibleIndex = 1;
- this.gridBand17.Width = 60;
- //
- // gridBand24
- //
- this.gridBand24.Caption = "涓嶈壇鎻忚堪";
- this.gridBand24.Columns.Add(this.gv_remarks);
- this.gridBand24.MinWidth = 100;
- this.gridBand24.Name = "gridBand24";
- this.gridBand24.VisibleIndex = 18;
- this.gridBand24.Width = 100;
- //
- // gridBand25
- //
- this.gridBand25.Caption = "涓嶈壇澶勭悊鏂规硶";
- this.gridBand25.Columns.Add(this.gv_fngHandle);
- this.gridBand25.MinWidth = 100;
- this.gridBand25.Name = "gridBand25";
- this.gridBand25.VisibleIndex = 19;
- this.gridBand25.Width = 100;
//
// Frm_MesQaItemsDetect01
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 9ff99f4..00d9a13 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -38,28 +38,11 @@
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
gcMx1.MouseClick += GcMx1_MouseClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx3);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- this.gvMx1.IndicatorWidth = 50;
- gvMx1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- {
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- }
- };
- this.gvMx2.IndicatorWidth = 50;
- gvMx2.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- {
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- }
- };
- gvMx2.OptionsFind.ShowSearchNavButtons = false;
- gvMx2.OptionsView.ShowGroupPanel = false;
- gvMx3.OptionsFind.ShowSearchNavButtons = false;
- gvMx3.OptionsView.ShowGroupPanel = false;
txt_itemId.EditChanged += (s, e) =>
{
txt_itemModel.Text = this.txt_itemId.GetModel();
@@ -69,7 +52,6 @@
this.btnLoad.Click += BtnLoad_Click;
ucUpFile1.UpChanged += UcUpFile1_UpChanged;
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
-
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -274,7 +256,7 @@
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_releaseNo, gridView1);
+ lbGuid, txt_releaseNo, gridView1, "lotNo");
toolBarMenu1.guidKey = rowGuid;
if (string.IsNullOrEmpty(rowGuid))
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 6a153a8..ea55d79 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -29,22 +29,22 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01Check));
- 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();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ 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();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -142,6 +142,9 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_qualityAudit = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_modify1Flag = new DevExpress.XtraEditors.CheckEdit();
this.lb_qualityAudit = new DevExpress.XtraEditors.LabelControl();
this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
@@ -158,9 +161,6 @@
this.lb_modify1Flag = new DevExpress.XtraEditors.LabelControl();
this.lb_lotNo = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_modify1Flag = new DevExpress.XtraEditors.CheckEdit();
- this.txt_qualityAudit = new DevExpress.XtraEditors.CheckEdit();
- this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -197,14 +197,14 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
this.SuspendLayout();
//
// tabMxPage1
@@ -511,6 +511,7 @@
//
this.gridColumn3.Caption = "椤圭洰";
this.gridColumn3.FieldName = "fcheckItem";
+ this.gridColumn3.MaxWidth = 200;
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
@@ -522,23 +523,25 @@
//
this.gridColumn2.Caption = "鎶芥缁撴灉";
this.gridColumn2.FieldName = "fcheckResu";
+ this.gridColumn2.MaxWidth = 80;
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 80;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn1.FieldName = "fstand";
+ this.gridColumn1.MaxWidth = 80;
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 2;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 80;
//
// lb_remarks
//
@@ -1233,7 +1236,7 @@
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.Size = new System.Drawing.Size(1340, 460);
this.tabMxPage3.Text = "闄勪欢淇℃伅";
//
// gcMx3
@@ -1246,7 +1249,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemButtonEdit2,
this.repositoryItemButtonEdit3});
- this.gcMx3.Size = new System.Drawing.Size(1340, 391);
+ this.gcMx3.Size = new System.Drawing.Size(1340, 403);
this.gcMx3.TabIndex = 1;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -1342,10 +1345,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions4.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions4.Image")));
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
+ editorButtonImageOptions1.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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娴忚", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1363,10 +1366,10 @@
// repositoryItemButtonEdit3
//
this.repositoryItemButtonEdit3.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.download_16x161;
- editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x161;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
@@ -1384,10 +1387,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.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, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1446,6 +1449,33 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1342, 196);
this.panel1.TabIndex = 1;
+ //
+ // txt_fsubmit
+ //
+ this.txt_fsubmit.Enabled = false;
+ this.txt_fsubmit.Location = new System.Drawing.Point(958, 10);
+ this.txt_fsubmit.Name = "txt_fsubmit";
+ this.txt_fsubmit.Properties.Caption = "";
+ this.txt_fsubmit.Size = new System.Drawing.Size(94, 24);
+ this.txt_fsubmit.TabIndex = 800;
+ //
+ // txt_qualityAudit
+ //
+ this.txt_qualityAudit.Enabled = false;
+ this.txt_qualityAudit.Location = new System.Drawing.Point(1057, 49);
+ this.txt_qualityAudit.Name = "txt_qualityAudit";
+ this.txt_qualityAudit.Properties.Caption = "";
+ this.txt_qualityAudit.Size = new System.Drawing.Size(53, 24);
+ this.txt_qualityAudit.TabIndex = 799;
+ //
+ // txt_modify1Flag
+ //
+ this.txt_modify1Flag.Enabled = false;
+ this.txt_modify1Flag.Location = new System.Drawing.Point(958, 50);
+ this.txt_modify1Flag.Name = "txt_modify1Flag";
+ this.txt_modify1Flag.Properties.Caption = "";
+ this.txt_modify1Flag.Size = new System.Drawing.Size(27, 24);
+ this.txt_modify1Flag.TabIndex = 798;
//
// lb_qualityAudit
//
@@ -1610,33 +1640,6 @@
this.txt_lotNo.Size = new System.Drawing.Size(150, 28);
this.txt_lotNo.TabIndex = 262;
//
- // txt_modify1Flag
- //
- this.txt_modify1Flag.Enabled = false;
- this.txt_modify1Flag.Location = new System.Drawing.Point(958, 50);
- this.txt_modify1Flag.Name = "txt_modify1Flag";
- this.txt_modify1Flag.Properties.Caption = "";
- this.txt_modify1Flag.Size = new System.Drawing.Size(27, 24);
- this.txt_modify1Flag.TabIndex = 798;
- //
- // txt_qualityAudit
- //
- this.txt_qualityAudit.Enabled = false;
- this.txt_qualityAudit.Location = new System.Drawing.Point(1057, 49);
- this.txt_qualityAudit.Name = "txt_qualityAudit";
- this.txt_qualityAudit.Properties.Caption = "";
- this.txt_qualityAudit.Size = new System.Drawing.Size(53, 24);
- this.txt_qualityAudit.TabIndex = 799;
- //
- // txt_fsubmit
- //
- this.txt_fsubmit.Enabled = false;
- this.txt_fsubmit.Location = new System.Drawing.Point(958, 10);
- this.txt_fsubmit.Name = "txt_fsubmit";
- this.txt_fsubmit.Properties.Caption = "";
- this.txt_fsubmit.Size = new System.Drawing.Size(94, 24);
- this.txt_fsubmit.TabIndex = 800;
- //
// Frm_MesQaItemsDetect01Check
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1682,14 +1685,14 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index afcddfe..766169f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -9,6 +9,7 @@
using System.Data;
using System.Drawing;
using System.Net;
+using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
@@ -33,27 +34,13 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
gcMx1.MouseClick += GcMx1_MouseClick;
- getPageList(1, UtilityHelper.GetPageSize());
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx3);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- {
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- }
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- Font f = new Font("寰蒋闆呴粦", 16);
- 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);
- };
//鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷�
- gvMx2.OptionsFind.ShowSearchNavButtons = false;
- gvMx2.OptionsView.ShowGroupPanel = false;
- gvMx3.OptionsFind.ShowSearchNavButtons = false;
- gvMx3.OptionsView.ShowGroupPanel = false;
txt_itemId.EditChanged += (s, e) =>
{
txt_itemModel.Text = this.txt_itemId.GetModel();
@@ -61,6 +48,12 @@
};
ucUpFile1.UpChanged += UcUpFile1_UpChanged;
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
+ }
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Task.Delay(100);
+ getPageList(1);
}
private void GcMx1_MouseClick(object sender, MouseEventArgs e)
{
@@ -87,7 +80,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
/// 鏌ヨ浜嬩欢
@@ -96,7 +89,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -108,7 +104,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
{
@@ -373,7 +369,16 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ {
+ _filterList.Clear();
+ if (gridView1.ActiveFilter.Count > 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ }
+ getPageList(1);
+ }
}
/// <summary>
@@ -381,15 +386,11 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage)
{
-
- System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- foreach (FilterEntity itm in _filterList)
- {
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
- }
- PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString());
+
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
@@ -399,13 +400,18 @@
{
DataTable dt = dd.rtnData.list;
gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- int dddd = dd.rtnData.pages;//鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.setTxt();
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
index fd7814d..4e430f1 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
@@ -118,7 +118,7 @@
<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="editorButtonImageOptions4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0
bGUAV2ViO1dvcmxkO0V5ZQdEODoAAAONSURBVDhPVZJtTNNXFIcvoHOyLhMTt2Qsm4oMI5luEE3jZlsR
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
index 0c142f3..0abedb6 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -325,11 +325,7 @@
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_itemNo, gridView1);
- toolBarMenu1.guidKey = rowGuid;
+ _toolCk(0);
}
/// <summary>
@@ -339,11 +335,61 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
+ _toolCk(1);
+ }
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "瀹℃牳";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
+ break;
+ };
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_itemNo, gridView1);
- toolBarMenu1.guidKey = rowGuid;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemName");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+
+ var _obj = new
+ {
+ guid = rowGuid,
+ ckValue = _inFieldValue,
+ parameter = "MES_QA_MJ,CHECK_DATE,STATUS,CHECK_USER"
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 256654e..3214419 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.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.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -64,6 +64,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
@@ -133,7 +134,6 @@
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -355,6 +355,7 @@
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+ this.gvMx1.OptionsFilter.AllowFilterEditor = false;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
this.gvMx1.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
this.gvMx1.OptionsView.ShowGroupPanel = false;
@@ -541,13 +542,23 @@
this.gridColumn7.VisibleIndex = 12;
this.gridColumn7.Width = 94;
//
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "鍙墦鍗版�婚噺";
+ this.gridColumn10.FieldName = "kyPrtQty";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 13;
+ this.gridColumn10.Width = 94;
+ //
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ 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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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;
//
@@ -588,6 +599,7 @@
this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
this.lbMxGuid.TabIndex = 229;
this.lbMxGuid.Text = "lbMxGuid";
+ this.lbMxGuid.Visible = false;
//
// txt_iCount_1
//
@@ -679,7 +691,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(77, 65);
+ this.txtWlgg.Location = new System.Drawing.Point(90, 65);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
@@ -691,13 +703,13 @@
//
this.labelControl9.Location = new System.Drawing.Point(11, 70);
this.labelControl9.Name = "labelControl9";
- this.labelControl9.Size = new System.Drawing.Size(60, 18);
+ this.labelControl9.Size = new System.Drawing.Size(75, 18);
this.labelControl9.TabIndex = 217;
- this.labelControl9.Text = "鐗╂枡瑙勬牸";
+ this.labelControl9.Text = "鐗╂枡瑙勬牸锛�";
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(77, 34);
+ this.txtWlmc.Location = new System.Drawing.Point(90, 34);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
@@ -709,13 +721,13 @@
//
this.labelControl8.Location = new System.Drawing.Point(11, 39);
this.labelControl8.Name = "labelControl8";
- this.labelControl8.Size = new System.Drawing.Size(60, 18);
+ this.labelControl8.Size = new System.Drawing.Size(75, 18);
this.labelControl8.TabIndex = 215;
- this.labelControl8.Text = "鐗╂枡鍚嶇О";
+ this.labelControl8.Text = "鐗╂枡鍚嶇О锛�";
//
// txtWlid
//
- this.txtWlid.Location = new System.Drawing.Point(77, 4);
+ this.txtWlid.Location = new System.Drawing.Point(90, 4);
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtWlid.Properties.Appearance.Options.UseFont = true;
@@ -727,9 +739,9 @@
//
this.labelControl7.Location = new System.Drawing.Point(25, 9);
this.labelControl7.Name = "labelControl7";
- this.labelControl7.Size = new System.Drawing.Size(46, 18);
+ this.labelControl7.Size = new System.Drawing.Size(61, 18);
this.labelControl7.TabIndex = 213;
- this.labelControl7.Text = "鐗╂枡ID";
+ this.labelControl7.Text = "鐗╂枡ID锛�";
//
// gv_urgentFlag
//
@@ -1298,16 +1310,6 @@
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
this.txt_billNo.Size = new System.Drawing.Size(215, 28);
this.txt_billNo.TabIndex = 211;
- //
- // gridColumn10
- //
- this.gridColumn10.Caption = "鍙墦鍗版�婚噺";
- this.gridColumn10.FieldName = "kyPrtQty";
- this.gridColumn10.MinWidth = 25;
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 13;
- this.gridColumn10.Width = 94;
//
// Frm_ArrivalBarcode
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index f21a0e8..01a4d11 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -1,5 +1,6 @@
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
@@ -7,6 +8,7 @@
using System.Data;
using System.Drawing;
using System.Text;
+using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -23,22 +25,13 @@
toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1, UtilityHelper.GetPageSize());
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx2);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- {
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- }
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- Font f = new Font("寰蒋闆呴粦", 16);
- 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);
- };
+ txt_depotsId.getSuppler("");
+ txt_suppId.getSuppler("");
//璁剧疆浠撳簱閫夋嫨
this.txt_depotsId.EditChanged += (s, e) =>
{
@@ -50,6 +43,12 @@
txtSupplierId.Text = this.txt_suppId.GetId();
};
gcMx1.MouseClick += GcMx1_MouseClick;
+ }
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Task.Delay(100);
+ getPageList(1);
}
private void GcMx1_MouseClick(object sender, MouseEventArgs e)
{
@@ -85,7 +84,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
/// 鏌ヨ浜嬩欢
@@ -94,7 +93,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -106,7 +108,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
{
@@ -166,21 +168,29 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ {
+ _filterList.Clear();
+ if (gridView1.ActiveFilter.Count > 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ }
+ getPageList(1);
+ }
}
/// <summary>
///
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage)
{
- var _sbSqlWhere = new StringBuilder();
- foreach (var itm in _filterList)
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
- var pgq = new PageQueryModel(curPage, pageSize, "create_date",
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
@@ -188,16 +198,27 @@
var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- var dddd = dd.rtnData.pages; //鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage; //褰撳墠椤�
-
- pageBar1.setTxt();
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
}
catch (Exception ex)
{
@@ -247,7 +268,6 @@
//{
// list3.Add(a);
//}
-
//DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(list3.ToString());
//if (dt1.Rows.Count > 0)
//{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
index c7320dc..bda3c93 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
@@ -633,11 +633,11 @@
//
this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(270, 91);
+ this.labelControl2.Location = new System.Drawing.Point(254, 91);
this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(69, 21);
+ this.labelControl2.Size = new System.Drawing.Size(85, 21);
this.labelControl2.TabIndex = 255;
- this.labelControl2.Text = "渚涘簲鍟咺D";
+ this.labelControl2.Text = "渚涘簲鍟嗙紪鍙�";
//
// txt_suppId
//
@@ -657,7 +657,7 @@
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(85, 21);
this.labelControl1.TabIndex = 253;
- this.labelControl1.Text = "渚涘簲鍟嗙紪鍙�";
+ this.labelControl1.Text = "閫夋嫨渚涘簲鍟�";
//
// labelControl11
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
index aafef22..91e4a75 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
@@ -24,27 +24,13 @@
toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- {
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- }
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- Font f = new Font("寰蒋闆呴粦", 16);
- 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);
- };
- //璁剧疆渚涘簲鍟嗛�夋嫨
+ txt_suppNo_1.getSuppler("");
this.txt_suppNo_1.EditChanged += (s, e) =>
{
- txt_suppId.Text = this.txt_suppNo_1.GetId();
+ txt_suppId.Text = this.txt_suppNo_1.GetCode();
};
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
index 59f3cc3..85fefd2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
@@ -31,6 +31,7 @@
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "checkStatus", "");
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 3942304..b367970 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -63,6 +63,7 @@
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_erpid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -74,6 +75,7 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
+ this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_paymentParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_transportMethod = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -81,29 +83,57 @@
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.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_factory = 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.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ 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.bandedGridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_qtyAcceptance = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ 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.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_cancellationStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_cancellationPerson = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_cancellationDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_remarks = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_changereason = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_settlementParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_erpCheckBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_erpCheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -113,35 +143,6 @@
this.panel1 = new System.Windows.Forms.Panel();
this.lbGuid = new DevExpress.XtraEditors.LabelControl();
this.txt_supplier = new Gs.DevApp.UserControl.UcLookSupplier();
- this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- 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.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -167,7 +168,7 @@
this.gvMx1demandDocumentLineId.Name = "gvMx1demandDocumentLineId";
this.gvMx1demandDocumentLineId.Tag = "query_a.DEMAND_DOCUMENT_LINE_ID";
this.gvMx1demandDocumentLineId.Visible = true;
- this.gvMx1demandDocumentLineId.VisibleIndex = 33;
+ this.gvMx1demandDocumentLineId.VisibleIndex = 34;
this.gvMx1demandDocumentLineId.Width = 100;
//
// gvMx1demandDocumentId
@@ -180,7 +181,7 @@
this.gvMx1demandDocumentId.Name = "gvMx1demandDocumentId";
this.gvMx1demandDocumentId.Tag = "query_a.DEMAND_DOCUMENT_ID";
this.gvMx1demandDocumentId.Visible = true;
- this.gvMx1demandDocumentId.VisibleIndex = 15;
+ this.gvMx1demandDocumentId.VisibleIndex = 16;
this.gvMx1demandDocumentId.Width = 100;
//
// gvMx1changeFlag
@@ -193,7 +194,7 @@
this.gvMx1changeFlag.Name = "gvMx1changeFlag";
this.gvMx1changeFlag.Tag = "query_a.CHANGE_FLAG";
this.gvMx1changeFlag.Visible = true;
- this.gvMx1changeFlag.VisibleIndex = 32;
+ this.gvMx1changeFlag.VisibleIndex = 33;
this.gvMx1changeFlag.Width = 100;
//
// gvMx1planTrackingId
@@ -206,7 +207,7 @@
this.gvMx1planTrackingId.Name = "gvMx1planTrackingId";
this.gvMx1planTrackingId.Tag = "query_a.PLAN_TRACKING_ID";
this.gvMx1planTrackingId.Visible = true;
- this.gvMx1planTrackingId.VisibleIndex = 31;
+ this.gvMx1planTrackingId.VisibleIndex = 32;
this.gvMx1planTrackingId.Width = 100;
//
// gvMx1sourceDocumentType
@@ -219,7 +220,7 @@
this.gvMx1sourceDocumentType.Name = "gvMx1sourceDocumentType";
this.gvMx1sourceDocumentType.Tag = "query_a.SOURCE_DOCUMENT_TYPE";
this.gvMx1sourceDocumentType.Visible = true;
- this.gvMx1sourceDocumentType.VisibleIndex = 30;
+ this.gvMx1sourceDocumentType.VisibleIndex = 31;
this.gvMx1sourceDocumentType.Width = 100;
//
// gvMx1returnableStoredQty
@@ -232,7 +233,7 @@
this.gvMx1returnableStoredQty.Name = "gvMx1returnableStoredQty";
this.gvMx1returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY";
this.gvMx1returnableStoredQty.Visible = true;
- this.gvMx1returnableStoredQty.VisibleIndex = 29;
+ this.gvMx1returnableStoredQty.VisibleIndex = 30;
this.gvMx1returnableStoredQty.Width = 100;
//
// gvMx1returnableReceivedQty
@@ -245,7 +246,7 @@
this.gvMx1returnableReceivedQty.Name = "gvMx1returnableReceivedQty";
this.gvMx1returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY";
this.gvMx1returnableReceivedQty.Visible = true;
- this.gvMx1returnableReceivedQty.VisibleIndex = 28;
+ this.gvMx1returnableReceivedQty.VisibleIndex = 29;
this.gvMx1returnableReceivedQty.Width = 100;
//
// gvMx1totalReturnedQty
@@ -258,7 +259,7 @@
this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty";
this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY";
this.gvMx1totalReturnedQty.Visible = true;
- this.gvMx1totalReturnedQty.VisibleIndex = 27;
+ this.gvMx1totalReturnedQty.VisibleIndex = 28;
this.gvMx1totalReturnedQty.Width = 100;
//
// gvMx1remainingStoredQty
@@ -271,7 +272,7 @@
this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty";
this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY";
this.gvMx1remainingStoredQty.Visible = true;
- this.gvMx1remainingStoredQty.VisibleIndex = 26;
+ this.gvMx1remainingStoredQty.VisibleIndex = 27;
this.gvMx1remainingStoredQty.Width = 100;
//
// gvMx1totalStoredQty
@@ -284,7 +285,7 @@
this.gvMx1totalStoredQty.Name = "gvMx1totalStoredQty";
this.gvMx1totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY";
this.gvMx1totalStoredQty.Visible = true;
- this.gvMx1totalStoredQty.VisibleIndex = 25;
+ this.gvMx1totalStoredQty.VisibleIndex = 26;
this.gvMx1totalStoredQty.Width = 100;
//
// gvMx1remainingReceivedQty
@@ -297,7 +298,7 @@
this.gvMx1remainingReceivedQty.Name = "gvMx1remainingReceivedQty";
this.gvMx1remainingReceivedQty.Tag = "query_a.REMAINING_RECEIVED_QTY";
this.gvMx1remainingReceivedQty.Visible = true;
- this.gvMx1remainingReceivedQty.VisibleIndex = 13;
+ this.gvMx1remainingReceivedQty.VisibleIndex = 14;
this.gvMx1remainingReceivedQty.Width = 100;
//
// gvMx1totalReceivedQty
@@ -310,7 +311,7 @@
this.gvMx1totalReceivedQty.Name = "gvMx1totalReceivedQty";
this.gvMx1totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY";
this.gvMx1totalReceivedQty.Visible = true;
- this.gvMx1totalReceivedQty.VisibleIndex = 24;
+ this.gvMx1totalReceivedQty.VisibleIndex = 25;
this.gvMx1totalReceivedQty.Width = 100;
//
// gvMx1terminateTime
@@ -323,7 +324,7 @@
this.gvMx1terminateTime.Name = "gvMx1terminateTime";
this.gvMx1terminateTime.Tag = "query_a.TERMINATE_TIME";
this.gvMx1terminateTime.Visible = true;
- this.gvMx1terminateTime.VisibleIndex = 23;
+ this.gvMx1terminateTime.VisibleIndex = 24;
this.gvMx1terminateTime.Width = 100;
//
// gvMx1terminator
@@ -336,7 +337,7 @@
this.gvMx1terminator.Name = "gvMx1terminator";
this.gvMx1terminator.Tag = "query_a.TERMINATOR";
this.gvMx1terminator.Visible = true;
- this.gvMx1terminator.VisibleIndex = 22;
+ this.gvMx1terminator.VisibleIndex = 23;
this.gvMx1terminator.Width = 100;
//
// gvMx1businessTerminate
@@ -349,7 +350,7 @@
this.gvMx1businessTerminate.Name = "gvMx1businessTerminate";
this.gvMx1businessTerminate.Tag = "query_a.BUSINESS_TERMINATE";
this.gvMx1businessTerminate.Visible = true;
- this.gvMx1businessTerminate.VisibleIndex = 5;
+ this.gvMx1businessTerminate.VisibleIndex = 6;
this.gvMx1businessTerminate.Width = 94;
//
// gvMx1freezeTime
@@ -362,7 +363,7 @@
this.gvMx1freezeTime.Name = "gvMx1freezeTime";
this.gvMx1freezeTime.Tag = "query_a.FREEZE_TIME";
this.gvMx1freezeTime.Visible = true;
- this.gvMx1freezeTime.VisibleIndex = 21;
+ this.gvMx1freezeTime.VisibleIndex = 22;
this.gvMx1freezeTime.Width = 100;
//
// gvMx1freezer
@@ -375,7 +376,7 @@
this.gvMx1freezer.Name = "gvMx1freezer";
this.gvMx1freezer.Tag = "query_a.FREEZER";
this.gvMx1freezer.Visible = true;
- this.gvMx1freezer.VisibleIndex = 20;
+ this.gvMx1freezer.VisibleIndex = 21;
this.gvMx1freezer.Width = 100;
//
// gvMx1businessFreeze
@@ -388,7 +389,7 @@
this.gvMx1businessFreeze.Name = "gvMx1businessFreeze";
this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE";
this.gvMx1businessFreeze.Visible = true;
- this.gvMx1businessFreeze.VisibleIndex = 19;
+ this.gvMx1businessFreeze.VisibleIndex = 20;
this.gvMx1businessFreeze.Width = 94;
//
// gvMx1businessClose
@@ -401,7 +402,7 @@
this.gvMx1businessClose.Name = "gvMx1businessClose";
this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE";
this.gvMx1businessClose.Visible = true;
- this.gvMx1businessClose.VisibleIndex = 18;
+ this.gvMx1businessClose.VisibleIndex = 19;
this.gvMx1businessClose.Width = 100;
//
// gvMx1remarks
@@ -414,7 +415,7 @@
this.gvMx1remarks.Name = "gvMx1remarks";
this.gvMx1remarks.Tag = "query_a.REMARKS";
this.gvMx1remarks.Visible = true;
- this.gvMx1remarks.VisibleIndex = 17;
+ this.gvMx1remarks.VisibleIndex = 18;
this.gvMx1remarks.Width = 100;
//
// gvMx1isGift
@@ -427,7 +428,7 @@
this.gvMx1isGift.Name = "gvMx1isGift";
this.gvMx1isGift.Tag = "query_a.IS_GIFT";
this.gvMx1isGift.Visible = true;
- this.gvMx1isGift.VisibleIndex = 16;
+ this.gvMx1isGift.VisibleIndex = 17;
this.gvMx1isGift.Width = 100;
//
// gvMx1latestDeliveryDate
@@ -440,7 +441,7 @@
this.gvMx1latestDeliveryDate.Name = "gvMx1latestDeliveryDate";
this.gvMx1latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE";
this.gvMx1latestDeliveryDate.Visible = true;
- this.gvMx1latestDeliveryDate.VisibleIndex = 10;
+ this.gvMx1latestDeliveryDate.VisibleIndex = 11;
this.gvMx1latestDeliveryDate.Width = 200;
//
// gvMx1earliestDeliveryDate
@@ -453,7 +454,7 @@
this.gvMx1earliestDeliveryDate.Name = "gvMx1earliestDeliveryDate";
this.gvMx1earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE";
this.gvMx1earliestDeliveryDate.Visible = true;
- this.gvMx1earliestDeliveryDate.VisibleIndex = 9;
+ this.gvMx1earliestDeliveryDate.VisibleIndex = 10;
this.gvMx1earliestDeliveryDate.Width = 200;
//
// gvMx1deliveryDate
@@ -466,7 +467,7 @@
this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
this.gvMx1deliveryDate.Tag = "query_a.DELIVERY_DATE";
this.gvMx1deliveryDate.Visible = true;
- this.gvMx1deliveryDate.VisibleIndex = 8;
+ this.gvMx1deliveryDate.VisibleIndex = 9;
this.gvMx1deliveryDate.Width = 200;
//
// gvMx1pricingQty
@@ -479,7 +480,7 @@
this.gvMx1pricingQty.Name = "gvMx1pricingQty";
this.gvMx1pricingQty.Tag = "query_a.PRICING_QTY";
this.gvMx1pricingQty.Visible = true;
- this.gvMx1pricingQty.VisibleIndex = 6;
+ this.gvMx1pricingQty.VisibleIndex = 7;
this.gvMx1pricingQty.Width = 100;
//
// gvMx1pricingUnit
@@ -492,7 +493,7 @@
this.gvMx1pricingUnit.Name = "gvMx1pricingUnit";
this.gvMx1pricingUnit.Tag = "query_a.PRICING_UNIT";
this.gvMx1pricingUnit.Visible = true;
- this.gvMx1pricingUnit.VisibleIndex = 7;
+ this.gvMx1pricingUnit.VisibleIndex = 8;
this.gvMx1pricingUnit.Width = 100;
//
// gvMx1inventoryUnit
@@ -505,7 +506,7 @@
this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit";
this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
this.gvMx1inventoryUnit.Visible = true;
- this.gvMx1inventoryUnit.VisibleIndex = 14;
+ this.gvMx1inventoryUnit.VisibleIndex = 15;
this.gvMx1inventoryUnit.Width = 100;
//
// gvMx1purchaseQty
@@ -518,7 +519,7 @@
this.gvMx1purchaseQty.Name = "gvMx1purchaseQty";
this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY";
this.gvMx1purchaseQty.Visible = true;
- this.gvMx1purchaseQty.VisibleIndex = 11;
+ this.gvMx1purchaseQty.VisibleIndex = 12;
this.gvMx1purchaseQty.Width = 100;
//
// gvMx1purchaseUnit
@@ -531,7 +532,7 @@
this.gvMx1purchaseUnit.Name = "gvMx1purchaseUnit";
this.gvMx1purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gvMx1purchaseUnit.Visible = true;
- this.gvMx1purchaseUnit.VisibleIndex = 12;
+ this.gvMx1purchaseUnit.VisibleIndex = 13;
this.gvMx1purchaseUnit.Width = 100;
//
// gvMx1itemId
@@ -544,7 +545,7 @@
this.gvMx1itemId.Name = "gvMx1itemId";
this.gvMx1itemId.Tag = "query_a.ITEM_ID";
this.gvMx1itemId.Visible = true;
- this.gvMx1itemId.VisibleIndex = 2;
+ this.gvMx1itemId.VisibleIndex = 3;
this.gvMx1itemId.Width = 100;
//
// gvMx1salesOrderId
@@ -557,7 +558,7 @@
this.gvMx1salesOrderId.Name = "gvMx1salesOrderId";
this.gvMx1salesOrderId.Tag = "query_a.SALES_ORDER_ID";
this.gvMx1salesOrderId.Visible = true;
- this.gvMx1salesOrderId.VisibleIndex = 1;
+ this.gvMx1salesOrderId.VisibleIndex = 2;
this.gvMx1salesOrderId.Width = 150;
//
// tabMxPage1
@@ -584,6 +585,7 @@
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gvMx1.ColumnPanelRowHeight = 60;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn3,
this.gv_erpid,
this.gvMx1salesOrderId,
this.gvMx1itemId,
@@ -625,6 +627,16 @@
this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鏀舵枡缁勭粐";
+ this.gridColumn3.FieldName = "receivingOrg";
+ this.gridColumn3.MinWidth = 250;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 0;
+ this.gridColumn3.Width = 250;
+ //
// gv_erpid
//
this.gv_erpid.Caption = "ERP涓ID";
@@ -632,7 +644,7 @@
this.gv_erpid.MinWidth = 100;
this.gv_erpid.Name = "gv_erpid";
this.gv_erpid.Visible = true;
- this.gv_erpid.VisibleIndex = 0;
+ this.gv_erpid.VisibleIndex = 1;
this.gv_erpid.Width = 100;
//
// gridColumn2
@@ -642,7 +654,7 @@
this.gridColumn2.MinWidth = 100;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 3;
+ this.gridColumn2.VisibleIndex = 4;
this.gridColumn2.Width = 100;
//
// gridColumn1
@@ -652,7 +664,7 @@
this.gridColumn1.MinWidth = 120;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.VisibleIndex = 5;
this.gridColumn1.Width = 120;
//
// lb_supplier
@@ -794,6 +806,22 @@
this.gridView1.OptionsView.ShowColumnHeaders = false;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridBand29
+ //
+ this.gridBand29.Caption = "鏀舵枡缁勭粐";
+ this.gridBand29.Columns.Add(this.gv_paymentParty);
+ this.gridBand29.Columns.Add(this.gv_transportMethod);
+ this.gridBand29.Columns.Add(this.gv_lastupdateDate);
+ this.gridBand29.Columns.Add(this.gv_lastupdateBy);
+ this.gridBand29.Columns.Add(this.gv_checkDate);
+ this.gridBand29.Columns.Add(this.gv_checkBy);
+ this.gridBand29.Columns.Add(this.gv_checkFalg);
+ this.gridBand29.MinWidth = 250;
+ this.gridBand29.Name = "gridBand29";
+ this.gridBand29.Visible = false;
+ this.gridBand29.VisibleIndex = -1;
+ this.gridBand29.Width = 250;
+ //
// gv_paymentParty
//
this.gv_paymentParty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -878,6 +906,15 @@
this.gv_checkFalg.Tag = "query_a.CHECK_FALG";
this.gv_checkFalg.Width = 100;
//
+ // gridBand1
+ //
+ this.gridBand1.Caption = "ERPID鍙�";
+ this.gridBand1.Columns.Add(this.gv_factory);
+ this.gridBand1.MinWidth = 80;
+ this.gridBand1.Name = "gridBand1";
+ this.gridBand1.VisibleIndex = 0;
+ this.gridBand1.Width = 80;
+ //
// gv_factory
//
this.gv_factory.Caption = "ERPID鍙�";
@@ -888,6 +925,15 @@
this.gv_factory.Tag = "query_a.ebelnK3id";
this.gv_factory.Visible = true;
this.gv_factory.Width = 80;
+ //
+ // gridBand2
+ //
+ this.gridBand2.Caption = "閲囪喘鍗曞彿";
+ this.gridBand2.Columns.Add(this.gv_billNo);
+ this.gridBand2.MinWidth = 120;
+ this.gridBand2.Name = "gridBand2";
+ this.gridBand2.VisibleIndex = 1;
+ this.gridBand2.Width = 120;
//
// gv_billNo
//
@@ -902,6 +948,18 @@
this.gv_billNo.Visible = true;
this.gv_billNo.Width = 120;
//
+ // 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.MinWidth = 130;
+ this.gridBand3.Name = "gridBand3";
+ this.gridBand3.RowCount = 2;
+ this.gridBand3.VisibleIndex = 2;
+ this.gridBand3.Width = 130;
+ //
// gv_documentStatus
//
this.gv_documentStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -914,6 +972,17 @@
this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS";
this.gv_documentStatus.Visible = true;
this.gv_documentStatus.Width = 130;
+ //
+ // 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.MinWidth = 80;
+ this.gridBand4.Name = "gridBand4";
+ this.gridBand4.VisibleIndex = 3;
+ this.gridBand4.Width = 80;
//
// gv_documentType
//
@@ -928,6 +997,15 @@
this.gv_documentType.Visible = true;
this.gv_documentType.Width = 80;
//
+ // gridBand5
+ //
+ this.gridBand5.Caption = "涓氬姟绫诲瀷";
+ this.gridBand5.Columns.Add(this.gv_businessType);
+ this.gridBand5.MinWidth = 80;
+ this.gridBand5.Name = "gridBand5";
+ this.gridBand5.VisibleIndex = 4;
+ this.gridBand5.Width = 80;
+ //
// gv_businessType
//
this.gv_businessType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -940,6 +1018,15 @@
this.gv_businessType.Tag = "query_a.BUSINESS_TYPE";
this.gv_businessType.Visible = true;
this.gv_businessType.Width = 80;
+ //
+ // gridBand8
+ //
+ this.gridBand8.Caption = "閲囪喘鏃ユ湡";
+ this.gridBand8.Columns.Add(this.gv_purchaseDate);
+ this.gridBand8.MinWidth = 170;
+ this.gridBand8.Name = "gridBand8";
+ this.gridBand8.VisibleIndex = 5;
+ this.gridBand8.Width = 170;
//
// gv_purchaseDate
//
@@ -954,6 +1041,27 @@
this.gv_purchaseDate.Visible = true;
this.gv_purchaseDate.Width = 170;
//
+ // 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.MinWidth = 200;
+ 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 = 66;
+ //
// gv_supplier
//
this.gv_supplier.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -967,6 +1075,15 @@
this.gv_supplier.Visible = true;
this.gv_supplier.Width = 66;
//
+ // gridBand7
+ //
+ this.gridBand7.Caption = "鍚嶇О";
+ this.gridBand7.Columns.Add(this.bandedGridColumn1);
+ this.gridBand7.MinWidth = 100;
+ this.gridBand7.Name = "gridBand7";
+ this.gridBand7.VisibleIndex = 1;
+ this.gridBand7.Width = 134;
+ //
// bandedGridColumn1
//
this.bandedGridColumn1.Caption = "渚涘簲鍟嗗悕绉�";
@@ -977,6 +1094,17 @@
this.bandedGridColumn1.Tag = "query_a.suppName";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.Width = 134;
+ //
+ // 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.MinWidth = 80;
+ this.gridBand9.Name = "gridBand9";
+ this.gridBand9.VisibleIndex = 7;
+ this.gridBand9.Width = 80;
//
// gv_closeStatus
//
@@ -991,6 +1119,28 @@
this.gv_closeStatus.Visible = true;
this.gv_closeStatus.Width = 80;
//
+ // 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.MinWidth = 100;
+ this.gridBand10.Name = "gridBand10";
+ this.gridBand10.VisibleIndex = 8;
+ this.gridBand10.Width = 130;
+ //
+ // gridBand12
+ //
+ this.gridBand12.Caption = "缂栧彿";
+ this.gridBand12.Columns.Add(this.gv_purchaseDept);
+ this.gridBand12.MinWidth = 50;
+ this.gridBand12.Name = "gridBand12";
+ this.gridBand12.VisibleIndex = 0;
+ this.gridBand12.Width = 50;
+ //
// gv_purchaseDept
//
this.gv_purchaseDept.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1004,6 +1154,15 @@
this.gv_purchaseDept.Visible = true;
this.gv_purchaseDept.Width = 50;
//
+ // gridBand13
+ //
+ this.gridBand13.Caption = "鍚嶇О";
+ this.gridBand13.Columns.Add(this.bandedGridColumn2);
+ this.gridBand13.MinWidth = 80;
+ this.gridBand13.Name = "gridBand13";
+ this.gridBand13.VisibleIndex = 1;
+ this.gridBand13.Width = 80;
+ //
// bandedGridColumn2
//
this.bandedGridColumn2.Caption = "閲囪喘閮ㄩ棬鍚嶇О";
@@ -1014,6 +1173,17 @@
this.bandedGridColumn2.Tag = "query_a.departmentname";
this.bandedGridColumn2.Visible = true;
this.bandedGridColumn2.Width = 80;
+ //
+ // gridBand14
+ //
+ this.gridBand14.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand14.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand14.Caption = "鏁伴噺楠屾敹";
+ this.gridBand14.Columns.Add(this.gv_qtyAcceptance);
+ this.gridBand14.MinWidth = 50;
+ this.gridBand14.Name = "gridBand14";
+ this.gridBand14.VisibleIndex = 9;
+ this.gridBand14.Width = 50;
//
// gv_qtyAcceptance
//
@@ -1028,6 +1198,15 @@
this.gv_qtyAcceptance.Visible = true;
this.gv_qtyAcceptance.Width = 50;
//
+ // gridBand15
+ //
+ this.gridBand15.Caption = "閲囪喘鍛�";
+ this.gridBand15.Columns.Add(this.gv_purchaser);
+ this.gridBand15.MinWidth = 60;
+ this.gridBand15.Name = "gridBand15";
+ this.gridBand15.VisibleIndex = 10;
+ this.gridBand15.Width = 60;
+ //
// gv_purchaser
//
this.gv_purchaser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1040,6 +1219,15 @@
this.gv_purchaser.Tag = "query_a.PURCHASER";
this.gv_purchaser.Visible = true;
this.gv_purchaser.Width = 60;
+ //
+ // gridBand16
+ //
+ this.gridBand16.Caption = "璐ㄩ噺瑕佹眰";
+ this.gridBand16.Columns.Add(this.gv_qualityReq);
+ this.gridBand16.MinWidth = 80;
+ this.gridBand16.Name = "gridBand16";
+ this.gridBand16.VisibleIndex = 11;
+ this.gridBand16.Width = 80;
//
// gv_qualityReq
//
@@ -1054,6 +1242,28 @@
this.gv_qualityReq.Visible = true;
this.gv_qualityReq.Width = 80;
//
+ // gridBand17
+ //
+ this.gridBand17.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand17.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand17.Caption = "浣滃簾鐘舵��";
+ this.gridBand17.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand19,
+ this.gridBand18,
+ this.gridBand20});
+ this.gridBand17.Name = "gridBand17";
+ this.gridBand17.VisibleIndex = 12;
+ this.gridBand17.Width = 300;
+ //
+ // gridBand19
+ //
+ this.gridBand19.Caption = "浣滃簾鐘舵��";
+ this.gridBand19.Columns.Add(this.gv_cancellationStatus);
+ this.gridBand19.MinWidth = 60;
+ this.gridBand19.Name = "gridBand19";
+ this.gridBand19.VisibleIndex = 0;
+ this.gridBand19.Width = 60;
+ //
// gv_cancellationStatus
//
this.gv_cancellationStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1066,6 +1276,15 @@
this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS";
this.gv_cancellationStatus.Visible = true;
this.gv_cancellationStatus.Width = 60;
+ //
+ // gridBand18
+ //
+ this.gridBand18.Caption = "浣滃簾浜�";
+ this.gridBand18.Columns.Add(this.gv_cancellationPerson);
+ this.gridBand18.MinWidth = 60;
+ this.gridBand18.Name = "gridBand18";
+ this.gridBand18.VisibleIndex = 1;
+ this.gridBand18.Width = 60;
//
// gv_cancellationPerson
//
@@ -1080,6 +1299,15 @@
this.gv_cancellationPerson.Visible = true;
this.gv_cancellationPerson.Width = 60;
//
+ // gridBand20
+ //
+ this.gridBand20.Caption = "浣滃簾鏃ユ湡";
+ this.gridBand20.Columns.Add(this.gv_cancellationDate);
+ this.gridBand20.MinWidth = 180;
+ this.gridBand20.Name = "gridBand20";
+ this.gridBand20.VisibleIndex = 2;
+ this.gridBand20.Width = 180;
+ //
// gv_cancellationDate
//
this.gv_cancellationDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1092,6 +1320,27 @@
this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
this.gv_cancellationDate.Visible = true;
this.gv_cancellationDate.Width = 180;
+ //
+ // gridBand21
+ //
+ this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand21.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand21.Caption = "鍒涘缓淇℃伅";
+ this.gridBand21.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand25,
+ this.gridBand22});
+ this.gridBand21.Name = "gridBand21";
+ this.gridBand21.VisibleIndex = 13;
+ this.gridBand21.Width = 260;
+ //
+ // gridBand25
+ //
+ this.gridBand25.Caption = "鍒涘缓浜�";
+ this.gridBand25.Columns.Add(this.gv_createBy);
+ this.gridBand25.MinWidth = 80;
+ this.gridBand25.Name = "gridBand25";
+ this.gridBand25.VisibleIndex = 0;
+ this.gridBand25.Width = 80;
//
// gv_createBy
//
@@ -1106,6 +1355,15 @@
this.gv_createBy.Visible = true;
this.gv_createBy.Width = 80;
//
+ // gridBand22
+ //
+ this.gridBand22.Caption = "鍒涘缓鏃ユ湡";
+ this.gridBand22.Columns.Add(this.gv_createDate);
+ this.gridBand22.MinWidth = 180;
+ this.gridBand22.Name = "gridBand22";
+ this.gridBand22.VisibleIndex = 1;
+ this.gridBand22.Width = 180;
+ //
// gv_createDate
//
this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1118,6 +1376,15 @@
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
this.gv_createDate.Width = 180;
+ //
+ // gridBand23
+ //
+ this.gridBand23.Caption = "澶囨敞";
+ this.gridBand23.Columns.Add(this.gv_remarks);
+ this.gridBand23.MinWidth = 100;
+ this.gridBand23.Name = "gridBand23";
+ this.gridBand23.VisibleIndex = 14;
+ this.gridBand23.Width = 100;
//
// gv_remarks
//
@@ -1132,6 +1399,15 @@
this.gv_remarks.Visible = true;
this.gv_remarks.Width = 100;
//
+ // gridBand24
+ //
+ this.gridBand24.Caption = "鍙樻洿鍘熷洜";
+ this.gridBand24.Columns.Add(this.gv_changereason);
+ this.gridBand24.MinWidth = 100;
+ this.gridBand24.Name = "gridBand24";
+ this.gridBand24.VisibleIndex = 15;
+ this.gridBand24.Width = 100;
+ //
// gv_changereason
//
this.gv_changereason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1144,6 +1420,28 @@
this.gv_changereason.Tag = "query_a.CHANGEREASON";
this.gv_changereason.Visible = true;
this.gv_changereason.Width = 100;
+ //
+ // gridBand28
+ //
+ this.gridBand28.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand28.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand28.Caption = "ERP瀹℃牳淇℃伅";
+ this.gridBand28.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand27,
+ this.gridBand26});
+ this.gridBand28.Name = "gridBand28";
+ this.gridBand28.VisibleIndex = 16;
+ this.gridBand28.Width = 260;
+ //
+ // gridBand27
+ //
+ this.gridBand27.Caption = "瀹℃牳浜�";
+ this.gridBand27.Columns.Add(this.gv_settlementParty);
+ this.gridBand27.Columns.Add(this.gv_erpCheckBy);
+ this.gridBand27.MinWidth = 80;
+ this.gridBand27.Name = "gridBand27";
+ this.gridBand27.VisibleIndex = 0;
+ this.gridBand27.Width = 80;
//
// gv_settlementParty
//
@@ -1169,6 +1467,15 @@
this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY";
this.gv_erpCheckBy.Visible = true;
this.gv_erpCheckBy.Width = 80;
+ //
+ // gridBand26
+ //
+ this.gridBand26.Caption = "ERP瀹℃牳鏃堕棿";
+ this.gridBand26.Columns.Add(this.gv_erpCheckDate);
+ this.gridBand26.MinWidth = 180;
+ this.gridBand26.Name = "gridBand26";
+ this.gridBand26.VisibleIndex = 1;
+ this.gridBand26.Width = 180;
//
// gv_erpCheckDate
//
@@ -1270,301 +1577,6 @@
this.txt_supplier.Name = "txt_supplier";
this.txt_supplier.Size = new System.Drawing.Size(305, 30);
this.txt_supplier.TabIndex = 227;
- //
- // gridBand29
- //
- this.gridBand29.Caption = "鏀舵枡缁勭粐";
- this.gridBand29.Columns.Add(this.gv_paymentParty);
- this.gridBand29.Columns.Add(this.gv_transportMethod);
- this.gridBand29.Columns.Add(this.gv_lastupdateDate);
- this.gridBand29.Columns.Add(this.gv_lastupdateBy);
- this.gridBand29.Columns.Add(this.gv_checkDate);
- this.gridBand29.Columns.Add(this.gv_checkBy);
- this.gridBand29.Columns.Add(this.gv_checkFalg);
- this.gridBand29.MinWidth = 250;
- this.gridBand29.Name = "gridBand29";
- this.gridBand29.Visible = false;
- this.gridBand29.VisibleIndex = -1;
- this.gridBand29.Width = 250;
- //
- // gridBand1
- //
- this.gridBand1.Caption = "ERPID鍙�";
- this.gridBand1.Columns.Add(this.gv_factory);
- this.gridBand1.MinWidth = 80;
- this.gridBand1.Name = "gridBand1";
- this.gridBand1.VisibleIndex = 0;
- this.gridBand1.Width = 80;
- //
- // gridBand2
- //
- this.gridBand2.Caption = "閲囪喘鍗曞彿";
- this.gridBand2.Columns.Add(this.gv_billNo);
- this.gridBand2.MinWidth = 120;
- this.gridBand2.Name = "gridBand2";
- this.gridBand2.VisibleIndex = 1;
- this.gridBand2.Width = 120;
- //
- // 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.MinWidth = 130;
- this.gridBand3.Name = "gridBand3";
- this.gridBand3.RowCount = 2;
- this.gridBand3.VisibleIndex = 2;
- this.gridBand3.Width = 130;
- //
- // 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.MinWidth = 80;
- this.gridBand4.Name = "gridBand4";
- this.gridBand4.VisibleIndex = 3;
- this.gridBand4.Width = 80;
- //
- // gridBand5
- //
- this.gridBand5.Caption = "涓氬姟绫诲瀷";
- this.gridBand5.Columns.Add(this.gv_businessType);
- this.gridBand5.MinWidth = 80;
- this.gridBand5.Name = "gridBand5";
- this.gridBand5.VisibleIndex = 4;
- this.gridBand5.Width = 80;
- //
- // gridBand8
- //
- this.gridBand8.Caption = "閲囪喘鏃ユ湡";
- this.gridBand8.Columns.Add(this.gv_purchaseDate);
- this.gridBand8.MinWidth = 170;
- this.gridBand8.Name = "gridBand8";
- this.gridBand8.VisibleIndex = 5;
- this.gridBand8.Width = 170;
- //
- // 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.MinWidth = 200;
- 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 = 66;
- //
- // gridBand7
- //
- this.gridBand7.Caption = "鍚嶇О";
- this.gridBand7.Columns.Add(this.bandedGridColumn1);
- this.gridBand7.MinWidth = 100;
- this.gridBand7.Name = "gridBand7";
- this.gridBand7.VisibleIndex = 1;
- this.gridBand7.Width = 134;
- //
- // 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.MinWidth = 80;
- this.gridBand9.Name = "gridBand9";
- this.gridBand9.VisibleIndex = 7;
- this.gridBand9.Width = 80;
- //
- // 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.MinWidth = 100;
- this.gridBand10.Name = "gridBand10";
- this.gridBand10.VisibleIndex = 8;
- this.gridBand10.Width = 130;
- //
- // gridBand12
- //
- this.gridBand12.Caption = "缂栧彿";
- this.gridBand12.Columns.Add(this.gv_purchaseDept);
- this.gridBand12.MinWidth = 50;
- this.gridBand12.Name = "gridBand12";
- this.gridBand12.VisibleIndex = 0;
- this.gridBand12.Width = 50;
- //
- // gridBand13
- //
- this.gridBand13.Caption = "鍚嶇О";
- this.gridBand13.Columns.Add(this.bandedGridColumn2);
- this.gridBand13.MinWidth = 80;
- this.gridBand13.Name = "gridBand13";
- this.gridBand13.VisibleIndex = 1;
- this.gridBand13.Width = 80;
- //
- // gridBand14
- //
- this.gridBand14.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand14.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand14.Caption = "鏁伴噺楠屾敹";
- this.gridBand14.Columns.Add(this.gv_qtyAcceptance);
- this.gridBand14.MinWidth = 50;
- this.gridBand14.Name = "gridBand14";
- this.gridBand14.VisibleIndex = 9;
- this.gridBand14.Width = 50;
- //
- // gridBand15
- //
- this.gridBand15.Caption = "閲囪喘鍛�";
- this.gridBand15.Columns.Add(this.gv_purchaser);
- this.gridBand15.MinWidth = 60;
- this.gridBand15.Name = "gridBand15";
- this.gridBand15.VisibleIndex = 10;
- this.gridBand15.Width = 60;
- //
- // gridBand16
- //
- this.gridBand16.Caption = "璐ㄩ噺瑕佹眰";
- this.gridBand16.Columns.Add(this.gv_qualityReq);
- this.gridBand16.MinWidth = 80;
- this.gridBand16.Name = "gridBand16";
- this.gridBand16.VisibleIndex = 11;
- this.gridBand16.Width = 80;
- //
- // gridBand17
- //
- this.gridBand17.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand17.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand17.Caption = "浣滃簾鐘舵��";
- this.gridBand17.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand19,
- this.gridBand18,
- this.gridBand20});
- this.gridBand17.Name = "gridBand17";
- this.gridBand17.VisibleIndex = 12;
- this.gridBand17.Width = 300;
- //
- // gridBand19
- //
- this.gridBand19.Caption = "浣滃簾鐘舵��";
- this.gridBand19.Columns.Add(this.gv_cancellationStatus);
- this.gridBand19.MinWidth = 60;
- this.gridBand19.Name = "gridBand19";
- this.gridBand19.VisibleIndex = 0;
- this.gridBand19.Width = 60;
- //
- // gridBand18
- //
- this.gridBand18.Caption = "浣滃簾浜�";
- this.gridBand18.Columns.Add(this.gv_cancellationPerson);
- this.gridBand18.MinWidth = 60;
- this.gridBand18.Name = "gridBand18";
- this.gridBand18.VisibleIndex = 1;
- this.gridBand18.Width = 60;
- //
- // gridBand20
- //
- this.gridBand20.Caption = "浣滃簾鏃ユ湡";
- this.gridBand20.Columns.Add(this.gv_cancellationDate);
- this.gridBand20.MinWidth = 180;
- this.gridBand20.Name = "gridBand20";
- this.gridBand20.VisibleIndex = 2;
- this.gridBand20.Width = 180;
- //
- // gridBand21
- //
- this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand21.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand21.Caption = "鍒涘缓淇℃伅";
- this.gridBand21.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand25,
- this.gridBand22});
- this.gridBand21.Name = "gridBand21";
- this.gridBand21.VisibleIndex = 13;
- this.gridBand21.Width = 260;
- //
- // gridBand25
- //
- this.gridBand25.Caption = "鍒涘缓浜�";
- this.gridBand25.Columns.Add(this.gv_createBy);
- this.gridBand25.MinWidth = 80;
- this.gridBand25.Name = "gridBand25";
- this.gridBand25.VisibleIndex = 0;
- this.gridBand25.Width = 80;
- //
- // gridBand22
- //
- this.gridBand22.Caption = "鍒涘缓鏃ユ湡";
- this.gridBand22.Columns.Add(this.gv_createDate);
- this.gridBand22.MinWidth = 180;
- this.gridBand22.Name = "gridBand22";
- this.gridBand22.VisibleIndex = 1;
- this.gridBand22.Width = 180;
- //
- // gridBand23
- //
- this.gridBand23.Caption = "澶囨敞";
- this.gridBand23.Columns.Add(this.gv_remarks);
- this.gridBand23.MinWidth = 100;
- this.gridBand23.Name = "gridBand23";
- this.gridBand23.VisibleIndex = 14;
- this.gridBand23.Width = 100;
- //
- // gridBand24
- //
- this.gridBand24.Caption = "鍙樻洿鍘熷洜";
- this.gridBand24.Columns.Add(this.gv_changereason);
- this.gridBand24.MinWidth = 100;
- this.gridBand24.Name = "gridBand24";
- this.gridBand24.VisibleIndex = 15;
- this.gridBand24.Width = 100;
- //
- // gridBand28
- //
- this.gridBand28.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand28.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand28.Caption = "ERP瀹℃牳淇℃伅";
- this.gridBand28.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand27,
- this.gridBand26});
- this.gridBand28.Name = "gridBand28";
- this.gridBand28.VisibleIndex = 16;
- this.gridBand28.Width = 260;
- //
- // gridBand27
- //
- this.gridBand27.Caption = "瀹℃牳浜�";
- this.gridBand27.Columns.Add(this.gv_settlementParty);
- this.gridBand27.Columns.Add(this.gv_erpCheckBy);
- this.gridBand27.MinWidth = 80;
- this.gridBand27.Name = "gridBand27";
- this.gridBand27.VisibleIndex = 0;
- this.gridBand27.Width = 80;
- //
- // gridBand26
- //
- this.gridBand26.Caption = "ERP瀹℃牳鏃堕棿";
- this.gridBand26.Columns.Add(this.gv_erpCheckDate);
- this.gridBand26.MinWidth = 180;
- this.gridBand26.Name = "gridBand26";
- this.gridBand26.VisibleIndex = 1;
- this.gridBand26.Width = 180;
//
// Frm_MesRohIn
//
@@ -1709,5 +1721,6 @@
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand28;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand27;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand26;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ 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 69b73a2..ec4a34e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -26,9 +26,10 @@
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
txt_supplier.getSuppler("");
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -114,7 +115,6 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index b92206a..26d836c 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -32,6 +32,7 @@
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -53,6 +54,7 @@
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -95,7 +97,9 @@
this.gridColumn9,
this.gv_purchaseUnit,
this.gv_inventoryUnit,
- this.gv_remarks});
+ this.gv_remarks,
+ this.gridColumn10,
+ this.gridColumn2});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -112,6 +116,16 @@
this.gv_chk.Visible = true;
this.gv_chk.VisibleIndex = 0;
this.gv_chk.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鏀舵枡缁勭粐";
+ this.gridColumn2.FieldName = "fSubsidiary";
+ this.gridColumn2.MinWidth = 250;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 17;
+ this.gridColumn2.Width = 250;
//
// gv_guid
//
@@ -370,6 +384,16 @@
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
//
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "渚涘簲鍟�";
+ this.gridColumn10.FieldName = "gysName";
+ this.gridColumn10.MinWidth = 125;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 16;
+ this.gridColumn10.Width = 125;
+ //
// SelectCgMx
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -418,5 +442,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
}
}
\ No newline at end of file
--
Gitblit v1.9.3