From b437a00db77cee8b767d30486e7935b57242a236 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 04 一月 2025 22:04:22 +0800
Subject: [PATCH] 仓库细节
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 22
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 41
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx | 25
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs | 4
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 700 +++++++++++------------
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 651 ++++++++++----------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 223 +++----
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 12
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 74 +-
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 2
12 files changed, 850 insertions(+), 908 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 1386a5a..7e41584 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -29,9 +29,7 @@
/// </summary>
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01));
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -92,63 +90,33 @@
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();
@@ -179,7 +147,6 @@
this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit();
this.txt_lotNo1 = new DevExpress.XtraEditors.TextEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
- this.txt_qualityAudit = new DevExpress.XtraEditors.CheckEdit();
this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
this.lb_itemModel = new DevExpress.XtraEditors.LabelControl();
@@ -189,11 +156,39 @@
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.lb_fsubmit = new DevExpress.XtraEditors.LabelControl();
- this.lb_modify1Flag = new DevExpress.XtraEditors.LabelControl();
this.lb_lotNo = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
+ 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();
@@ -234,7 +229,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
@@ -392,12 +386,12 @@
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
- this.gvMx1fstand.MinWidth = 50;
+ this.gvMx1fstand.MinWidth = 60;
this.gvMx1fstand.Name = "gvMx1fstand";
this.gvMx1fstand.Tag = "query_a.fstand";
this.gvMx1fstand.Visible = true;
this.gvMx1fstand.VisibleIndex = 5;
- this.gvMx1fstand.Width = 50;
+ this.gvMx1fstand.Width = 70;
//
// gvMx1fdownAllow
//
@@ -852,14 +846,6 @@
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 = "鏀舵枡缁勭粐";
@@ -869,17 +855,6 @@
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
//
@@ -892,17 +867,6 @@
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
//
@@ -918,18 +882,6 @@
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);
@@ -944,17 +896,6 @@
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.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);
@@ -967,15 +908,6 @@
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.MinWidth = 120;
- this.gridBand14.Name = "gridBand14";
- this.gridBand14.VisibleIndex = 4;
- this.gridBand14.Width = 120;
//
// gv_lotNo
//
@@ -990,15 +922,6 @@
this.gv_lotNo.Visible = true;
this.gv_lotNo.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;
- //
// gv_releaseNo
//
this.gv_releaseNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1012,30 +935,6 @@
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.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;
- //
// gv_itemId
//
this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1047,15 +946,6 @@
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.MinWidth = 100;
- this.gridBand5.Name = "gridBand5";
- this.gridBand5.VisibleIndex = 0;
- this.gridBand5.Width = 136;
//
// gv_itemNo
//
@@ -1070,15 +960,6 @@
this.gv_itemNo.Visible = true;
this.gv_itemNo.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;
- //
// gv_boardStyle
//
this.gv_boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1091,15 +972,6 @@
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.MinWidth = 200;
- this.gridBand19.Name = "gridBand19";
- this.gridBand19.VisibleIndex = 7;
- this.gridBand19.Width = 200;
//
// gv_lifnr
//
@@ -1114,15 +986,6 @@
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);
@@ -1135,17 +998,6 @@
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.MinWidth = 60;
- this.gridBand21.Name = "gridBand21";
- this.gridBand21.VisibleIndex = 9;
- this.gridBand21.Width = 60;
//
// gv_ftype
//
@@ -1160,15 +1012,6 @@
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.VisibleIndex = 10;
- this.gridBand4.Width = 60;
- //
// gv_fversion
//
this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1181,30 +1024,6 @@
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.MinWidth = 300;
- this.gridBand8.Name = "gridBand8";
- this.gridBand8.VisibleIndex = 11;
- 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;
//
// gv_fcheckBy
//
@@ -1219,14 +1038,6 @@
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);
@@ -1239,16 +1050,6 @@
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
//
@@ -1263,16 +1064,6 @@
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);
@@ -1285,15 +1076,6 @@
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.MinWidth = 120;
- this.gridBand23.Name = "gridBand23";
- this.gridBand23.VisibleIndex = 12;
- this.gridBand23.Width = 120;
//
// gv_iqcDate
//
@@ -1308,15 +1090,6 @@
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 = 13;
- this.gridBand26.Width = 60;
- //
// gv_lastupdateBy
//
this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1330,15 +1103,6 @@
this.gv_lastupdateBy.Visible = true;
this.gv_lastupdateBy.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;
- //
// gv_lastupdateDate
//
this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1351,17 +1115,6 @@
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
//
@@ -1385,15 +1138,6 @@
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 = 15;
- this.gridBand29.Width = 60;
- //
// gv_fcovertQty
//
this.gv_fcovertQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1408,28 +1152,6 @@
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.MinWidth = 200;
- this.gridBand30.Name = "gridBand30";
- this.gridBand30.VisibleIndex = 16;
- 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;
- //
// gv_createDate
//
this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1442,15 +1164,6 @@
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.MinWidth = 60;
- this.gridBand17.Name = "gridBand17";
- this.gridBand17.VisibleIndex = 1;
- this.gridBand17.Width = 67;
//
// gv_createBy
//
@@ -1465,15 +1178,6 @@
this.gv_createBy.Visible = true;
this.gv_createBy.Width = 67;
//
- // gridBand24
- //
- this.gridBand24.Caption = "涓嶈壇鎻忚堪";
- this.gridBand24.Columns.Add(this.gv_remarks);
- this.gridBand24.MinWidth = 100;
- this.gridBand24.Name = "gridBand24";
- this.gridBand24.VisibleIndex = 17;
- this.gridBand24.Width = 100;
- //
// gv_remarks
//
this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1486,15 +1190,6 @@
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.MinWidth = 100;
- this.gridBand25.Name = "gridBand25";
- this.gridBand25.VisibleIndex = 18;
- this.gridBand25.Width = 100;
//
// gv_fngHandle
//
@@ -1686,7 +1381,6 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- 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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
@@ -1754,7 +1448,6 @@
this.panel1.Controls.Add(this.txt_fcheckResu);
this.panel1.Controls.Add(this.txt_lotNo1);
this.panel1.Controls.Add(this.labelControl2);
- this.panel1.Controls.Add(this.txt_qualityAudit);
this.panel1.Controls.Add(this.txt_fsubmit);
this.panel1.Controls.Add(this.txt_itemModel);
this.panel1.Controls.Add(this.lb_itemModel);
@@ -1767,7 +1460,6 @@
this.panel1.Controls.Add(this.txt_fngDesc);
this.panel1.Controls.Add(this.lb_lifnr);
this.panel1.Controls.Add(this.lb_fsubmit);
- this.panel1.Controls.Add(this.lb_modify1Flag);
this.panel1.Controls.Add(this.lb_lotNo);
this.panel1.Controls.Add(this.txt_lotNo);
this.panel1.Controls.Add(this.lb_fbatchQty);
@@ -1841,19 +1533,10 @@
this.labelControl2.TabIndex = 796;
this.labelControl2.Text = "澶囨敞";
//
- // txt_qualityAudit
- //
- this.txt_qualityAudit.Enabled = false;
- this.txt_qualityAudit.Location = new System.Drawing.Point(947, 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 = 794;
- //
// txt_fsubmit
//
this.txt_fsubmit.Enabled = false;
- this.txt_fsubmit.Location = new System.Drawing.Point(947, 46);
+ this.txt_fsubmit.Location = new System.Drawing.Point(977, 46);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "";
this.txt_fsubmit.Size = new System.Drawing.Size(35, 24);
@@ -1932,21 +1615,11 @@
//
this.lb_fsubmit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fsubmit.Appearance.Options.UseFont = true;
- this.lb_fsubmit.Location = new System.Drawing.Point(870, 48);
+ this.lb_fsubmit.Location = new System.Drawing.Point(900, 48);
this.lb_fsubmit.Name = "lb_fsubmit";
this.lb_fsubmit.Size = new System.Drawing.Size(68, 21);
this.lb_fsubmit.TabIndex = 360;
this.lb_fsubmit.Text = "鎻愪氦鏍囪瘑";
- //
- // lb_modify1Flag
- //
- this.lb_modify1Flag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_modify1Flag.Appearance.Options.UseFont = true;
- this.lb_modify1Flag.Location = new System.Drawing.Point(870, 14);
- this.lb_modify1Flag.Name = "lb_modify1Flag";
- this.lb_modify1Flag.Size = new System.Drawing.Size(68, 21);
- this.lb_modify1Flag.TabIndex = 306;
- this.lb_modify1Flag.Text = "瀹℃牳鏍囪瘑";
//
// lb_lotNo
//
@@ -1979,11 +1652,304 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // alertControl1
+ // gridBand31
//
- this.alertControl1.AutoFormDelay = 2000;
- this.alertControl1.FormDisplaySpeed = DevExpress.XtraBars.Alerter.AlertFormDisplaySpeed.Fast;
- this.alertControl1.FormLocation = DevExpress.XtraBars.Alerter.AlertFormLocation.TopRight;
+ 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
//
@@ -2037,7 +2003,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
@@ -2084,7 +2049,6 @@
private DevExpress.XtraEditors.LabelControl labelControl3;
private DevExpress.XtraEditors.TextEdit txtJianYan;
private DevExpress.XtraEditors.LabelControl lb_fsubmit;
- private DevExpress.XtraEditors.LabelControl lb_modify1Flag;
private DevExpress.XtraEditors.LabelControl lb_lotNo;
private DevExpress.XtraEditors.TextEdit txt_lotNo;
private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
@@ -2128,7 +2092,6 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraEditors.CheckEdit txt_qualityAudit;
private DevExpress.XtraEditors.CheckEdit txt_fsubmit;
private DevExpress.XtraEditors.TextEdit txt_lotNo1;
private DevExpress.XtraEditors.LabelControl labelControl2;
@@ -2167,7 +2130,6 @@
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_iqcDate;
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
- private DevExpress.XtraBars.Alerter.AlertControl alertControl1;
private DevExpress.XtraEditors.TextEdit txt_itemName;
private DevExpress.XtraEditors.TextEdit txt_suppName;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand31;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index d272fb2..dd68677 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -15,7 +15,7 @@
{
public partial class Frm_MesQaItemsDetect01 : DevExpress.XtraEditors.XtraForm
{
- int _currentHandle5 =0;
+ int _currentHandle5 = 0;
string _webServiceName = "MesQaItemsDetect01Manager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_MesQaItemsDetect01()
@@ -25,7 +25,7 @@
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- // this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+ // this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
@@ -97,7 +97,8 @@
{
getModel(lbGuid.Text.Trim());
}
- else {
+ else
+ {
Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
}
}
@@ -179,13 +180,12 @@
_webServiceName + "EdtModel12",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-
if (_rtn.rtnCode > 0)
{
- this.alertControl1.Show(this, "鎻愮ず!", _rtn.rtnMsg);
getModel(lbGuid.Text.Trim());
}
- else {
+ else
+ {
Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
}
txtJianYan.Text = "";
@@ -249,7 +249,7 @@
/// <param name="sender"></param>
/// <param name="e"></param>
/// <exception cref="NotImplementedException"></exception>
- private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -263,7 +263,14 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎻愪氦妫�楠屽悧锛�"))
return;
-
+ if (txt_fcheckResu.Text.Trim() == "涓嶅悎鏍�")
+ {
+ if (string.IsNullOrEmpty(txt_lotNo1.Text.Trim())|| string.IsNullOrEmpty(txt_fngDesc.Text.Trim()))
+ {
+ MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄤ俊鎭拰涓嶈壇鎻忚堪锛�");
+ return;
+ }
+ };
var _obj = new
{
guid = rowGuid,
@@ -279,7 +286,7 @@
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- // getModel(lbGuid.Text.Trim());
+ // getModel(lbGuid.Text.Trim());
}
else
getPageList(this.pageBar1.CurrentPage);
@@ -289,7 +296,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
+
}
/// <summary>
@@ -442,10 +449,10 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
+ private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- // _sbSqlWhere += " and isnull(fsubmit,0)=0";
+ // _sbSqlWhere += " and isnull(fsubmit,0)=0";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -478,9 +485,9 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
+
}
- private void getModel(string strGuid)
+ private void getModel(string strGuid)
{
bool isEdit = false;
if (toolBarMenu1.currentAction == "add") return;
@@ -538,7 +545,7 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
+
}
@@ -594,7 +601,7 @@
/// 鏍规嵁妫�楠岄」鐩鍙栨娊鏍风粨鏋�
/// </summary>
/// <param name="guid5"></param>
- private void getList12(string guid5)
+ private void getList12(string guid5)
{
var _obj = new
{
@@ -614,7 +621,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
+
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
index 5e16aec..d58980a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
@@ -117,29 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0
- bGUAV2ViO1dvcmxkO0V5ZQdEODoAAAONSURBVDhPVZJtTNNXFIcvoHOyLhMTt2Qsm4oMI5luEE3jZlsR
- lDGrVWBzo7oBRibyYgWmWYtQoams4gAHghawaMABAgGZIg1CacUWKxUISqG8jBUrMJaVFFwz99v9M4fx
- JE/uh3POc8/NPUSpMxAAhIarXLXNr/A6v1ZWEW09XdsNeY1pXFZlrD2YKfWnebdyjZwU03qam+953kdc
- dkYluQtPHpGeqRI49cM/oGukHdPOZxidcaJcdwPppaHOM1cDT/n4v/0qU59Z1fWSYNHnx+OKxFfq8fMd
- Baaf9mLgcQ+ezP0NG+WR1QR13zmobocjVs67QOsXSy7rXwj2JHgFHUjdgWy1GlrzfRgtOvRa+zFkd84z
- MD0L/XA3SlrjIL64HQHC0B1U4vpCcNTrmrzyMxy/JIbRNgfTxBx6Jp+iZ+o/NA876JMaoRlLhFIdBt5X
- W2uo4JUFQdBB38eKmt04ppSiyWJH+5gDut8oY7PQjEzimrYSV1ou4WpnDEravkBQJNtGBe4Lgi0RUc79
- p2IgrtOiQD+Fhn47Gs12VNxRo/hGISo6tMjX2xBfkApFbSg4wo1OKmB9zM8h7JCzhIQkqGyHL3QiVtWD
- 9OZxnNVOoMT4O1RNlzE40YIuSxtM5ge4/6iX0oeK67ccVPAGxWVTcDYh3hxuPT/uAMIzC/B1vgGiygHc
- HvwT3UMWVN9sR1bRLxAr6hErqUNSRh3iU6tm+RFZCSyPVa9TiRtZyX5z96Z9K/GtIhx80TfIrW6A1jSG
- 9Dw1SquNaDcM4nt5GfZGZ8yfrR1m/HixDRu3y4dWfyBcSyWE5cXzrORFeiMx91O03DMiq7AVpr5x2B1/
- IUmqRKftD6Skn0NimhKHUnJhm5pBQ/MDrOekaRmBm/vypW+t+uSdIp+A4Ge39ANIljVictoB65MZBISm
- QCTJYVYOYfuPgCM4BsuvUzCYhrGem+EgEZITjMSVwlq+2jcku+SmWRhf9k+zph/9IxOIEmXP3/xl5FHE
- fJeLsEgJjL2jKKu+i3WbxTqyJjiTvMeJZiQulMWUZe/6BLN5gpxRUVoNfiptBn9fMrw+3IWd9MwrbkJM
- cjk2cKUjnu8LfBd2mmFr2HnC3ZvPyNxWePp7bOCeSPAPlN31C5RZ/badpiNLx9dtlhjWfHQ4ieXhvYLW
- LXpJwKHNWwR5hFkSGv9P9BplGcXjOcz3LaG4rmWfJP8CiUU9Vuoq7pwAAAAASUVORK5CYII=
-</value>
- </data>
- <metadata name="alertControl1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 5ad17e4..8f15e20 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();
@@ -93,7 +93,6 @@
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_ftype = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fsubmit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -137,9 +136,9 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
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_fsubmit = new DevExpress.XtraEditors.CheckEdit();
- this.lb_fsubmit = new DevExpress.XtraEditors.LabelControl();
this.lb_modify1Flag = new DevExpress.XtraEditors.LabelControl();
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
this.txt_fcovertQty = new DevExpress.XtraEditors.TextEdit();
@@ -192,8 +191,8 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((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_fsubmit.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();
@@ -565,19 +564,19 @@
//
this.lb_remarks.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remarks.Appearance.Options.UseFont = true;
- this.lb_remarks.Location = new System.Drawing.Point(627, 111);
+ this.lb_remarks.Location = new System.Drawing.Point(377, 111);
this.lb_remarks.Name = "lb_remarks";
- this.lb_remarks.Size = new System.Drawing.Size(73, 21);
+ this.lb_remarks.Size = new System.Drawing.Size(68, 21);
this.lb_remarks.TabIndex = 786;
- this.lb_remarks.Text = "涓嶈壇鎻忚堪 ";
+ this.lb_remarks.Text = "涓嶈壇鎻忚堪";
//
// txt_fngDesc
//
- this.txt_fngDesc.Location = new System.Drawing.Point(706, 111);
+ this.txt_fngDesc.Location = new System.Drawing.Point(452, 111);
this.txt_fngDesc.Name = "txt_fngDesc";
this.txt_fngDesc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fngDesc.Properties.Appearance.Options.UseFont = true;
- this.txt_fngDesc.Size = new System.Drawing.Size(165, 28);
+ this.txt_fngDesc.Size = new System.Drawing.Size(419, 28);
this.txt_fngDesc.TabIndex = 786;
this.txt_fngDesc.Tag = "readonly";
//
@@ -585,11 +584,11 @@
//
this.lb_lifnr.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lifnr.Appearance.Options.UseFont = true;
- this.lb_lifnr.Location = new System.Drawing.Point(394, 111);
+ this.lb_lifnr.Location = new System.Drawing.Point(893, 48);
this.lb_lifnr.Name = "lb_lifnr";
- this.lb_lifnr.Size = new System.Drawing.Size(56, 21);
+ this.lb_lifnr.Size = new System.Drawing.Size(51, 21);
this.lb_lifnr.TabIndex = 642;
- this.lb_lifnr.Text = "渚涘簲鍟� ";
+ this.lb_lifnr.Text = "渚涘簲鍟�";
//
// lb_fngHandle
//
@@ -627,9 +626,9 @@
this.lb_fbatchQty.Appearance.Options.UseFont = true;
this.lb_fbatchQty.Location = new System.Drawing.Point(377, 14);
this.lb_fbatchQty.Name = "lb_fbatchQty";
- this.lb_fbatchQty.Size = new System.Drawing.Size(73, 21);
+ this.lb_fbatchQty.Size = new System.Drawing.Size(68, 21);
this.lb_fbatchQty.TabIndex = 222;
- this.lb_fbatchQty.Text = "鏉ユ枡鏁伴噺 ";
+ this.lb_fbatchQty.Text = "鏉ユ枡鏁伴噺";
//
// txt_fbatchQty
//
@@ -760,7 +759,6 @@
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn19,
this.gv_ftype,
- this.gv_fsubmit,
this.gridColumn12,
this.gridColumn13,
this.gv_fcheckResu,
@@ -817,21 +815,6 @@
this.gv_ftype.VisibleIndex = 1;
this.gv_ftype.Width = 50;
//
- // gv_fsubmit
- //
- this.gv_fsubmit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fsubmit.AppearanceCell.Options.UseFont = true;
- this.gv_fsubmit.Caption = "鎻愪氦鏍囪瘑";
- this.gv_fsubmit.FieldName = "fsubmitTxt";
- this.gv_fsubmit.MaxWidth = 50;
- this.gv_fsubmit.MinWidth = 50;
- this.gv_fsubmit.Name = "gv_fsubmit";
- this.gv_fsubmit.OptionsColumn.AllowEdit = false;
- this.gv_fsubmit.Tag = "query_a.fsubmit";
- this.gv_fsubmit.Visible = true;
- this.gv_fsubmit.VisibleIndex = 2;
- this.gv_fsubmit.Width = 50;
- //
// gridColumn12
//
this.gridColumn12.Caption = "瀹℃牳鏍囪瘑";
@@ -841,7 +824,7 @@
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Tag = "query_a.quality_audit";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 3;
+ this.gridColumn12.VisibleIndex = 2;
this.gridColumn12.Width = 50;
//
// gridColumn13
@@ -853,7 +836,7 @@
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.OptionsColumn.ReadOnly = true;
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 4;
+ this.gridColumn13.VisibleIndex = 3;
this.gridColumn13.Width = 50;
//
// gv_fcheckResu
@@ -868,7 +851,7 @@
this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
- this.gv_fcheckResu.VisibleIndex = 5;
+ this.gv_fcheckResu.VisibleIndex = 4;
this.gv_fcheckResu.Width = 70;
//
// gv_lotNo
@@ -882,7 +865,7 @@
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
- this.gv_lotNo.VisibleIndex = 6;
+ this.gv_lotNo.VisibleIndex = 5;
this.gv_lotNo.Width = 150;
//
// gv_releaseNo
@@ -896,7 +879,7 @@
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
this.gv_releaseNo.Visible = true;
- this.gv_releaseNo.VisibleIndex = 7;
+ this.gv_releaseNo.VisibleIndex = 6;
this.gv_releaseNo.Width = 150;
//
// gv_itemNo
@@ -910,7 +893,7 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 8;
+ this.gv_itemNo.VisibleIndex = 7;
this.gv_itemNo.Width = 100;
//
// gv_boardStyle
@@ -924,7 +907,7 @@
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
- this.gv_boardStyle.VisibleIndex = 9;
+ this.gv_boardStyle.VisibleIndex = 8;
this.gv_boardStyle.Width = 200;
//
// gridColumn14
@@ -935,7 +918,7 @@
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 10;
+ this.gridColumn14.VisibleIndex = 9;
this.gridColumn14.Width = 200;
//
// gv_fbatchQty
@@ -949,7 +932,7 @@
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
this.gv_fbatchQty.Visible = true;
- this.gv_fbatchQty.VisibleIndex = 11;
+ this.gv_fbatchQty.VisibleIndex = 10;
this.gv_fbatchQty.Width = 80;
//
// gv_fcovertQty
@@ -964,7 +947,7 @@
this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
this.gv_fcovertQty.Visible = true;
- this.gv_fcovertQty.VisibleIndex = 12;
+ this.gv_fcovertQty.VisibleIndex = 11;
this.gv_fcovertQty.Width = 100;
//
// gv_lifnr
@@ -978,7 +961,7 @@
this.gv_lifnr.OptionsColumn.AllowEdit = false;
this.gv_lifnr.Tag = "query_a.lifnr";
this.gv_lifnr.Visible = true;
- this.gv_lifnr.VisibleIndex = 13;
+ this.gv_lifnr.VisibleIndex = 12;
this.gv_lifnr.Width = 250;
//
// gv_remarks
@@ -992,7 +975,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 14;
+ this.gv_remarks.VisibleIndex = 13;
this.gv_remarks.Width = 150;
//
// gv_createBy
@@ -1006,7 +989,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 15;
+ this.gv_createBy.VisibleIndex = 14;
this.gv_createBy.Width = 100;
//
// gv_fcheckBy
@@ -1020,7 +1003,7 @@
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 16;
+ this.gv_fcheckBy.VisibleIndex = 15;
this.gv_fcheckBy.Width = 100;
//
// gridColumn15
@@ -1031,7 +1014,7 @@
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.OptionsColumn.ReadOnly = true;
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 18;
+ this.gridColumn15.VisibleIndex = 17;
this.gridColumn15.Width = 180;
//
// gv_fcheckDate
@@ -1045,7 +1028,7 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 17;
+ this.gv_fcheckDate.VisibleIndex = 16;
this.gv_fcheckDate.Width = 180;
//
// gv_createDate
@@ -1059,7 +1042,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 19;
+ this.gv_createDate.VisibleIndex = 18;
this.gv_createDate.Width = 180;
//
// gv_lastupdateBy
@@ -1073,7 +1056,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 20;
+ this.gv_lastupdateBy.VisibleIndex = 19;
this.gv_lastupdateBy.Width = 100;
//
// gv_lastupdateDate
@@ -1087,7 +1070,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 21;
+ this.gv_lastupdateDate.VisibleIndex = 20;
this.gv_lastupdateDate.Width = 180;
//
// gv_fngHandle
@@ -1101,7 +1084,7 @@
this.gv_fngHandle.OptionsColumn.AllowEdit = false;
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
- this.gv_fngHandle.VisibleIndex = 22;
+ this.gv_fngHandle.VisibleIndex = 21;
this.gv_fngHandle.Width = 100;
//
// gv_iqcDate
@@ -1115,7 +1098,7 @@
this.gv_iqcDate.OptionsColumn.AllowEdit = false;
this.gv_iqcDate.Tag = "query_a.iqc_date";
this.gv_iqcDate.Visible = true;
- this.gv_iqcDate.VisibleIndex = 23;
+ this.gv_iqcDate.VisibleIndex = 22;
this.gv_iqcDate.Width = 180;
//
// gridColumn18
@@ -1125,7 +1108,7 @@
this.gridColumn18.MinWidth = 50;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 24;
+ this.gridColumn18.VisibleIndex = 23;
this.gridColumn18.Width = 50;
//
// gridColumn17
@@ -1135,7 +1118,7 @@
this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 25;
+ this.gridColumn17.VisibleIndex = 24;
this.gridColumn17.Width = 180;
//
// pageBar1
@@ -1175,7 +1158,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, 472);
+ this.tabMxPage3.Size = new System.Drawing.Size(1340, 478);
this.tabMxPage3.Text = "闄勪欢淇℃伅";
//
// gcMx3
@@ -1188,7 +1171,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemButtonEdit2,
this.repositoryItemButtonEdit3});
- this.gcMx3.Size = new System.Drawing.Size(1340, 415);
+ this.gcMx3.Size = new System.Drawing.Size(1340, 421);
this.gcMx3.TabIndex = 1;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -1284,10 +1267,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);
@@ -1305,10 +1288,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);
@@ -1326,10 +1309,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);
@@ -1346,9 +1329,9 @@
// panel1
//
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_fsubmit);
- this.panel1.Controls.Add(this.lb_fsubmit);
this.panel1.Controls.Add(this.lb_modify1Flag);
this.panel1.Controls.Add(this.labelControl3);
this.panel1.Controls.Add(this.txt_fcovertQty);
@@ -1387,43 +1370,44 @@
this.panel1.Size = new System.Drawing.Size(1342, 178);
this.panel1.TabIndex = 1;
//
+ // txt_lotNo1
+ //
+ this.txt_lotNo1.Location = new System.Drawing.Point(452, 148);
+ this.txt_lotNo1.Name = "txt_lotNo1";
+ this.txt_lotNo1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
+ this.txt_lotNo1.Size = new System.Drawing.Size(419, 28);
+ this.txt_lotNo1.TabIndex = 810;
+ this.txt_lotNo1.Tag = "readonly";
+ //
+ // labelControl4
+ //
+ this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl4.Appearance.Options.UseFont = true;
+ this.labelControl4.Location = new System.Drawing.Point(411, 152);
+ this.labelControl4.Name = "labelControl4";
+ this.labelControl4.Size = new System.Drawing.Size(34, 21);
+ this.labelControl4.TabIndex = 809;
+ this.labelControl4.Text = "澶囨敞";
+ //
// txt_qualityAudit
//
this.txt_qualityAudit.Enabled = false;
- this.txt_qualityAudit.Location = new System.Drawing.Point(981, 12);
+ 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;
//
- // txt_fsubmit
- //
- this.txt_fsubmit.Enabled = false;
- this.txt_fsubmit.Location = new System.Drawing.Point(981, 46);
- this.txt_fsubmit.Name = "txt_fsubmit";
- this.txt_fsubmit.Properties.Caption = "";
- this.txt_fsubmit.Size = new System.Drawing.Size(35, 24);
- this.txt_fsubmit.TabIndex = 807;
- //
- // lb_fsubmit
- //
- this.lb_fsubmit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fsubmit.Appearance.Options.UseFont = true;
- this.lb_fsubmit.Location = new System.Drawing.Point(904, 48);
- this.lb_fsubmit.Name = "lb_fsubmit";
- this.lb_fsubmit.Size = new System.Drawing.Size(68, 21);
- this.lb_fsubmit.TabIndex = 806;
- this.lb_fsubmit.Text = "鎻愪氦鏍囪瘑";
- //
// lb_modify1Flag
//
this.lb_modify1Flag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_modify1Flag.Appearance.Options.UseFont = true;
- this.lb_modify1Flag.Location = new System.Drawing.Point(904, 14);
+ this.lb_modify1Flag.Location = new System.Drawing.Point(910, 14);
this.lb_modify1Flag.Name = "lb_modify1Flag";
- this.lb_modify1Flag.Size = new System.Drawing.Size(68, 21);
+ this.lb_modify1Flag.Size = new System.Drawing.Size(34, 21);
this.lb_modify1Flag.TabIndex = 805;
- this.lb_modify1Flag.Text = "瀹℃牳鏍囪瘑";
+ this.lb_modify1Flag.Text = "瀹℃牳";
//
// labelControl3
//
@@ -1431,9 +1415,9 @@
this.labelControl3.Appearance.Options.UseFont = true;
this.labelControl3.Location = new System.Drawing.Point(377, 81);
this.labelControl3.Name = "labelControl3";
- this.labelControl3.Size = new System.Drawing.Size(73, 21);
+ this.labelControl3.Size = new System.Drawing.Size(68, 21);
this.labelControl3.TabIndex = 803;
- this.labelControl3.Text = "杞崲鏁伴噺 ";
+ this.labelControl3.Text = "杞崲鏁伴噺";
//
// txt_fcovertQty
//
@@ -1449,9 +1433,9 @@
// txt_suppName
//
this.txt_suppName.EnterMoveNextControl = true;
- this.txt_suppName.Location = new System.Drawing.Point(452, 111);
+ this.txt_suppName.Location = new System.Drawing.Point(950, 48);
this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Size = new System.Drawing.Size(150, 24);
+ this.txt_suppName.Size = new System.Drawing.Size(207, 24);
this.txt_suppName.TabIndex = 802;
this.txt_suppName.Tag = "readonly";
//
@@ -1468,14 +1452,14 @@
//
// txt_fmrmode
//
- this.txt_fmrmode.Location = new System.Drawing.Point(958, 111);
+ this.txt_fmrmode.Location = new System.Drawing.Point(950, 111);
this.txt_fmrmode.Name = "txt_fmrmode";
this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fmrmode.Properties.Items.AddRange(new object[] {
"閫�鏂欒ˉ鏂�",
"閫�鏂欏苟鎵ｆ"});
- this.txt_fmrmode.Size = new System.Drawing.Size(140, 24);
+ this.txt_fmrmode.Size = new System.Drawing.Size(207, 24);
this.txt_fmrmode.TabIndex = 795;
//
// labelControl2
@@ -1490,14 +1474,14 @@
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(958, 79);
+ this.txt_fngHandle.Location = new System.Drawing.Point(950, 79);
this.txt_fngHandle.Name = "txt_fngHandle";
this.txt_fngHandle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fngHandle.Properties.Items.AddRange(new object[] {
"閫�璐�",
"鐗归噰鐩存帴浣跨敤"});
- this.txt_fngHandle.Size = new System.Drawing.Size(140, 24);
+ this.txt_fngHandle.Size = new System.Drawing.Size(207, 24);
this.txt_fngHandle.TabIndex = 793;
//
// txt_itemModel
@@ -1554,7 +1538,7 @@
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(405, 149);
+ this.labelControl11.Location = new System.Drawing.Point(1112, 16);
this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl11.Name = "labelControl11";
this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -1565,7 +1549,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(456, 149);
+ this.lbGuid.Location = new System.Drawing.Point(1163, 16);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -1577,9 +1561,9 @@
this.lb_lotNo.Appearance.Options.UseFont = true;
this.lb_lotNo.Location = new System.Drawing.Point(394, 48);
this.lb_lotNo.Name = "lb_lotNo";
- this.lb_lotNo.Size = new System.Drawing.Size(56, 21);
+ this.lb_lotNo.Size = new System.Drawing.Size(51, 21);
this.lb_lotNo.TabIndex = 262;
- this.lb_lotNo.Text = "鎵规鍙� ";
+ this.lb_lotNo.Text = "鎵规鍙�";
//
// txt_lotNo
//
@@ -1647,8 +1631,8 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
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_fsubmit.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();
@@ -1724,7 +1708,6 @@
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fsubmit;
private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_lifnr;
private DevExpress.XtraGrid.Columns.GridColumn gv_releaseNo;
@@ -1759,8 +1742,6 @@
private DevExpress.XtraEditors.LabelControl labelControl3;
private DevExpress.XtraEditors.TextEdit txt_fcovertQty;
private DevExpress.XtraEditors.CheckEdit txt_qualityAudit;
- private DevExpress.XtraEditors.CheckEdit txt_fsubmit;
- private DevExpress.XtraEditors.LabelControl lb_fsubmit;
private DevExpress.XtraEditors.LabelControl lb_modify1Flag;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
@@ -1782,5 +1763,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckLevel;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1facLevel;
private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraEditors.TextEdit txt_lotNo1;
+ private DevExpress.XtraEditors.LabelControl labelControl4;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index 5cafb6b..5f2c13c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -35,7 +35,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "qualityAudit", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "modifyFlagTxt", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -265,7 +265,7 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
+ private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += " and isnull(fsubmit,0)=1";
@@ -301,9 +301,9 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
+
}
- private void getModel(string strGuid)
+ private void getModel(string strGuid)
{
bool isEdit = false;
if (toolBarMenu1.currentAction == "add") return;
@@ -355,7 +355,7 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
+
}
/// <summary>
/// 閫夐」鍗″垏鎹�
@@ -409,7 +409,7 @@
/// 鏍规嵁妫�楠岄」鐩鍙栨娊鏍风粨鏋�
/// </summary>
/// <param name="guid5"></param>
- private void getList12(string guid5)
+ private void getList12(string guid5)
{
var _obj = new
{
@@ -543,6 +543,16 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
+ if (_inFieldValue == 1)
+ {
+ if (txt_fcheckResu.Text == "涓嶅悎鏍�")
+ {
+ if (txt_fngHandle.Text.Trim().Length == 0) {
+ MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃惰閫夋嫨澶勭悊鏂瑰紡锛�");
+ return;
+ }
+ }
+ }
var _obj = new
{
guid = rowGuid,
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/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 0d225c4..e96c9c6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -489,25 +489,25 @@
//
this.gridColumn9.Caption = "閲囪喘鍗曚綅";
this.gridColumn9.FieldName = "cgUnit";
- this.gridColumn9.MaxWidth = 60;
- this.gridColumn9.MinWidth = 60;
+ this.gridColumn9.MaxWidth = 50;
+ this.gridColumn9.MinWidth = 50;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 13;
- this.gridColumn9.Width = 60;
+ this.gridColumn9.Width = 50;
//
// gridColumn7
//
this.gridColumn7.Caption = "搴撳瓨鍗曚綅";
this.gridColumn7.FieldName = "kcUnit";
- this.gridColumn7.MaxWidth = 60;
- this.gridColumn7.MinWidth = 60;
+ this.gridColumn7.MaxWidth = 50;
+ this.gridColumn7.MinWidth = 50;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 14;
- this.gridColumn7.Width = 60;
+ this.gridColumn7.Width = 50;
//
// gvBtnAlawys
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
index 3ec65db..b556a09 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
@@ -433,7 +433,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(641, 53);
+ this.txt_createDate.Location = new System.Drawing.Point(639, 53);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
@@ -1648,7 +1648,7 @@
this.txt_fcheckUser.Name = "txt_fcheckUser";
this.txt_fcheckUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckUser.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckUser.Size = new System.Drawing.Size(167, 28);
+ this.txt_fcheckUser.Size = new System.Drawing.Size(174, 28);
this.txt_fcheckUser.TabIndex = 595;
//
// txt_dptName
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 00e6669..7d9ebfc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -75,7 +75,6 @@
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();
@@ -83,57 +82,29 @@
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();
@@ -143,6 +114,35 @@
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,8 +167,6 @@
this.gvMx1demandDocumentLineId.MinWidth = 100;
this.gvMx1demandDocumentLineId.Name = "gvMx1demandDocumentLineId";
this.gvMx1demandDocumentLineId.Tag = "query_a.DEMAND_DOCUMENT_LINE_ID";
- this.gvMx1demandDocumentLineId.Visible = true;
- this.gvMx1demandDocumentLineId.VisibleIndex = 33;
this.gvMx1demandDocumentLineId.Width = 100;
//
// gvMx1demandDocumentId
@@ -805,22 +803,6 @@
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);
@@ -905,15 +887,6 @@
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鍙�";
@@ -924,15 +897,6 @@
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
//
@@ -947,18 +911,6 @@
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);
@@ -971,17 +923,6 @@
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 = "鍗曟嵁绫诲瀷";
- 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
//
@@ -996,15 +937,6 @@
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);
@@ -1017,15 +949,6 @@
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
//
@@ -1040,27 +963,6 @@
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 = "缂栧彿";
- 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);
@@ -1074,15 +976,6 @@
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 = "渚涘簲鍟嗗悕绉�";
@@ -1093,17 +986,6 @@
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
//
@@ -1118,28 +1000,6 @@
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);
@@ -1153,15 +1013,6 @@
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 = "閲囪喘閮ㄩ棬鍚嶇О";
@@ -1172,17 +1023,6 @@
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
//
@@ -1197,15 +1037,6 @@
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);
@@ -1218,15 +1049,6 @@
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
//
@@ -1241,28 +1063,6 @@
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);
@@ -1275,15 +1075,6 @@
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
//
@@ -1298,15 +1089,6 @@
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);
@@ -1319,27 +1101,6 @@
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
//
@@ -1354,15 +1115,6 @@
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);
@@ -1375,15 +1127,6 @@
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
//
@@ -1398,15 +1141,6 @@
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);
@@ -1419,28 +1153,6 @@
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
//
@@ -1466,15 +1178,6 @@
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
//
@@ -1576,6 +1279,302 @@
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 = "鍗曟嵁鐘舵��";
+ 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 = "鍗曟嵁绫诲瀷";
+ 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.Visible = false;
+ this.gridBand5.VisibleIndex = -1;
+ 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 = 4;
+ 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 = 5;
+ this.gridBand6.Width = 200;
+ //
+ // gridBand11
+ //
+ this.gridBand11.Caption = "缂栧彿";
+ 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 = 6;
+ 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 = 7;
+ 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 = 8;
+ 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 = 9;
+ 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 = 10;
+ 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 = 11;
+ 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 = 12;
+ 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 = 13;
+ 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 = 14;
+ 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 = 15;
+ 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
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index d1ef474..05ad39e 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -80,7 +80,7 @@
request.ContentType = "application/json";
request.Headers.Add("token", GetBasicAuthTicket());
request.Accept = "*/*";
- request.Timeout = 15000;
+ request.Timeout = 150000;
request.AllowAutoRedirect = false;
request.ServicePoint.Expect100Continue = false;
wdf.SetCaption(_caption + "锛�10/100锛�" + meth);
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index 80b08bb..db66443 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -36,18 +36,18 @@
this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
@@ -87,18 +87,18 @@
this.gv_ebelnK3id,
this.gv_billNo,
this.gridColumn3,
- this.gridColumn4,
this.gv_supplierItemCode,
this.gv_supplierItemName,
this.gridColumn5,
this.gridColumn6,
- this.gridColumn8,
- this.gridColumn7,
this.gridColumn9,
+ this.gridColumn7,
this.gv_purchaseUnit,
this.gv_remarks,
this.gridColumn10,
- this.gridColumn2});
+ this.gridColumn2,
+ this.gridColumn4,
+ this.gridColumn8});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -170,17 +170,6 @@
this.gridColumn3.VisibleIndex = 2;
this.gridColumn3.Width = 125;
//
- // gridColumn4
- //
- this.gridColumn4.Caption = "閿�鍞鍗�";
- this.gridColumn4.FieldName = "xxdd";
- this.gridColumn4.MinWidth = 120;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.OptionsColumn.ReadOnly = true;
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 3;
- this.gridColumn4.Width = 120;
- //
// gv_supplierItemCode
//
this.gv_supplierItemCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -193,7 +182,7 @@
this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
this.gv_supplierItemCode.Visible = true;
- this.gv_supplierItemCode.VisibleIndex = 4;
+ this.gv_supplierItemCode.VisibleIndex = 3;
this.gv_supplierItemCode.Width = 100;
//
// gv_supplierItemName
@@ -208,7 +197,7 @@
this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
this.gv_supplierItemName.Visible = true;
- this.gv_supplierItemName.VisibleIndex = 5;
+ this.gv_supplierItemName.VisibleIndex = 4;
this.gv_supplierItemName.Width = 120;
//
// gridColumn5
@@ -219,7 +208,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 6;
+ this.gridColumn5.VisibleIndex = 5;
this.gridColumn5.Width = 250;
//
// gridColumn6
@@ -231,27 +220,23 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 7;
+ this.gridColumn6.VisibleIndex = 6;
this.gridColumn6.Width = 50;
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "瀹炴敹鏁伴噺";
- this.gridColumn8.FieldName = "sssl";
- this.gridColumn8.MaxWidth = 50;
- this.gridColumn8.MinWidth = 50;
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.OptionsColumn.ReadOnly = true;
- this.gridColumn8.Width = 50;
//
// gridColumn7
//
- this.gridColumn7.Caption = "搴旀敹鏁伴噺";
- this.gridColumn7.FieldName = "yssl";
+ this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn7.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn7.Caption = "鏈敹鏁伴噺";
+ this.gridColumn7.FieldName = "wssl";
this.gridColumn7.MaxWidth = 50;
this.gridColumn7.MinWidth = 50;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 8;
this.gridColumn7.Width = 50;
//
// gridColumn9
@@ -263,7 +248,7 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 8;
+ this.gridColumn9.VisibleIndex = 7;
this.gridColumn9.Width = 50;
//
// gv_purchaseUnit
@@ -317,6 +302,27 @@
this.gridColumn2.VisibleIndex = 12;
this.gridColumn2.Width = 250;
//
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "閿�鍞鍗�";
+ this.gridColumn4.FieldName = "xxdd";
+ this.gridColumn4.MinWidth = 120;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.ReadOnly = true;
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 13;
+ this.gridColumn4.Width = 120;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "瀹炴敹鏁伴噺";
+ this.gridColumn8.FieldName = "sssl";
+ this.gridColumn8.MaxWidth = 50;
+ this.gridColumn8.MinWidth = 50;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.OptionsColumn.ReadOnly = true;
+ this.gridColumn8.Width = 50;
+ //
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
index 9c051a6..4c072fc 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -30,7 +30,7 @@
pageBar1.PagerEvent += PageBar1_PagerEvent;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+
});
getPageList(1, UtilityHelper.GetPageSize());
btnIn.Click += (s, e) =>
--
Gitblit v1.9.3