From 4f5d0ddf7702fa491d3a7cb97f2e3c2604826b01 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 07 二月 2025 09:32:19 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs | 19
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 51 +
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 31 +
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 14
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 666 ++++++++++++++---------------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 83 +-
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 410 +++++++++---------
9 files changed, 663 insertions(+), 616 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
index 3597fd2..8908467 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
@@ -274,6 +274,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.AllowEdit = false;
+ this.gridColumn5.Tag = "query_a.LOOKUP_TYPE_CODE";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 2;
this.gridColumn5.Width = 94;
@@ -285,6 +286,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.AllowEdit = false;
+ this.gridColumn4.Tag = "query_a.LOOKUP_TYPE_CODE";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 3;
this.gridColumn4.Width = 94;
@@ -296,6 +298,7 @@
this.gridColumn1.MinWidth = 180;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
+ this.gridColumn1.Tag = "query_a.LOOKUP_TYPE_CODE";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 4;
this.gridColumn1.Width = 180;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 7e41584..3e701d0 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -90,33 +90,63 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
+ this.gridBand31 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ 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.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_fcheckResu = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_lotNo = 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.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_fcheckBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand32 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_fcheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_checkQty = 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.gridColumn15 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -159,36 +189,6 @@
this.lb_lotNo = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridBand31 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- 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.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand14 = 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.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand32 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand6 = 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();
@@ -321,7 +321,7 @@
this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
this.gvMx1fcheckItem.FieldName = "fcheckItem";
- this.gvMx1fcheckItem.MinWidth = 120;
+ this.gvMx1fcheckItem.MinWidth = 50;
this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
this.gvMx1fcheckItem.Tag = "query_a.fcheck_item";
this.gvMx1fcheckItem.Visible = true;
@@ -334,7 +334,7 @@
this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
this.gvMx1fcheckTool.FieldName = "fcheckTool";
- this.gvMx1fcheckTool.MinWidth = 100;
+ this.gvMx1fcheckTool.MinWidth = 50;
this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
this.gvMx1fcheckTool.Tag = "query_a.fcheck_tool";
this.gvMx1fcheckTool.Visible = true;
@@ -347,7 +347,7 @@
this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
- this.gvMx1fcheckItemDesc.MinWidth = 120;
+ this.gvMx1fcheckItemDesc.MinWidth = 50;
this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
this.gvMx1fcheckItemDesc.Visible = true;
@@ -360,7 +360,7 @@
this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
this.gvMx1fspecRequ.FieldName = "fspecRequ";
- this.gvMx1fspecRequ.MinWidth = 120;
+ this.gvMx1fspecRequ.MinWidth = 50;
this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
this.gvMx1fspecRequ.Visible = true;
@@ -386,7 +386,7 @@
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
- this.gvMx1fstand.MinWidth = 60;
+ this.gvMx1fstand.MinWidth = 50;
this.gvMx1fstand.Name = "gvMx1fstand";
this.gvMx1fstand.Tag = "query_a.fstand";
this.gvMx1fstand.Visible = true;
@@ -425,7 +425,7 @@
this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
this.gvMx1checkQyt.FieldName = "checkQyt";
- this.gvMx1checkQyt.MinWidth = 60;
+ this.gvMx1checkQyt.MinWidth = 50;
this.gvMx1checkQyt.Name = "gvMx1checkQyt";
this.gvMx1checkQyt.Tag = "query_a.check_qyt";
this.gvMx1checkQyt.Visible = true;
@@ -455,7 +455,7 @@
this.gvMx1fcheckResu.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gvMx1fcheckResu.FieldName = "fcheckResu";
- this.gvMx1fcheckResu.MinWidth = 80;
+ this.gvMx1fcheckResu.MinWidth = 50;
this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
this.gvMx1fcheckResu.Visible = true;
@@ -468,7 +468,7 @@
this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
this.gvMx1fngRate.FieldName = "fngRateName";
- this.gvMx1fngRate.MinWidth = 80;
+ this.gvMx1fngRate.MinWidth = 50;
this.gvMx1fngRate.Name = "gvMx1fngRate";
this.gvMx1fngRate.Tag = "query_a.fng_rate";
this.gvMx1fngRate.Visible = true;
@@ -494,7 +494,7 @@
this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�";
this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
- this.gvMx1sampleSizeNo.MinWidth = 200;
+ this.gvMx1sampleSizeNo.MinWidth = 50;
this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
this.gvMx1sampleSizeNo.Visible = true;
@@ -507,7 +507,7 @@
this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
- this.gvMx1fcheckLevel.MinWidth = 200;
+ this.gvMx1fcheckLevel.MinWidth = 50;
this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
this.gvMx1fcheckLevel.Visible = true;
@@ -520,7 +520,7 @@
this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
this.gvMx1facLevel.FieldName = "facLevel";
- this.gvMx1facLevel.MinWidth = 200;
+ this.gvMx1facLevel.MinWidth = 50;
this.gvMx1facLevel.Name = "gvMx1facLevel";
this.gvMx1facLevel.Tag = "query_a.fac_level";
this.gvMx1facLevel.Visible = true;
@@ -846,15 +846,34 @@
this.gridView1.OptionsView.ShowColumnHeaders = false;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridBand31
+ //
+ this.gridBand31.Caption = "鏀舵枡缁勭粐";
+ this.gridBand31.Columns.Add(this.bandedGridColumn1);
+ this.gridBand31.Name = "gridBand31";
+ this.gridBand31.VisibleIndex = 0;
+ this.gridBand31.Width = 250;
+ //
// bandedGridColumn1
//
this.bandedGridColumn1.Caption = "鏀舵枡缁勭粐";
this.bandedGridColumn1.FieldName = "receivingOrg";
- this.bandedGridColumn1.MinWidth = 250;
+ this.bandedGridColumn1.MinWidth = 50;
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Tag = "org.fnamber";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.Width = 250;
+ //
+ // 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 = 1;
+ this.gridBand11.Width = 50;
//
// gridColumn13
//
@@ -867,6 +886,17 @@
this.gridColumn13.UnboundDataType = typeof(bool);
this.gridColumn13.Visible = true;
this.gridColumn13.Width = 50;
+ //
+ // 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 = 2;
+ this.gridBand12.Width = 50;
//
// gv_fsubmit
//
@@ -882,6 +912,18 @@
this.gv_fsubmit.Visible = true;
this.gv_fsubmit.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.Visible = false;
+ this.gridBand13.VisibleIndex = -1;
+ this.gridBand13.Width = 50;
+ //
// gv_modify1Flag
//
this.gv_modify1Flag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -896,6 +938,16 @@
this.gv_modify1Flag.Visible = true;
this.gv_modify1Flag.Width = 50;
//
+ // gridBand9
+ //
+ this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand9.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand9.Caption = "妫�楠岀粨鏋�";
+ this.gridBand9.Columns.Add(this.gv_fcheckResu);
+ 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);
@@ -908,6 +960,14 @@
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
this.gv_fcheckResu.Width = 50;
+ //
+ // gridBand14
+ //
+ this.gridBand14.Caption = "閫佹鎵规";
+ this.gridBand14.Columns.Add(this.gv_lotNo);
+ this.gridBand14.Name = "gridBand14";
+ this.gridBand14.VisibleIndex = 4;
+ this.gridBand14.Width = 120;
//
// gv_lotNo
//
@@ -922,6 +982,14 @@
this.gv_lotNo.Visible = true;
this.gv_lotNo.Width = 120;
//
+ // gridBand16
+ //
+ this.gridBand16.Caption = "妫�楠屽崟鍙�";
+ this.gridBand16.Columns.Add(this.gv_releaseNo);
+ this.gridBand16.Name = "gridBand16";
+ this.gridBand16.VisibleIndex = 5;
+ this.gridBand16.Width = 100;
+ //
// gv_releaseNo
//
this.gv_releaseNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -935,6 +1003,29 @@
this.gv_releaseNo.Visible = true;
this.gv_releaseNo.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.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.Visible = false;
+ this.gridBand2.VisibleIndex = -1;
+ this.gridBand2.Width = 60;
+ //
// gv_itemId
//
this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -946,6 +1037,14 @@
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.item_id";
this.gv_itemId.Width = 30;
+ //
+ // gridBand5
+ //
+ this.gridBand5.Caption = "鐗╂枡缂栫爜";
+ this.gridBand5.Columns.Add(this.gv_itemNo);
+ this.gridBand5.Name = "gridBand5";
+ this.gridBand5.VisibleIndex = 0;
+ this.gridBand5.Width = 136;
//
// gv_itemNo
//
@@ -960,6 +1059,14 @@
this.gv_itemNo.Visible = true;
this.gv_itemNo.Width = 136;
//
+ // gridBand3
+ //
+ this.gridBand3.Caption = "鐗╂枡鍚嶇О";
+ this.gridBand3.Columns.Add(this.gv_boardStyle);
+ this.gridBand3.Name = "gridBand3";
+ this.gridBand3.VisibleIndex = 1;
+ this.gridBand3.Width = 164;
+ //
// gv_boardStyle
//
this.gv_boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -972,6 +1079,14 @@
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
this.gv_boardStyle.Width = 164;
+ //
+ // gridBand19
+ //
+ this.gridBand19.Caption = "渚涘簲鍟嗗悕绉�";
+ this.gridBand19.Columns.Add(this.gv_lifnr);
+ this.gridBand19.Name = "gridBand19";
+ this.gridBand19.VisibleIndex = 7;
+ this.gridBand19.Width = 200;
//
// gv_lifnr
//
@@ -986,6 +1101,15 @@
this.gv_lifnr.Visible = true;
this.gv_lifnr.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;
+ //
// gv_fbatchQty
//
this.gv_fbatchQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -998,6 +1122,16 @@
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
this.gv_fbatchQty.Visible = true;
this.gv_fbatchQty.Width = 80;
+ //
+ // gridBand21
+ //
+ this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand21.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand21.Caption = "绫诲瀷";
+ this.gridBand21.Columns.Add(this.gv_ftype);
+ this.gridBand21.Name = "gridBand21";
+ this.gridBand21.VisibleIndex = 9;
+ this.gridBand21.Width = 60;
//
// gv_ftype
//
@@ -1012,6 +1146,16 @@
this.gv_ftype.Visible = true;
this.gv_ftype.Width = 60;
//
+ // gridBand4
+ //
+ this.gridBand4.Caption = "鐗堟湰";
+ this.gridBand4.Columns.Add(this.gv_fversion);
+ this.gridBand4.MinWidth = 60;
+ this.gridBand4.Name = "gridBand4";
+ this.gridBand4.Visible = false;
+ this.gridBand4.VisibleIndex = -1;
+ this.gridBand4.Width = 60;
+ //
// gv_fversion
//
this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1024,6 +1168,28 @@
this.gv_fversion.Tag = "query_a.fversion";
this.gv_fversion.Visible = true;
this.gv_fversion.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.gridBand10,
+ this.gridBand32,
+ this.gridBand6,
+ this.gridBand15});
+ this.gridBand8.Name = "gridBand8";
+ this.gridBand8.VisibleIndex = 10;
+ this.gridBand8.Width = 300;
+ //
+ // gridBand10
+ //
+ this.gridBand10.Caption = "妫�楠屼汉鍛�";
+ this.gridBand10.Columns.Add(this.gv_fcheckBy);
+ this.gridBand10.Name = "gridBand10";
+ this.gridBand10.VisibleIndex = 0;
+ this.gridBand10.Width = 118;
//
// gv_fcheckBy
//
@@ -1038,6 +1204,14 @@
this.gv_fcheckBy.Visible = true;
this.gv_fcheckBy.Width = 118;
//
+ // gridBand32
+ //
+ this.gridBand32.Caption = "妫�楠屾棩鏈�";
+ this.gridBand32.Columns.Add(this.gv_fcheckDate);
+ this.gridBand32.Name = "gridBand32";
+ this.gridBand32.VisibleIndex = 1;
+ this.gridBand32.Width = 182;
+ //
// gv_fcheckDate
//
this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1050,6 +1224,16 @@
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
this.gv_fcheckDate.Width = 182;
+ //
+ // gridBand6
+ //
+ this.gridBand6.Caption = "鎶芥鏁伴噺";
+ this.gridBand6.Columns.Add(this.gv_checkQty);
+ this.gridBand6.MinWidth = 50;
+ this.gridBand6.Name = "gridBand6";
+ this.gridBand6.Visible = false;
+ this.gridBand6.VisibleIndex = -1;
+ this.gridBand6.Width = 50;
//
// gv_checkQty
//
@@ -1064,6 +1248,16 @@
this.gv_checkQty.Visible = true;
this.gv_checkQty.Width = 50;
//
+ // gridBand15
+ //
+ this.gridBand15.Caption = "鍒ゅ畾缁撴灉";
+ this.gridBand15.Columns.Add(this.gv_freceQty);
+ this.gridBand15.MinWidth = 50;
+ this.gridBand15.Name = "gridBand15";
+ this.gridBand15.Visible = false;
+ this.gridBand15.VisibleIndex = -1;
+ this.gridBand15.Width = 50;
+ //
// gv_freceQty
//
this.gv_freceQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1076,6 +1270,14 @@
this.gv_freceQty.Tag = "query_a.frece_qty";
this.gv_freceQty.Visible = true;
this.gv_freceQty.Width = 50;
+ //
+ // gridBand23
+ //
+ this.gridBand23.Caption = "IQC鎻愪氦鏃堕棿";
+ this.gridBand23.Columns.Add(this.gv_iqcDate);
+ this.gridBand23.Name = "gridBand23";
+ this.gridBand23.VisibleIndex = 11;
+ this.gridBand23.Width = 120;
//
// gv_iqcDate
//
@@ -1090,6 +1292,15 @@
this.gv_iqcDate.Visible = true;
this.gv_iqcDate.Width = 120;
//
+ // gridBand26
+ //
+ this.gridBand26.Caption = "鏇存柊浜�";
+ this.gridBand26.Columns.Add(this.gv_lastupdateBy);
+ this.gridBand26.MinWidth = 60;
+ this.gridBand26.Name = "gridBand26";
+ this.gridBand26.VisibleIndex = 12;
+ this.gridBand26.Width = 60;
+ //
// gv_lastupdateBy
//
this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1103,6 +1314,14 @@
this.gv_lastupdateBy.Visible = true;
this.gv_lastupdateBy.Width = 60;
//
+ // gridBand27
+ //
+ this.gridBand27.Caption = "鏇存柊鏃ユ湡";
+ this.gridBand27.Columns.Add(this.gv_lastupdateDate);
+ this.gridBand27.Name = "gridBand27";
+ this.gridBand27.VisibleIndex = 13;
+ this.gridBand27.Width = 120;
+ //
// gv_lastupdateDate
//
this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1115,6 +1334,17 @@
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
this.gv_lastupdateDate.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.Visible = false;
+ this.gridBand28.VisibleIndex = -1;
+ this.gridBand28.Width = 60;
//
// gv_states
//
@@ -1138,6 +1368,15 @@
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 = 14;
+ this.gridBand29.Width = 60;
+ //
// gv_fcovertQty
//
this.gv_fcovertQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1152,6 +1391,26 @@
this.gv_fcovertQty.Visible = true;
this.gv_fcovertQty.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.Name = "gridBand30";
+ this.gridBand30.VisibleIndex = 15;
+ this.gridBand30.Width = 200;
+ //
+ // gridBand22
+ //
+ this.gridBand22.Caption = "鏃ユ湡";
+ this.gridBand22.Columns.Add(this.gv_createDate);
+ this.gridBand22.Name = "gridBand22";
+ this.gridBand22.VisibleIndex = 0;
+ this.gridBand22.Width = 133;
+ //
// gv_createDate
//
this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1164,6 +1423,14 @@
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
this.gv_createDate.Width = 133;
+ //
+ // gridBand17
+ //
+ this.gridBand17.Caption = "寤虹珛鑰�";
+ this.gridBand17.Columns.Add(this.gv_createBy);
+ this.gridBand17.Name = "gridBand17";
+ this.gridBand17.VisibleIndex = 1;
+ this.gridBand17.Width = 67;
//
// gv_createBy
//
@@ -1178,6 +1445,14 @@
this.gv_createBy.Visible = true;
this.gv_createBy.Width = 67;
//
+ // gridBand24
+ //
+ this.gridBand24.Caption = "涓嶈壇鎻忚堪";
+ this.gridBand24.Columns.Add(this.gv_remarks);
+ this.gridBand24.Name = "gridBand24";
+ this.gridBand24.VisibleIndex = 16;
+ this.gridBand24.Width = 100;
+ //
// gv_remarks
//
this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1190,6 +1465,14 @@
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
this.gv_remarks.Width = 100;
+ //
+ // gridBand25
+ //
+ this.gridBand25.Caption = "涓嶈壇澶勭悊鏂规硶";
+ this.gridBand25.Columns.Add(this.gv_fngHandle);
+ this.gridBand25.Name = "gridBand25";
+ this.gridBand25.VisibleIndex = 17;
+ this.gridBand25.Width = 100;
//
// gv_fngHandle
//
@@ -1651,305 +1934,6 @@
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // gridBand31
- //
- this.gridBand31.Caption = "鏀舵枡缁勭粐";
- this.gridBand31.Columns.Add(this.bandedGridColumn1);
- this.gridBand31.Name = "gridBand31";
- this.gridBand31.VisibleIndex = 0;
- this.gridBand31.Width = 250;
- //
- // 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 = 1;
- this.gridBand11.Width = 50;
- //
- // 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 = 2;
- 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.Visible = false;
- this.gridBand13.VisibleIndex = -1;
- this.gridBand13.Width = 50;
- //
- // gridBand9
- //
- this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand9.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand9.Caption = "妫�楠岀粨鏋�";
- this.gridBand9.Columns.Add(this.gv_fcheckResu);
- this.gridBand9.MinWidth = 70;
- this.gridBand9.Name = "gridBand9";
- this.gridBand9.VisibleIndex = 3;
- //
- // gridBand14
- //
- this.gridBand14.Caption = "閫佹鎵规";
- this.gridBand14.Columns.Add(this.gv_lotNo);
- this.gridBand14.MinWidth = 120;
- this.gridBand14.Name = "gridBand14";
- this.gridBand14.VisibleIndex = 4;
- this.gridBand14.Width = 120;
- //
- // 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.Visible = false;
- this.gridBand2.VisibleIndex = -1;
- 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 = 0;
- this.gridBand5.Width = 136;
- //
- // gridBand3
- //
- this.gridBand3.Caption = "鐗╂枡鍚嶇О";
- this.gridBand3.Columns.Add(this.gv_boardStyle);
- this.gridBand3.MinWidth = 120;
- this.gridBand3.Name = "gridBand3";
- this.gridBand3.VisibleIndex = 1;
- this.gridBand3.Width = 164;
- //
- // 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 = "绫诲瀷";
- 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.Visible = false;
- this.gridBand4.VisibleIndex = -1;
- 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.gridBand10,
- this.gridBand32,
- this.gridBand6,
- this.gridBand15});
- this.gridBand8.MinWidth = 300;
- this.gridBand8.Name = "gridBand8";
- this.gridBand8.VisibleIndex = 10;
- this.gridBand8.Width = 300;
- //
- // gridBand10
- //
- this.gridBand10.Caption = "妫�楠屼汉鍛�";
- this.gridBand10.Columns.Add(this.gv_fcheckBy);
- this.gridBand10.MinWidth = 60;
- this.gridBand10.Name = "gridBand10";
- this.gridBand10.VisibleIndex = 0;
- this.gridBand10.Width = 118;
- //
- // gridBand32
- //
- this.gridBand32.Caption = "妫�楠屾棩鏈�";
- this.gridBand32.Columns.Add(this.gv_fcheckDate);
- this.gridBand32.Name = "gridBand32";
- this.gridBand32.VisibleIndex = 1;
- this.gridBand32.Width = 182;
- //
- // gridBand6
- //
- this.gridBand6.Caption = "鎶芥鏁伴噺";
- this.gridBand6.Columns.Add(this.gv_checkQty);
- this.gridBand6.MinWidth = 50;
- this.gridBand6.Name = "gridBand6";
- this.gridBand6.Visible = false;
- this.gridBand6.VisibleIndex = -1;
- this.gridBand6.Width = 50;
- //
- // gridBand15
- //
- this.gridBand15.Caption = "鍒ゅ畾缁撴灉";
- this.gridBand15.Columns.Add(this.gv_freceQty);
- this.gridBand15.MinWidth = 50;
- this.gridBand15.Name = "gridBand15";
- this.gridBand15.Visible = false;
- this.gridBand15.VisibleIndex = -1;
- 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 = 11;
- 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 = 12;
- 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 = 13;
- 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.Visible = false;
- this.gridBand28.VisibleIndex = -1;
- 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 = 14;
- 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 = 15;
- 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 = 133;
- //
- // 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 = 67;
- //
- // gridBand24
- //
- this.gridBand24.Caption = "涓嶈壇鎻忚堪";
- this.gridBand24.Columns.Add(this.gv_remarks);
- this.gridBand24.MinWidth = 100;
- this.gridBand24.Name = "gridBand24";
- this.gridBand24.VisibleIndex = 16;
- 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 = 17;
- 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 0629613..aa84f37 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -1,3 +1,4 @@
+using DevExpress.XtraRichEdit.Model;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -21,7 +22,7 @@
public Frm_MesQaItemsDetect01()
{
InitializeComponent();
- this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+ //this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
@@ -30,7 +31,6 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
@@ -282,14 +282,16 @@
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
- if (_rtn.rtnCode > 0)
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- // getModel(lbGuid.Text.Trim());
+ getModel(lbGuid.Text.Trim());
}
- else
- getPageList(this.pageBar1.CurrentPage);
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ int _inFieldValue = 1;
+ UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
@@ -377,6 +379,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
+ toolBarMenu1.currentAction = "edit";
string rowGuid = "", rowName = "";
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
if (string.IsNullOrEmpty(rowGuid))
@@ -385,7 +388,17 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid);
+ }
+ else
+ {
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+ }
}
/// <summary>
/// 鏂板浜嬩欢
@@ -470,6 +483,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -526,6 +540,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
gvMx1.FocusedRowHandle = _currentHandle5;
ucUpFile1.parentGuid = lbGuid.Text.Trim();
var row = gvMx1.GetDataRow(_currentHandle5);
@@ -588,6 +603,7 @@
gcMx3.BindingContext = new BindingContext();
gcMx3.DataSource = dt;
gcMx3.ForceInitialize();
+ gvMx3.BestFitColumns();
}
else
{
@@ -618,6 +634,7 @@
gcMx2.BindingContext = new BindingContext();
gcMx2.DataSource = dt;
gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 8f15e20..221e79e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -138,7 +138,7 @@
this.panel1 = new System.Windows.Forms.Panel();
this.txt_lotNo1 = new DevExpress.XtraEditors.TextEdit();
this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
- this.txt_qualityAudit = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_modify1Flag = new DevExpress.XtraEditors.CheckEdit();
this.lb_modify1Flag = new DevExpress.XtraEditors.LabelControl();
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
this.txt_fcovertQty = new DevExpress.XtraEditors.TextEdit();
@@ -192,7 +192,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcovertQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
@@ -288,7 +288,7 @@
this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
this.gvMx1fcheckItem.FieldName = "fcheckItem";
- this.gvMx1fcheckItem.MinWidth = 120;
+ this.gvMx1fcheckItem.MinWidth = 50;
this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
this.gvMx1fcheckItem.Tag = "query_a.fcheck_item";
this.gvMx1fcheckItem.Visible = true;
@@ -301,7 +301,7 @@
this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
this.gvMx1fcheckTool.FieldName = "fcheckTool";
- this.gvMx1fcheckTool.MinWidth = 100;
+ this.gvMx1fcheckTool.MinWidth = 50;
this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
this.gvMx1fcheckTool.Tag = "query_a.fcheck_tool";
this.gvMx1fcheckTool.Visible = true;
@@ -314,7 +314,7 @@
this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
- this.gvMx1fcheckItemDesc.MinWidth = 120;
+ this.gvMx1fcheckItemDesc.MinWidth = 50;
this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
this.gvMx1fcheckItemDesc.Visible = true;
@@ -327,7 +327,7 @@
this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
this.gvMx1fspecRequ.FieldName = "fspecRequ";
- this.gvMx1fspecRequ.MinWidth = 120;
+ this.gvMx1fspecRequ.MinWidth = 50;
this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
this.gvMx1fspecRequ.Visible = true;
@@ -422,7 +422,7 @@
this.gvMx1fcheckResu.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gvMx1fcheckResu.FieldName = "fcheckResu";
- this.gvMx1fcheckResu.MinWidth = 80;
+ this.gvMx1fcheckResu.MinWidth = 50;
this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
this.gvMx1fcheckResu.Visible = true;
@@ -435,7 +435,7 @@
this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
this.gvMx1fngRate.FieldName = "fngRateName";
- this.gvMx1fngRate.MinWidth = 80;
+ this.gvMx1fngRate.MinWidth = 50;
this.gvMx1fngRate.Name = "gvMx1fngRate";
this.gvMx1fngRate.Tag = "query_a.fng_rate";
this.gvMx1fngRate.Visible = true;
@@ -461,7 +461,7 @@
this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�";
this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
- this.gvMx1sampleSizeNo.MinWidth = 200;
+ this.gvMx1sampleSizeNo.MinWidth = 50;
this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
this.gvMx1sampleSizeNo.Visible = true;
@@ -474,7 +474,7 @@
this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
- this.gvMx1fcheckLevel.MinWidth = 200;
+ this.gvMx1fcheckLevel.MinWidth = 50;
this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
this.gvMx1fcheckLevel.Visible = true;
@@ -487,7 +487,7 @@
this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
this.gvMx1facLevel.FieldName = "facLevel";
- this.gvMx1facLevel.MinWidth = 200;
+ this.gvMx1facLevel.MinWidth = 50;
this.gvMx1facLevel.Name = "gvMx1facLevel";
this.gvMx1facLevel.Tag = "query_a.fac_level";
this.gvMx1facLevel.Visible = true;
@@ -793,7 +793,7 @@
//
this.gridColumn19.Caption = "鏀舵枡缁勭粐";
this.gridColumn19.FieldName = "receivingOrg";
- this.gridColumn19.MinWidth = 250;
+ this.gridColumn19.MinWidth = 50;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Tag = "org.fnamber";
this.gridColumn19.Visible = true;
@@ -835,6 +835,7 @@
this.gridColumn13.MinWidth = 50;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.OptionsColumn.ReadOnly = true;
+ this.gridColumn13.Tag = "query_a.fsubmit";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 3;
this.gridColumn13.Width = 50;
@@ -860,7 +861,7 @@
this.gv_lotNo.AppearanceCell.Options.UseFont = true;
this.gv_lotNo.Caption = "閫佹鎵规";
this.gv_lotNo.FieldName = "lotNo";
- this.gv_lotNo.MinWidth = 150;
+ this.gv_lotNo.MinWidth = 50;
this.gv_lotNo.Name = "gv_lotNo";
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
@@ -874,7 +875,7 @@
this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
this.gv_releaseNo.FieldName = "releaseNo";
- this.gv_releaseNo.MinWidth = 150;
+ this.gv_releaseNo.MinWidth = 50;
this.gv_releaseNo.Name = "gv_releaseNo";
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
@@ -888,7 +889,7 @@
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
this.gv_itemNo.FieldName = "itemNo2";
- this.gv_itemNo.MinWidth = 100;
+ this.gv_itemNo.MinWidth = 50;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
@@ -902,7 +903,7 @@
this.gv_boardStyle.AppearanceCell.Options.UseFont = true;
this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О";
this.gv_boardStyle.FieldName = "itemName";
- this.gv_boardStyle.MinWidth = 200;
+ this.gv_boardStyle.MinWidth = 50;
this.gv_boardStyle.Name = "gv_boardStyle";
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
@@ -914,7 +915,7 @@
//
this.gridColumn14.Caption = "鐗╂枡瑙勬牸";
this.gridColumn14.FieldName = "itemModel";
- this.gridColumn14.MinWidth = 200;
+ this.gridColumn14.MinWidth = 50;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
@@ -927,7 +928,7 @@
this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
this.gv_fbatchQty.Caption = "閲囪喘鏁伴噺";
this.gv_fbatchQty.FieldName = "fbatchQty";
- this.gv_fbatchQty.MinWidth = 80;
+ this.gv_fbatchQty.MinWidth = 50;
this.gv_fbatchQty.Name = "gv_fbatchQty";
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
@@ -941,7 +942,7 @@
this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
this.gv_fcovertQty.Caption = "杞崲鏁伴噺";
this.gv_fcovertQty.FieldName = "fcovertQty";
- this.gv_fcovertQty.MinWidth = 100;
+ this.gv_fcovertQty.MinWidth = 50;
this.gv_fcovertQty.Name = "gv_fcovertQty";
this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
@@ -956,7 +957,7 @@
this.gv_lifnr.AppearanceCell.Options.UseFont = true;
this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
this.gv_lifnr.FieldName = "suppName";
- this.gv_lifnr.MinWidth = 250;
+ this.gv_lifnr.MinWidth = 50;
this.gv_lifnr.Name = "gv_lifnr";
this.gv_lifnr.OptionsColumn.AllowEdit = false;
this.gv_lifnr.Tag = "query_a.lifnr";
@@ -970,7 +971,7 @@
this.gv_remarks.AppearanceCell.Options.UseFont = true;
this.gv_remarks.Caption = "涓嶈壇鎻忚堪";
this.gv_remarks.FieldName = "fngDesc";
- this.gv_remarks.MinWidth = 150;
+ this.gv_remarks.MinWidth = 50;
this.gv_remarks.Name = "gv_remarks";
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
@@ -984,7 +985,7 @@
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 100;
+ this.gv_createBy.MinWidth = 50;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
@@ -998,7 +999,7 @@
this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
this.gv_fcheckBy.FieldName = "fcheckBy";
- this.gv_fcheckBy.MinWidth = 100;
+ this.gv_fcheckBy.MinWidth = 50;
this.gv_fcheckBy.Name = "gv_fcheckBy";
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
@@ -1010,7 +1011,7 @@
//
this.gridColumn15.Caption = "鎻愪氦妫�楠屾棩鏈�";
this.gridColumn15.FieldName = "date01";
- this.gridColumn15.MinWidth = 180;
+ this.gridColumn15.MinWidth = 50;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.OptionsColumn.ReadOnly = true;
this.gridColumn15.Visible = true;
@@ -1023,7 +1024,7 @@
this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
this.gv_fcheckDate.FieldName = "fcheckDate";
- this.gv_fcheckDate.MinWidth = 180;
+ this.gv_fcheckDate.MinWidth = 50;
this.gv_fcheckDate.Name = "gv_fcheckDate";
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
@@ -1037,7 +1038,7 @@
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃ユ湡";
this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 180;
+ this.gv_createDate.MinWidth = 50;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
@@ -1051,7 +1052,7 @@
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏇存柊浜�";
this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 100;
+ this.gv_lastupdateBy.MinWidth = 50;
this.gv_lastupdateBy.Name = "gv_lastupdateBy";
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
@@ -1065,7 +1066,7 @@
this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateDate.Caption = "鏇存柊鏃ユ湡";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 180;
+ this.gv_lastupdateDate.MinWidth = 50;
this.gv_lastupdateDate.Name = "gv_lastupdateDate";
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
@@ -1079,7 +1080,7 @@
this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
this.gv_fngHandle.Caption = "涓嶈壇澶勭悊鏂规硶";
this.gv_fngHandle.FieldName = "fngHandle";
- this.gv_fngHandle.MinWidth = 100;
+ this.gv_fngHandle.MinWidth = 50;
this.gv_fngHandle.Name = "gv_fngHandle";
this.gv_fngHandle.OptionsColumn.AllowEdit = false;
this.gv_fngHandle.Tag = "query_a.fng_handle";
@@ -1093,7 +1094,7 @@
this.gv_iqcDate.AppearanceCell.Options.UseFont = true;
this.gv_iqcDate.Caption = "IQC鎻愪氦鏃堕棿";
this.gv_iqcDate.FieldName = "iqcDate";
- this.gv_iqcDate.MinWidth = 180;
+ this.gv_iqcDate.MinWidth = 50;
this.gv_iqcDate.Name = "gv_iqcDate";
this.gv_iqcDate.OptionsColumn.AllowEdit = false;
this.gv_iqcDate.Tag = "query_a.iqc_date";
@@ -1115,7 +1116,7 @@
//
this.gridColumn17.Caption = "瀹℃牳鏃堕棿";
this.gridColumn17.FieldName = "modify1Date";
- this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.MinWidth = 50;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 24;
@@ -1331,7 +1332,7 @@
this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.txt_lotNo1);
this.panel1.Controls.Add(this.labelControl4);
- this.panel1.Controls.Add(this.txt_qualityAudit);
+ this.panel1.Controls.Add(this.txt_modify1Flag);
this.panel1.Controls.Add(this.lb_modify1Flag);
this.panel1.Controls.Add(this.labelControl3);
this.panel1.Controls.Add(this.txt_fcovertQty);
@@ -1390,14 +1391,14 @@
this.labelControl4.TabIndex = 809;
this.labelControl4.Text = "澶囨敞";
//
- // txt_qualityAudit
+ // txt_modify1Flag
//
- this.txt_qualityAudit.Enabled = false;
- this.txt_qualityAudit.Location = new System.Drawing.Point(950, 12);
- this.txt_qualityAudit.Name = "txt_qualityAudit";
- this.txt_qualityAudit.Properties.Caption = "";
- this.txt_qualityAudit.Size = new System.Drawing.Size(30, 24);
- this.txt_qualityAudit.TabIndex = 808;
+ this.txt_modify1Flag.Enabled = false;
+ this.txt_modify1Flag.Location = new System.Drawing.Point(950, 12);
+ this.txt_modify1Flag.Name = "txt_modify1Flag";
+ this.txt_modify1Flag.Properties.Caption = "";
+ this.txt_modify1Flag.Size = new System.Drawing.Size(30, 24);
+ this.txt_modify1Flag.TabIndex = 808;
//
// lb_modify1Flag
//
@@ -1632,7 +1633,7 @@
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcovertQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
@@ -1741,7 +1742,7 @@
private DevExpress.XtraEditors.TextEdit txt_suppName;
private DevExpress.XtraEditors.LabelControl labelControl3;
private DevExpress.XtraEditors.TextEdit txt_fcovertQty;
- private DevExpress.XtraEditors.CheckEdit txt_qualityAudit;
+ private DevExpress.XtraEditors.CheckEdit txt_modify1Flag;
private DevExpress.XtraEditors.LabelControl lb_modify1Flag;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index 4a0369e..2829c7c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -31,7 +31,6 @@
toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
@@ -177,15 +176,26 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
+ toolBarMenu1.currentAction = "edit";
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid);
+ }
+ else
+ {
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+ }
}
private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
{
@@ -285,6 +295,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -341,6 +352,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
ucUpFile1.parentGuid = lbGuid.Text.Trim();
getList12(dt.Rows[0]["guid"].ToString());
}
@@ -425,6 +437,7 @@
gcMx2.BindingContext = new BindingContext();
gcMx2.DataSource = dt;
gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
}
catch (Exception ex)
{
@@ -548,7 +561,8 @@
{
if (txt_fcheckResu.Text == "涓嶅悎鏍�")
{
- if (txt_fngHandle.Text.Trim().Length == 0) {
+ if (txt_fngHandle.Text.Trim().Length == 0)
+ {
MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃惰閫夋嫨澶勭悊鏂瑰紡锛�");
return;
}
@@ -566,12 +580,32 @@
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
- if (_rtn.rtnCode > 0)
+ //if (_rtn.rtnCode > 0)
+ //{
+ // if (xtraTabControl1.SelectedTabPageIndex == 1)
+ // getModel(lbGuid.Text.Trim());
+ // else
+ // getPageList(this.pageBar1.CurrentPage);
+ //}
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim());
+ if (_inFieldValue >= 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "modifyFlagTxt", "modify1By", "modify1Date", picCheckBox, this, _inFieldValue.ToString());
+ }
else
- getPageList(this.pageBar1.CurrentPage);
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim());
+ else
+ getPageList(this.pageBar1.CurrentPage);
+ }
}
}
catch (Exception ex)
@@ -579,6 +613,5 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
index 11ce707..5e5952c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.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 editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ 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();
this.gvMx1lookupName = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -147,10 +147,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", 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);
@@ -274,6 +274,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.AllowEdit = false;
+ this.gridColumn5.Tag = "query_a.LOOKUP_TYPE_CODE";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 2;
this.gridColumn5.Width = 94;
@@ -285,6 +286,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.AllowEdit = false;
+ this.gridColumn4.Tag = "query_a.LOOKUP_TYPE_CODE";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 3;
this.gridColumn4.Width = 94;
@@ -296,6 +298,7 @@
this.gridColumn1.MinWidth = 250;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
+ this.gridColumn1.Tag = "query_a.LOOKUP_TYPE_CODE";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 4;
this.gridColumn1.Width = 250;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 6f837fc..124994b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -77,20 +77,39 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
+ this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_fType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_urgentFlag = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_fstatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_depotsCode = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridColumn4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_suppNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_remark = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_checkUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -116,25 +135,6 @@
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridBand19 = 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.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -567,9 +567,9 @@
this.lb_ischeck.Appearance.Options.UseFont = true;
this.lb_ischeck.Location = new System.Drawing.Point(631, 20);
this.lb_ischeck.Name = "lb_ischeck";
- this.lb_ischeck.Size = new System.Drawing.Size(102, 21);
+ this.lb_ischeck.Size = new System.Drawing.Size(68, 21);
this.lb_ischeck.TabIndex = 319;
- this.lb_ischeck.Text = "鏄惁鎻愪氦妫�楠�";
+ this.lb_ischeck.Text = "鎻愪氦妫�楠�";
//
// lb_paperBillNo
//
@@ -682,6 +682,14 @@
this.gridView1.OptionsView.ShowColumnHeaders = false;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridBand19
+ //
+ this.gridBand19.Caption = "鏀舵枡缁勭粐";
+ this.gridBand19.Columns.Add(this.bandedGridColumn1);
+ this.gridBand19.Name = "gridBand19";
+ this.gridBand19.VisibleIndex = 0;
+ this.gridBand19.Width = 61;
+ //
// bandedGridColumn1
//
this.bandedGridColumn1.Caption = "鏀舵枡缁勭粐";
@@ -693,6 +701,15 @@
this.bandedGridColumn1.Tag = "org.fnamber";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.Width = 61;
+ //
+ // gridBand1
+ //
+ this.gridBand1.Caption = "濮斿";
+ this.gridBand1.Columns.Add(this.gv_fType);
+ this.gridBand1.MinWidth = 50;
+ this.gridBand1.Name = "gridBand1";
+ this.gridBand1.VisibleIndex = 1;
+ this.gridBand1.Width = 68;
//
// gv_fType
//
@@ -709,6 +726,15 @@
this.gv_fType.Visible = true;
this.gv_fType.Width = 68;
//
+ // gridBand2
+ //
+ this.gridBand2.Caption = "鎬ユ枡";
+ this.gridBand2.Columns.Add(this.gv_urgentFlag);
+ this.gridBand2.MinWidth = 50;
+ this.gridBand2.Name = "gridBand2";
+ this.gridBand2.VisibleIndex = 2;
+ this.gridBand2.Width = 68;
+ //
// gv_urgentFlag
//
this.gv_urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -721,6 +747,17 @@
this.gv_urgentFlag.UnboundDataType = typeof(bool);
this.gv_urgentFlag.Visible = true;
this.gv_urgentFlag.Width = 68;
+ //
+ // gridBand3
+ //
+ this.gridBand3.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand3.Caption = "鎻愪氦妫�楠�";
+ this.gridBand3.Columns.Add(this.gv_fstatus);
+ this.gridBand3.MinWidth = 50;
+ this.gridBand3.Name = "gridBand3";
+ this.gridBand3.VisibleIndex = 3;
+ this.gridBand3.Width = 68;
//
// gv_fstatus
//
@@ -735,6 +772,15 @@
this.gv_fstatus.Visible = true;
this.gv_fstatus.Width = 68;
//
+ // gridBand4
+ //
+ this.gridBand4.Caption = "鍏ュ簱";
+ this.gridBand4.Columns.Add(this.gridColumn2);
+ this.gridBand4.MinWidth = 50;
+ this.gridBand4.Name = "gridBand4";
+ this.gridBand4.VisibleIndex = 4;
+ this.gridBand4.Width = 68;
+ //
// gridColumn2
//
this.gridColumn2.Caption = "鍏ュ簱";
@@ -745,6 +791,15 @@
this.gridColumn2.UnboundDataType = typeof(bool);
this.gridColumn2.Visible = true;
this.gridColumn2.Width = 68;
+ //
+ // gridBand5
+ //
+ this.gridBand5.Caption = "鍒拌揣鍗曞彿";
+ this.gridBand5.Columns.Add(this.gv_billNo);
+ this.gridBand5.MinWidth = 50;
+ this.gridBand5.Name = "gridBand5";
+ this.gridBand5.VisibleIndex = 5;
+ this.gridBand5.Width = 68;
//
// gv_billNo
//
@@ -758,6 +813,27 @@
this.gv_billNo.Visible = true;
this.gv_billNo.Width = 68;
//
+ // 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.gridBand7,
+ this.gridBand8});
+ this.gridBand6.Name = "gridBand6";
+ this.gridBand6.VisibleIndex = 6;
+ this.gridBand6.Width = 282;
+ //
+ // gridBand7
+ //
+ this.gridBand7.Caption = "鍒涘缓浜哄憳";
+ this.gridBand7.Columns.Add(this.gv_createBy);
+ this.gridBand7.MinWidth = 50;
+ this.gridBand7.Name = "gridBand7";
+ this.gridBand7.VisibleIndex = 0;
+ this.gridBand7.Width = 89;
+ //
// gv_createBy
//
this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -769,6 +845,15 @@
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.Width = 89;
+ //
+ // gridBand8
+ //
+ this.gridBand8.Caption = "鍒涘缓鏃ユ湡";
+ this.gridBand8.Columns.Add(this.gv_createDate);
+ this.gridBand8.MinWidth = 50;
+ this.gridBand8.Name = "gridBand8";
+ this.gridBand8.VisibleIndex = 1;
+ this.gridBand8.Width = 193;
//
// gv_createDate
//
@@ -782,6 +867,27 @@
this.gv_createDate.Visible = true;
this.gv_createDate.Width = 193;
//
+ // gridBand9
+ //
+ this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand9.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand9.Caption = "鏀惰揣淇℃伅";
+ this.gridBand9.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand10,
+ this.gridBand11});
+ this.gridBand9.Name = "gridBand9";
+ this.gridBand9.VisibleIndex = 7;
+ this.gridBand9.Width = 215;
+ //
+ // gridBand10
+ //
+ this.gridBand10.Caption = "浠撳簱缂栧彿";
+ this.gridBand10.Columns.Add(this.gv_depotsCode);
+ this.gridBand10.MinWidth = 50;
+ this.gridBand10.Name = "gridBand10";
+ this.gridBand10.VisibleIndex = 0;
+ this.gridBand10.Width = 87;
+ //
// gv_depotsCode
//
this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -794,6 +900,15 @@
this.gv_depotsCode.Visible = true;
this.gv_depotsCode.Width = 87;
//
+ // gridBand11
+ //
+ this.gridBand11.Caption = "浠撳簱鍚嶇О";
+ this.gridBand11.Columns.Add(this.gridColumn4);
+ this.gridBand11.MinWidth = 50;
+ this.gridBand11.Name = "gridBand11";
+ this.gridBand11.VisibleIndex = 1;
+ this.gridBand11.Width = 128;
+ //
// gridColumn4
//
this.gridColumn4.Caption = "鏀惰揣浠撳簱鍚嶇О";
@@ -802,6 +917,27 @@
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.Visible = true;
this.gridColumn4.Width = 128;
+ //
+ // gridBand13
+ //
+ this.gridBand13.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand13.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand13.Caption = "渚涘簲鍟嗕俊鎭�";
+ this.gridBand13.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand12,
+ this.gridBand14});
+ this.gridBand13.Name = "gridBand13";
+ this.gridBand13.VisibleIndex = 8;
+ this.gridBand13.Width = 139;
+ //
+ // gridBand12
+ //
+ this.gridBand12.Caption = "渚涘簲鍟嗙紪鍙�";
+ this.gridBand12.Columns.Add(this.gv_suppNo);
+ this.gridBand12.MinWidth = 50;
+ this.gridBand12.Name = "gridBand12";
+ this.gridBand12.VisibleIndex = 0;
+ this.gridBand12.Width = 69;
//
// gv_suppNo
//
@@ -815,6 +951,14 @@
this.gv_suppNo.Visible = true;
this.gv_suppNo.Width = 69;
//
+ // gridBand14
+ //
+ this.gridBand14.Caption = "渚涘簲鍟嗗悕绉�";
+ this.gridBand14.Columns.Add(this.gridColumn5);
+ this.gridBand14.MinWidth = 50;
+ this.gridBand14.Name = "gridBand14";
+ this.gridBand14.VisibleIndex = 1;
+ //
// gridColumn5
//
this.gridColumn5.Caption = "渚涘簲鍟嗗悕绉�";
@@ -823,6 +967,15 @@
this.gridColumn5.OptionsColumn.AllowEdit = false;
this.gridColumn5.Visible = true;
this.gridColumn5.Width = 70;
+ //
+ // gridBand16
+ //
+ this.gridBand16.Caption = "澶囨敞";
+ this.gridBand16.Columns.Add(this.gv_remark);
+ this.gridBand16.MinWidth = 50;
+ this.gridBand16.Name = "gridBand16";
+ this.gridBand16.VisibleIndex = 9;
+ this.gridBand16.Width = 90;
//
// gv_remark
//
@@ -836,6 +989,27 @@
this.gv_remark.Visible = true;
this.gv_remark.Width = 90;
//
+ // 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.gridBand15,
+ this.gridBand17});
+ this.gridBand18.Name = "gridBand18";
+ this.gridBand18.VisibleIndex = 10;
+ this.gridBand18.Width = 164;
+ //
+ // gridBand15
+ //
+ this.gridBand15.Caption = "鎻愪氦浜�";
+ this.gridBand15.Columns.Add(this.gv_checkUser);
+ this.gridBand15.MinWidth = 60;
+ this.gridBand15.Name = "gridBand15";
+ this.gridBand15.VisibleIndex = 0;
+ this.gridBand15.Width = 100;
+ //
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -847,6 +1021,15 @@
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
this.gv_checkUser.Width = 100;
+ //
+ // gridBand17
+ //
+ this.gridBand17.Caption = "鎻愪氦鏃ユ湡";
+ this.gridBand17.Columns.Add(this.gv_checkDate);
+ this.gridBand17.MinWidth = 50;
+ this.gridBand17.Name = "gridBand17";
+ this.gridBand17.VisibleIndex = 1;
+ this.gridBand17.Width = 64;
//
// gv_checkDate
//
@@ -1015,7 +1198,7 @@
// txt_fstatus
//
this.txt_fstatus.Enabled = false;
- this.txt_fstatus.Location = new System.Drawing.Point(739, 18);
+ this.txt_fstatus.Location = new System.Drawing.Point(709, 18);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "";
this.txt_fstatus.Size = new System.Drawing.Size(47, 24);
@@ -1116,189 +1299,6 @@
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // gridBand19
- //
- this.gridBand19.Caption = "鏀舵枡缁勭粐";
- this.gridBand19.Columns.Add(this.bandedGridColumn1);
- this.gridBand19.Name = "gridBand19";
- this.gridBand19.VisibleIndex = 0;
- this.gridBand19.Width = 61;
- //
- // gridBand1
- //
- this.gridBand1.Caption = "濮斿";
- this.gridBand1.Columns.Add(this.gv_fType);
- this.gridBand1.MinWidth = 50;
- this.gridBand1.Name = "gridBand1";
- this.gridBand1.VisibleIndex = 1;
- this.gridBand1.Width = 68;
- //
- // gridBand2
- //
- this.gridBand2.Caption = "鎬ユ枡";
- this.gridBand2.Columns.Add(this.gv_urgentFlag);
- this.gridBand2.MinWidth = 50;
- this.gridBand2.Name = "gridBand2";
- this.gridBand2.VisibleIndex = 2;
- this.gridBand2.Width = 68;
- //
- // gridBand3
- //
- this.gridBand3.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand3.Caption = "鎻愪氦妫�楠�";
- this.gridBand3.Columns.Add(this.gv_fstatus);
- this.gridBand3.MinWidth = 50;
- this.gridBand3.Name = "gridBand3";
- this.gridBand3.VisibleIndex = 3;
- this.gridBand3.Width = 68;
- //
- // gridBand4
- //
- this.gridBand4.Caption = "鍏ュ簱";
- this.gridBand4.Columns.Add(this.gridColumn2);
- this.gridBand4.MinWidth = 50;
- this.gridBand4.Name = "gridBand4";
- this.gridBand4.VisibleIndex = 4;
- this.gridBand4.Width = 68;
- //
- // gridBand5
- //
- this.gridBand5.Caption = "鍒拌揣鍗曞彿";
- this.gridBand5.Columns.Add(this.gv_billNo);
- this.gridBand5.MinWidth = 50;
- this.gridBand5.Name = "gridBand5";
- this.gridBand5.VisibleIndex = 5;
- this.gridBand5.Width = 68;
- //
- // 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.gridBand7,
- this.gridBand8});
- this.gridBand6.Name = "gridBand6";
- this.gridBand6.VisibleIndex = 6;
- this.gridBand6.Width = 282;
- //
- // gridBand7
- //
- this.gridBand7.Caption = "鍒涘缓浜哄憳";
- this.gridBand7.Columns.Add(this.gv_createBy);
- this.gridBand7.MinWidth = 50;
- this.gridBand7.Name = "gridBand7";
- this.gridBand7.VisibleIndex = 0;
- this.gridBand7.Width = 89;
- //
- // gridBand8
- //
- this.gridBand8.Caption = "鍒涘缓鏃ユ湡";
- this.gridBand8.Columns.Add(this.gv_createDate);
- this.gridBand8.MinWidth = 50;
- this.gridBand8.Name = "gridBand8";
- this.gridBand8.VisibleIndex = 1;
- this.gridBand8.Width = 193;
- //
- // gridBand9
- //
- this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand9.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand9.Caption = "鏀惰揣淇℃伅";
- this.gridBand9.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand10,
- this.gridBand11});
- this.gridBand9.Name = "gridBand9";
- this.gridBand9.VisibleIndex = 7;
- this.gridBand9.Width = 215;
- //
- // gridBand10
- //
- this.gridBand10.Caption = "浠撳簱缂栧彿";
- this.gridBand10.Columns.Add(this.gv_depotsCode);
- this.gridBand10.MinWidth = 50;
- this.gridBand10.Name = "gridBand10";
- this.gridBand10.VisibleIndex = 0;
- this.gridBand10.Width = 87;
- //
- // gridBand11
- //
- this.gridBand11.Caption = "浠撳簱鍚嶇О";
- this.gridBand11.Columns.Add(this.gridColumn4);
- this.gridBand11.MinWidth = 50;
- this.gridBand11.Name = "gridBand11";
- this.gridBand11.VisibleIndex = 1;
- this.gridBand11.Width = 128;
- //
- // gridBand13
- //
- this.gridBand13.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand13.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand13.Caption = "渚涘簲鍟嗕俊鎭�";
- this.gridBand13.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand12,
- this.gridBand14});
- this.gridBand13.Name = "gridBand13";
- this.gridBand13.VisibleIndex = 8;
- this.gridBand13.Width = 139;
- //
- // gridBand12
- //
- this.gridBand12.Caption = "渚涘簲鍟嗙紪鍙�";
- this.gridBand12.Columns.Add(this.gv_suppNo);
- this.gridBand12.MinWidth = 50;
- this.gridBand12.Name = "gridBand12";
- this.gridBand12.VisibleIndex = 0;
- this.gridBand12.Width = 69;
- //
- // gridBand14
- //
- this.gridBand14.Caption = "渚涘簲鍟嗗悕绉�";
- this.gridBand14.Columns.Add(this.gridColumn5);
- this.gridBand14.MinWidth = 50;
- this.gridBand14.Name = "gridBand14";
- this.gridBand14.VisibleIndex = 1;
- //
- // gridBand16
- //
- this.gridBand16.Caption = "澶囨敞";
- this.gridBand16.Columns.Add(this.gv_remark);
- this.gridBand16.MinWidth = 50;
- this.gridBand16.Name = "gridBand16";
- this.gridBand16.VisibleIndex = 9;
- this.gridBand16.Width = 90;
- //
- // 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.gridBand15,
- this.gridBand17});
- this.gridBand18.Name = "gridBand18";
- this.gridBand18.VisibleIndex = 10;
- this.gridBand18.Width = 164;
- //
- // gridBand15
- //
- this.gridBand15.Caption = "鎻愪氦浜�";
- this.gridBand15.Columns.Add(this.gv_checkUser);
- this.gridBand15.MinWidth = 60;
- this.gridBand15.Name = "gridBand15";
- this.gridBand15.VisibleIndex = 0;
- this.gridBand15.Width = 100;
- //
- // gridBand17
- //
- this.gridBand17.Caption = "鎻愪氦鏃ユ湡";
- this.gridBand17.Columns.Add(this.gv_checkDate);
- this.gridBand17.MinWidth = 50;
- this.gridBand17.Name = "gridBand17";
- this.gridBand17.VisibleIndex = 1;
- this.gridBand17.Width = 64;
//
// Frm_MesInvItemArn
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 4a8ecd8..7e89e88 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -379,7 +379,8 @@
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
- lbGuid.Text = _rtn.rtnData;
+ lbGuid.Text = _rtn.rtnData.outGuid;
+ txt_billNo.Text= _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
@@ -578,7 +579,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
}
@@ -608,12 +608,16 @@
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
- if (_rtn.rtnCode > 0)
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
getModel(lbGuid.Text.Trim());
- else
- getPageList(this.pageBar1.CurrentPage);
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ int _inFieldValue = (_meth == "EditModelSubmit" ? 1 : -1);
+ UtilityHelper.SetCheckIco(gridView1, "fstatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index d6b0c51..f01da9c 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -262,6 +262,8 @@
private void BtnFjianYan_ItemClick(object sender, ItemClickEventArgs e)
{
+ bool bl = _isCk(0);
+ if (bl) return;
if (btnFjianYanClick != null)
btnFjianYanClick(this, e);
else
--
Gitblit v1.9.3