From 2e1f7009dc6e35aa7ffa856f8f74613f57c560fa Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 01 一月 2025 12:47:22 +0800
Subject: [PATCH] 采购
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 190 +++---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 27
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx | 2
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 7
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 246 ++++-----
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 988 +++++++++++++++++++--------------------
7 files changed, 729 insertions(+), 733 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 283117b..d9a7392 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -30,22 +30,22 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = 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();
- 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();
+ 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();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -102,8 +102,6 @@
this.gv_modify1Flag = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_lotNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gv_fcheckDate = 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();
@@ -122,10 +120,10 @@
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.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridColumn15 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_fcheckBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.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.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
@@ -152,6 +150,7 @@
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();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -174,15 +173,15 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit();
this.txt_lotNo1 = new DevExpress.XtraEditors.TextEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
- this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
- this.txt_modify1Flag = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_qualityAudit = new DevExpress.XtraEditors.CheckEdit();
this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
- this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
this.lb_itemModel = new DevExpress.XtraEditors.LabelControl();
this.lb_tname = new DevExpress.XtraEditors.LabelControl();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
@@ -231,9 +230,11 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
+ ((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_modify1Flag.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();
@@ -797,7 +798,6 @@
this.gridBand12,
this.gridBand13,
this.gridBand14,
- this.gridBand1,
this.gridBand16,
this.gridBand18,
this.gridBand19,
@@ -865,6 +865,7 @@
this.bandedGridColumn1.FieldName = "receivingOrg";
this.bandedGridColumn1.MinWidth = 250;
this.bandedGridColumn1.Name = "bandedGridColumn1";
+ this.bandedGridColumn1.Tag = "org.fnamber";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.Width = 250;
//
@@ -886,6 +887,7 @@
this.gridColumn13.MinWidth = 30;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.OptionsColumn.ReadOnly = true;
+ this.gridColumn13.Tag = "query_a.fsubmit";
this.gridColumn13.UnboundDataType = typeof(bool);
this.gridColumn13.Visible = true;
this.gridColumn13.Width = 50;
@@ -931,7 +933,7 @@
this.gv_modify1Flag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_modify1Flag.AppearanceCell.Options.UseFont = true;
this.gv_modify1Flag.Caption = "瀹℃牳鏍囧織";
- this.gv_modify1Flag.FieldName = "modify1FlagTxt";
+ this.gv_modify1Flag.FieldName = "modifyFlagTxt";
this.gv_modify1Flag.MinWidth = 30;
this.gv_modify1Flag.Name = "gv_modify1Flag";
this.gv_modify1Flag.OptionsColumn.AllowEdit = false;
@@ -961,29 +963,6 @@
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
this.gv_lotNo.Width = 120;
- //
- // gridBand1
- //
- this.gridBand1.Caption = "妫�楠屾棩鏈�";
- this.gridBand1.Columns.Add(this.gv_fcheckDate);
- this.gridBand1.MinWidth = 180;
- this.gridBand1.Name = "gridBand1";
- this.gridBand1.Visible = false;
- this.gridBand1.VisibleIndex = -1;
- this.gridBand1.Width = 180;
- //
- // gv_fcheckDate
- //
- this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
- this.gv_fcheckDate.FieldName = "fcheckDate";
- this.gv_fcheckDate.MinWidth = 30;
- this.gv_fcheckDate.Name = "gv_fcheckDate";
- this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
- this.gv_fcheckDate.Tag = "query_a.fcheck_date";
- this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.Width = 30;
//
// gridBand16
//
@@ -1183,34 +1162,15 @@
this.gridBand8.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.gridBand8.Caption = "妫�楠屼俊鎭�";
this.gridBand8.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand7,
this.gridBand10,
+ this.gridBand32,
this.gridBand6,
this.gridBand9,
this.gridBand15});
this.gridBand8.MinWidth = 300;
this.gridBand8.Name = "gridBand8";
this.gridBand8.VisibleIndex = 11;
- this.gridBand8.Width = 300;
- //
- // gridBand7
- //
- this.gridBand7.Caption = "妫�楠屾棩鏈�";
- this.gridBand7.Columns.Add(this.gridColumn15);
- this.gridBand7.MinWidth = 120;
- this.gridBand7.Name = "gridBand7";
- this.gridBand7.VisibleIndex = 0;
- this.gridBand7.Width = 120;
- //
- // gridColumn15
- //
- this.gridColumn15.Caption = "鎻愪氦妫�楠屾棩鏈�";
- this.gridColumn15.FieldName = "date01";
- this.gridColumn15.MinWidth = 30;
- this.gridColumn15.Name = "gridColumn15";
- this.gridColumn15.OptionsColumn.ReadOnly = true;
- this.gridColumn15.Visible = true;
- this.gridColumn15.Width = 120;
+ this.gridBand8.Width = 360;
//
// gridBand10
//
@@ -1218,8 +1178,8 @@
this.gridBand10.Columns.Add(this.gv_fcheckBy);
this.gridBand10.MinWidth = 60;
this.gridBand10.Name = "gridBand10";
- this.gridBand10.VisibleIndex = 1;
- this.gridBand10.Width = 60;
+ this.gridBand10.VisibleIndex = 0;
+ this.gridBand10.Width = 93;
//
// gv_fcheckBy
//
@@ -1232,7 +1192,28 @@
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.Width = 60;
+ this.gv_fcheckBy.Width = 93;
+ //
+ // gridBand32
+ //
+ this.gridBand32.Caption = "妫�楠屾棩鏈�";
+ this.gridBand32.Columns.Add(this.gv_fcheckDate);
+ this.gridBand32.Name = "gridBand32";
+ this.gridBand32.VisibleIndex = 1;
+ this.gridBand32.Width = 143;
+ //
+ // gv_fcheckDate
+ //
+ this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
+ this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
+ this.gv_fcheckDate.FieldName = "fcheckDate";
+ this.gv_fcheckDate.MinWidth = 30;
+ this.gv_fcheckDate.Name = "gv_fcheckDate";
+ this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
+ this.gv_fcheckDate.Tag = "query_a.fcheck_date";
+ this.gv_fcheckDate.Visible = true;
+ this.gv_fcheckDate.Width = 143;
//
// gridBand6
//
@@ -1264,7 +1245,7 @@
this.gridBand9.MinWidth = 50;
this.gridBand9.Name = "gridBand9";
this.gridBand9.VisibleIndex = 2;
- this.gridBand9.Width = 50;
+ this.gridBand9.Width = 124;
//
// gv_fcheckResu
//
@@ -1277,7 +1258,7 @@
this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
- this.gv_fcheckResu.Width = 50;
+ this.gv_fcheckResu.Width = 124;
//
// gridBand15
//
@@ -1285,7 +1266,8 @@
this.gridBand15.Columns.Add(this.gv_freceQty);
this.gridBand15.MinWidth = 50;
this.gridBand15.Name = "gridBand15";
- this.gridBand15.VisibleIndex = 3;
+ this.gridBand15.Visible = false;
+ this.gridBand15.VisibleIndex = -1;
this.gridBand15.Width = 50;
//
// gv_freceQty
@@ -1374,7 +1356,8 @@
this.gridBand28.Columns.Add(this.gridColumn14);
this.gridBand28.MinWidth = 60;
this.gridBand28.Name = "gridBand28";
- this.gridBand28.VisibleIndex = 15;
+ this.gridBand28.Visible = false;
+ this.gridBand28.VisibleIndex = -1;
this.gridBand28.Width = 60;
//
// gv_states
@@ -1405,7 +1388,7 @@
this.gridBand29.Columns.Add(this.gv_fcovertQty);
this.gridBand29.MinWidth = 60;
this.gridBand29.Name = "gridBand29";
- this.gridBand29.VisibleIndex = 16;
+ this.gridBand29.VisibleIndex = 15;
this.gridBand29.Width = 60;
//
// gv_fcovertQty
@@ -1432,7 +1415,7 @@
this.gridBand17});
this.gridBand30.MinWidth = 200;
this.gridBand30.Name = "gridBand30";
- this.gridBand30.VisibleIndex = 17;
+ this.gridBand30.VisibleIndex = 16;
this.gridBand30.Width = 200;
//
// gridBand22
@@ -1485,7 +1468,7 @@
this.gridBand24.Columns.Add(this.gv_remarks);
this.gridBand24.MinWidth = 100;
this.gridBand24.Name = "gridBand24";
- this.gridBand24.VisibleIndex = 18;
+ this.gridBand24.VisibleIndex = 17;
this.gridBand24.Width = 100;
//
// gv_remarks
@@ -1493,7 +1476,7 @@
this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_remarks.AppearanceCell.Options.UseFont = true;
this.gv_remarks.Caption = "涓嶈壇鎻忚堪";
- this.gv_remarks.FieldName = "remarks";
+ this.gv_remarks.FieldName = "fngDesc";
this.gv_remarks.MinWidth = 30;
this.gv_remarks.Name = "gv_remarks";
this.gv_remarks.OptionsColumn.AllowEdit = false;
@@ -1507,7 +1490,7 @@
this.gridBand25.Columns.Add(this.gv_fngHandle);
this.gridBand25.MinWidth = 100;
this.gridBand25.Name = "gridBand25";
- this.gridBand25.VisibleIndex = 19;
+ this.gridBand25.VisibleIndex = 18;
this.gridBand25.Width = 100;
//
// gv_fngHandle
@@ -1522,6 +1505,16 @@
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
this.gv_fngHandle.Width = 100;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "鎻愪氦妫�楠屾棩鏈�";
+ this.gridColumn15.FieldName = "date01";
+ this.gridColumn15.MinWidth = 30;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.OptionsColumn.ReadOnly = true;
+ this.gridColumn15.RowIndex = 1;
+ this.gridColumn15.Width = 148;
//
// xtraTabControl1
//
@@ -1690,10 +1683,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions4.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions4.Image")));
+ editorButtonImageOptions4.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)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娴忚", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1711,10 +1704,10 @@
// repositoryItemButtonEdit3
//
this.repositoryItemButtonEdit3.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
+ editorButtonImageOptions5.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", 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);
@@ -1732,10 +1725,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions6.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1752,15 +1745,15 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_suppName);
+ this.panel1.Controls.Add(this.txt_itemName);
this.panel1.Controls.Add(this.labelControl4);
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_suppId);
- this.panel1.Controls.Add(this.txt_modify1Flag);
+ 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.txt_itemId);
this.panel1.Controls.Add(this.lb_itemModel);
this.panel1.Controls.Add(this.lb_tname);
this.panel1.Controls.Add(this.txt_itemNo);
@@ -1788,6 +1781,24 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1342, 182);
this.panel1.TabIndex = 1;
+ //
+ // txt_suppName
+ //
+ this.txt_suppName.Enabled = false;
+ this.txt_suppName.Location = new System.Drawing.Point(702, 78);
+ this.txt_suppName.Name = "txt_suppName";
+ this.txt_suppName.Size = new System.Drawing.Size(309, 24);
+ this.txt_suppName.TabIndex = 801;
+ //
+ // txt_itemName
+ //
+ this.txt_itemName.Enabled = false;
+ this.txt_itemName.Location = new System.Drawing.Point(97, 44);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemName.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemName.Size = new System.Drawing.Size(266, 28);
+ this.txt_itemName.TabIndex = 800;
//
// labelControl4
//
@@ -1826,24 +1837,14 @@
this.labelControl2.TabIndex = 796;
this.labelControl2.Text = "澶囨敞";
//
- // txt_suppId
+ // txt_qualityAudit
//
- this.txt_suppId.Enabled = false;
- this.txt_suppId.IsReadly = true;
- this.txt_suppId.Location = new System.Drawing.Point(702, 75);
- this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
- this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(309, 30);
- this.txt_suppId.TabIndex = 795;
- //
- // txt_modify1Flag
- //
- this.txt_modify1Flag.Enabled = false;
- this.txt_modify1Flag.Location = new System.Drawing.Point(947, 12);
- this.txt_modify1Flag.Name = "txt_modify1Flag";
- this.txt_modify1Flag.Properties.Caption = "";
- this.txt_modify1Flag.Size = new System.Drawing.Size(30, 24);
- this.txt_modify1Flag.TabIndex = 794;
+ 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
//
@@ -1864,16 +1865,6 @@
this.txt_itemModel.Size = new System.Drawing.Size(266, 64);
this.txt_itemModel.TabIndex = 792;
this.txt_itemModel.Tag = "itemName";
- //
- // txt_itemId
- //
- this.txt_itemId.Enabled = false;
- this.txt_itemId.IsReadly = true;
- this.txt_itemId.Location = new System.Drawing.Point(97, 42);
- this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(266, 33);
- this.txt_itemId.TabIndex = 791;
- this.txt_itemId.Tag = "no";
//
// lb_itemModel
//
@@ -2039,9 +2030,11 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
+ ((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_modify1Flag.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();
@@ -2080,7 +2073,6 @@
private DevExpress.XtraEditors.TextEdit txt_releaseNo;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraEditors.MemoEdit txt_itemModel;
- private UserControl.UcLookItems txt_itemId;
private DevExpress.XtraEditors.LabelControl lb_itemModel;
private DevExpress.XtraEditors.LabelControl lb_tname;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
@@ -2133,9 +2125,8 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraEditors.CheckEdit txt_modify1Flag;
+ private DevExpress.XtraEditors.CheckEdit txt_qualityAudit;
private DevExpress.XtraEditors.CheckEdit txt_fsubmit;
- private UserControl.UcLookSupplier txt_suppId;
private DevExpress.XtraEditors.TextEdit txt_lotNo1;
private DevExpress.XtraEditors.LabelControl labelControl2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
@@ -2173,12 +2164,14 @@
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;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand11;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand12;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand13;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand16;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand18;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
@@ -2189,8 +2182,8 @@
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand21;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand8;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand10;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand32;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand9;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15;
@@ -2204,6 +2197,5 @@
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand17;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand24;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand25;
- private DevExpress.XtraBars.Alerter.AlertControl alertControl1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 02d0005..ace60d5 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -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;
@@ -34,7 +34,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, "modify1FlagTxt", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "qualityAudit", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -47,18 +47,11 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- txt_itemId.EditChanged += (s, e) =>
- {
- txt_itemModel.Text = this.txt_itemId.GetModel();
- txt_itemNo.Text = this.txt_itemId.GetCode();
- };
txtJianYan.KeyDown += TxtJianYan_KeyDown;
this.btnLoad.Click += BtnLoad_Click;
ucUpFile1.UpChanged += UcUpFile1_UpChanged;
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
- //鏈夋�ц兘闂
- this.txt_suppId.getSuppler("");
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -103,6 +96,9 @@
if (_rtn.rtnCode > 0)
{
getModel(lbGuid.Text.Trim());
+ }
+ else {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
}
}
catch (Exception ex)
@@ -183,11 +179,14 @@
_webServiceName + "EdtModel12",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- this.alertControl1.Show(this, "鎻愮ず!", _rtn.rtnMsg);
+
if (_rtn.rtnCode > 0)
{
- txtJianYan.Text = "";
+ this.alertControl1.Show(this, "鎻愮ず!", _rtn.rtnMsg);
getModel(lbGuid.Text.Trim());
+ }
+ else {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
}
txtJianYan.Text = "";
}
@@ -279,7 +278,9 @@
if (_rtn.rtnCode > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim());
+ {
+ // getModel(lbGuid.Text.Trim());
+ }
else
getPageList(this.pageBar1.CurrentPage);
}
@@ -444,7 +445,7 @@
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
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
index 5e16aec..7eb5350 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.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="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="editorButtonImageOptions4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0
bGUAV2ViO1dvcmxkO0V5ZQdEODoAAAONSURBVDhPVZJtTNNXFIcvoHOyLhMTt2Qsm4oMI5luEE3jZlsR
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 3792317..73c1753 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -29,42 +29,43 @@
/// </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();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fcheckItemDesc = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fspecRequ = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fdownAllow = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1freQty = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1checkQyt = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fenterQty = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fngRate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fngQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fspecRequ = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1checkQyt = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1facQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1freQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fngQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fngRate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fenterQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -74,10 +75,7 @@
this.lb_remarks = new DevExpress.XtraEditors.LabelControl();
this.txt_fngDesc = new DevExpress.XtraEditors.TextEdit();
this.lb_lifnr = new DevExpress.XtraEditors.LabelControl();
- this.txt_lifnr = new DevExpress.XtraEditors.TextEdit();
this.lb_fngHandle = new DevExpress.XtraEditors.LabelControl();
- this.lb_checkQty = new DevExpress.XtraEditors.LabelControl();
- this.txt_checkQty = new DevExpress.XtraEditors.TextEdit();
this.lb_fcheckResu = new DevExpress.XtraEditors.LabelControl();
this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit();
this.lb_fbatchQty = new DevExpress.XtraEditors.LabelControl();
@@ -93,33 +91,32 @@
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ 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.gv_modify1Flag = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_ftype = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_freceQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_checkQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fngHandle = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_states = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_iqcDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
@@ -140,25 +137,27 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.panel1 = new System.Windows.Forms.Panel();
- this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
this.txt_qualityAudit = new DevExpress.XtraEditors.CheckEdit();
- this.txt_modify1Flag = new DevExpress.XtraEditors.CheckEdit();
- this.lb_qualityAudit = new DevExpress.XtraEditors.LabelControl();
+ this.txt_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();
+ this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
- this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
this.lb_itemModel = new DevExpress.XtraEditors.LabelControl();
this.lb_tname = new DevExpress.XtraEditors.LabelControl();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
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.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -173,8 +172,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).BeginInit();
@@ -195,21 +192,24 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_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();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.splitContainerControl1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1340, 460);
+ this.tabMxPage1.Size = new System.Drawing.Size(1340, 472);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitContainerControl1
@@ -228,7 +228,7 @@
//
this.splitContainerControl1.Panel2.Controls.Add(this.groupControl1);
this.splitContainerControl1.Panel2.Text = "Panel2";
- this.splitContainerControl1.Size = new System.Drawing.Size(1340, 460);
+ this.splitContainerControl1.Size = new System.Drawing.Size(1340, 472);
this.splitContainerControl1.SplitterPosition = 160;
this.splitContainerControl1.TabIndex = 3;
//
@@ -239,34 +239,37 @@
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
this.gcMx1.Size = new System.Drawing.Size(1340, 160);
- this.gcMx1.TabIndex = 1;
+ this.gcMx1.TabIndex = 2;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
//
// gvMx1
//
+ this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx1.ColumnPanelRowHeight = 50;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1fcheckItem,
- this.gvMx1fstand,
+ this.gvMx1fcheckTool,
+ this.gvMx1fcheckItemDesc,
+ this.gvMx1fspecRequ,
this.gvMx1fupAllow,
+ this.gvMx1fstand,
this.gvMx1fdownAllow,
+ this.gvMx1freQty,
+ this.gvMx1checkQyt,
+ this.gvMx1fenterQty,
+ this.gvMx1fcheckResu,
+ this.gvMx1fngRate,
+ this.gvMx1fngQty,
this.gvMx1sampleSizeNo,
this.gvMx1fcheckLevel,
- this.gvMx1facLevel,
- this.gvMx1fspecRequ,
- this.gvMx1checkQyt,
- this.gvMx1fcheckResu,
- this.gvMx1facQty,
- this.gvMx1freQty,
- this.gvMx1fngQty,
- this.gvMx1fngRate,
- this.gvMx1fenterQty});
+ this.gvMx1facLevel});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
- this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
// gvMx1guid
@@ -286,25 +289,51 @@
this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
this.gvMx1fcheckItem.FieldName = "fcheckItem";
- this.gvMx1fcheckItem.MinWidth = 50;
+ this.gvMx1fcheckItem.MinWidth = 120;
this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
this.gvMx1fcheckItem.Tag = "query_a.fcheck_item";
this.gvMx1fcheckItem.Visible = true;
- this.gvMx1fcheckItem.VisibleIndex = 1;
- this.gvMx1fcheckItem.Width = 94;
+ this.gvMx1fcheckItem.VisibleIndex = 0;
+ this.gvMx1fcheckItem.Width = 120;
//
- // gvMx1fstand
+ // gvMx1fcheckTool
//
- this.gvMx1fstand.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
- this.gvMx1fstand.Caption = "鏍囧噯鍊�";
- this.gvMx1fstand.FieldName = "fstand";
- this.gvMx1fstand.MinWidth = 50;
- this.gvMx1fstand.Name = "gvMx1fstand";
- this.gvMx1fstand.Tag = "query_a.fstand";
- this.gvMx1fstand.Visible = true;
- this.gvMx1fstand.VisibleIndex = 0;
- this.gvMx1fstand.Width = 94;
+ this.gvMx1fcheckTool.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
+ this.gvMx1fcheckTool.FieldName = "fcheckTool";
+ this.gvMx1fcheckTool.MinWidth = 100;
+ this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
+ this.gvMx1fcheckTool.Tag = "query_a.fcheck_tool";
+ this.gvMx1fcheckTool.Visible = true;
+ this.gvMx1fcheckTool.VisibleIndex = 1;
+ this.gvMx1fcheckTool.Width = 100;
+ //
+ // gvMx1fcheckItemDesc
+ //
+ this.gvMx1fcheckItemDesc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
+ this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
+ this.gvMx1fcheckItemDesc.MinWidth = 120;
+ this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
+ this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
+ this.gvMx1fcheckItemDesc.Visible = true;
+ this.gvMx1fcheckItemDesc.VisibleIndex = 2;
+ this.gvMx1fcheckItemDesc.Width = 120;
+ //
+ // gvMx1fspecRequ
+ //
+ this.gvMx1fspecRequ.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
+ this.gvMx1fspecRequ.FieldName = "fspecRequ";
+ this.gvMx1fspecRequ.MinWidth = 120;
+ this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
+ this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
+ this.gvMx1fspecRequ.Visible = true;
+ this.gvMx1fspecRequ.VisibleIndex = 3;
+ this.gvMx1fspecRequ.Width = 120;
//
// gvMx1fupAllow
//
@@ -316,8 +345,21 @@
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
this.gvMx1fupAllow.Tag = "query_a.fup_allow";
this.gvMx1fupAllow.Visible = true;
- this.gvMx1fupAllow.VisibleIndex = 2;
- this.gvMx1fupAllow.Width = 94;
+ this.gvMx1fupAllow.VisibleIndex = 4;
+ this.gvMx1fupAllow.Width = 50;
+ //
+ // gvMx1fstand
+ //
+ this.gvMx1fstand.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fstand.Caption = "鏍囧噯鍊�";
+ this.gvMx1fstand.FieldName = "fstand";
+ this.gvMx1fstand.MinWidth = 50;
+ this.gvMx1fstand.Name = "gvMx1fstand";
+ this.gvMx1fstand.Tag = "query_a.fstand";
+ this.gvMx1fstand.Visible = true;
+ this.gvMx1fstand.VisibleIndex = 5;
+ this.gvMx1fstand.Width = 50;
//
// gvMx1fdownAllow
//
@@ -329,99 +371,8 @@
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
this.gvMx1fdownAllow.Visible = true;
- this.gvMx1fdownAllow.VisibleIndex = 3;
- this.gvMx1fdownAllow.Width = 94;
- //
- // gvMx1sampleSizeNo
- //
- this.gvMx1sampleSizeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗙紪鐮�";
- this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
- this.gvMx1sampleSizeNo.MinWidth = 50;
- this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
- this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
- this.gvMx1sampleSizeNo.Visible = true;
- this.gvMx1sampleSizeNo.VisibleIndex = 4;
- this.gvMx1sampleSizeNo.Width = 94;
- //
- // gvMx1fcheckLevel
- //
- this.gvMx1fcheckLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
- this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
- this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
- this.gvMx1fcheckLevel.MinWidth = 50;
- this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
- this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
- this.gvMx1fcheckLevel.Visible = true;
- this.gvMx1fcheckLevel.VisibleIndex = 5;
- this.gvMx1fcheckLevel.Width = 94;
- //
- // gvMx1facLevel
- //
- this.gvMx1facLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
- this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
- this.gvMx1facLevel.FieldName = "facLevel";
- this.gvMx1facLevel.MinWidth = 50;
- this.gvMx1facLevel.Name = "gvMx1facLevel";
- this.gvMx1facLevel.Tag = "query_a.fac_level";
- this.gvMx1facLevel.Visible = true;
- this.gvMx1facLevel.VisibleIndex = 6;
- this.gvMx1facLevel.Width = 94;
- //
- // gvMx1fspecRequ
- //
- this.gvMx1fspecRequ.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
- this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
- this.gvMx1fspecRequ.FieldName = "fspecRequ";
- this.gvMx1fspecRequ.MinWidth = 50;
- this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
- this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
- this.gvMx1fspecRequ.Visible = true;
- this.gvMx1fspecRequ.VisibleIndex = 7;
- this.gvMx1fspecRequ.Width = 94;
- //
- // gvMx1checkQyt
- //
- this.gvMx1checkQyt.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
- this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
- this.gvMx1checkQyt.FieldName = "checkQyt";
- this.gvMx1checkQyt.MinWidth = 50;
- this.gvMx1checkQyt.Name = "gvMx1checkQyt";
- this.gvMx1checkQyt.Tag = "query_a.check_qyt";
- this.gvMx1checkQyt.Visible = true;
- this.gvMx1checkQyt.VisibleIndex = 8;
- this.gvMx1checkQyt.Width = 94;
- //
- // gvMx1fcheckResu
- //
- this.gvMx1fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fcheckResu.AppearanceCell.Options.UseFont = true;
- this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�";
- this.gvMx1fcheckResu.FieldName = "fcheckResu";
- this.gvMx1fcheckResu.MinWidth = 50;
- this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
- this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
- this.gvMx1fcheckResu.Visible = true;
- this.gvMx1fcheckResu.VisibleIndex = 9;
- this.gvMx1fcheckResu.Width = 94;
- //
- // gvMx1facQty
- //
- this.gvMx1facQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1facQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1facQty.Caption = "AC鏁伴噺";
- this.gvMx1facQty.FieldName = "facQty";
- this.gvMx1facQty.MinWidth = 50;
- this.gvMx1facQty.Name = "gvMx1facQty";
- this.gvMx1facQty.Tag = "query_a.fac_qty";
- this.gvMx1facQty.Visible = true;
- this.gvMx1facQty.VisibleIndex = 10;
- this.gvMx1facQty.Width = 94;
+ this.gvMx1fdownAllow.VisibleIndex = 6;
+ this.gvMx1fdownAllow.Width = 50;
//
// gvMx1freQty
//
@@ -433,8 +384,64 @@
this.gvMx1freQty.Name = "gvMx1freQty";
this.gvMx1freQty.Tag = "query_a.fre_qty";
this.gvMx1freQty.Visible = true;
- this.gvMx1freQty.VisibleIndex = 11;
- this.gvMx1freQty.Width = 94;
+ this.gvMx1freQty.VisibleIndex = 7;
+ this.gvMx1freQty.Width = 50;
+ //
+ // gvMx1checkQyt
+ //
+ this.gvMx1checkQyt.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
+ this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
+ this.gvMx1checkQyt.FieldName = "checkQyt";
+ this.gvMx1checkQyt.MinWidth = 60;
+ this.gvMx1checkQyt.Name = "gvMx1checkQyt";
+ this.gvMx1checkQyt.Tag = "query_a.check_qyt";
+ this.gvMx1checkQyt.Visible = true;
+ this.gvMx1checkQyt.VisibleIndex = 8;
+ this.gvMx1checkQyt.Width = 60;
+ //
+ // gvMx1fenterQty
+ //
+ this.gvMx1fenterQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
+ this.gvMx1fenterQty.FieldName = "fenterQty";
+ this.gvMx1fenterQty.MinWidth = 60;
+ this.gvMx1fenterQty.Name = "gvMx1fenterQty";
+ this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
+ this.gvMx1fenterQty.Visible = true;
+ this.gvMx1fenterQty.VisibleIndex = 9;
+ this.gvMx1fenterQty.Width = 60;
+ //
+ // gvMx1fcheckResu
+ //
+ this.gvMx1fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fcheckResu.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
+ this.gvMx1fcheckResu.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fcheckResu.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1fcheckResu.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1fcheckResu.AppearanceHeader.Options.UseForeColor = true;
+ this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�";
+ this.gvMx1fcheckResu.FieldName = "fcheckResu";
+ this.gvMx1fcheckResu.MinWidth = 80;
+ this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
+ this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
+ this.gvMx1fcheckResu.Visible = true;
+ this.gvMx1fcheckResu.VisibleIndex = 10;
+ this.gvMx1fcheckResu.Width = 94;
+ //
+ // gvMx1fngRate
+ //
+ this.gvMx1fngRate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
+ this.gvMx1fngRate.FieldName = "fngRateName";
+ this.gvMx1fngRate.MinWidth = 80;
+ this.gvMx1fngRate.Name = "gvMx1fngRate";
+ this.gvMx1fngRate.Tag = "query_a.fng_rate";
+ this.gvMx1fngRate.Visible = true;
+ this.gvMx1fngRate.VisibleIndex = 11;
+ this.gvMx1fngRate.Width = 94;
//
// gvMx1fngQty
//
@@ -447,33 +454,46 @@
this.gvMx1fngQty.Tag = "query_a.fng_qty";
this.gvMx1fngQty.Visible = true;
this.gvMx1fngQty.VisibleIndex = 12;
- this.gvMx1fngQty.Width = 94;
+ this.gvMx1fngQty.Width = 50;
//
- // gvMx1fngRate
+ // gvMx1sampleSizeNo
//
- this.gvMx1fngRate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
- this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
- this.gvMx1fngRate.FieldName = "fngRate";
- this.gvMx1fngRate.MinWidth = 50;
- this.gvMx1fngRate.Name = "gvMx1fngRate";
- this.gvMx1fngRate.Tag = "query_a.fng_rate";
- this.gvMx1fngRate.Visible = true;
- this.gvMx1fngRate.VisibleIndex = 13;
- this.gvMx1fngRate.Width = 94;
+ this.gvMx1sampleSizeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
+ this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�";
+ this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
+ this.gvMx1sampleSizeNo.MinWidth = 200;
+ this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
+ this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
+ this.gvMx1sampleSizeNo.Visible = true;
+ this.gvMx1sampleSizeNo.VisibleIndex = 13;
+ this.gvMx1sampleSizeNo.Width = 200;
//
- // gvMx1fenterQty
+ // gvMx1fcheckLevel
//
- this.gvMx1fenterQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
- this.gvMx1fenterQty.FieldName = "fenterQty";
- this.gvMx1fenterQty.MinWidth = 50;
- this.gvMx1fenterQty.Name = "gvMx1fenterQty";
- this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
- this.gvMx1fenterQty.Visible = true;
- this.gvMx1fenterQty.VisibleIndex = 14;
- this.gvMx1fenterQty.Width = 94;
+ this.gvMx1fcheckLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
+ this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
+ this.gvMx1fcheckLevel.MinWidth = 200;
+ this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
+ this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
+ this.gvMx1fcheckLevel.Visible = true;
+ this.gvMx1fcheckLevel.VisibleIndex = 14;
+ this.gvMx1fcheckLevel.Width = 200;
+ //
+ // gvMx1facLevel
+ //
+ this.gvMx1facLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
+ this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
+ this.gvMx1facLevel.FieldName = "facLevel";
+ this.gvMx1facLevel.MinWidth = 200;
+ this.gvMx1facLevel.Name = "gvMx1facLevel";
+ this.gvMx1facLevel.Tag = "query_a.fac_level";
+ this.gvMx1facLevel.Visible = true;
+ this.gvMx1facLevel.VisibleIndex = 15;
+ this.gvMx1facLevel.Width = 200;
//
// groupControl1
//
@@ -481,7 +501,7 @@
this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl1.Location = new System.Drawing.Point(0, 0);
this.groupControl1.Name = "groupControl1";
- this.groupControl1.Size = new System.Drawing.Size(1340, 288);
+ this.groupControl1.Size = new System.Drawing.Size(1340, 300);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "鎶芥牱缁撴灉";
//
@@ -491,7 +511,7 @@
this.gcMx2.Location = new System.Drawing.Point(2, 28);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1336, 258);
+ this.gcMx2.Size = new System.Drawing.Size(1336, 270);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -545,7 +565,7 @@
//
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, 135);
+ this.lb_remarks.Location = new System.Drawing.Point(627, 121);
this.lb_remarks.Name = "lb_remarks";
this.lb_remarks.Size = new System.Drawing.Size(73, 21);
this.lb_remarks.TabIndex = 786;
@@ -554,7 +574,7 @@
// txt_fngDesc
//
this.txt_fngDesc.Enabled = false;
- this.txt_fngDesc.Location = new System.Drawing.Point(706, 131);
+ this.txt_fngDesc.Location = new System.Drawing.Point(706, 117);
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;
@@ -565,57 +585,27 @@
//
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, 128);
+ this.lb_lifnr.Location = new System.Drawing.Point(394, 114);
this.lb_lifnr.Name = "lb_lifnr";
this.lb_lifnr.Size = new System.Drawing.Size(56, 21);
this.lb_lifnr.TabIndex = 642;
this.lb_lifnr.Text = "渚涘簲鍟� ";
//
- // txt_lifnr
- //
- this.txt_lifnr.Enabled = false;
- this.txt_lifnr.Location = new System.Drawing.Point(452, 128);
- this.txt_lifnr.Name = "txt_lifnr";
- this.txt_lifnr.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_lifnr.Properties.Appearance.Options.UseFont = true;
- this.txt_lifnr.Size = new System.Drawing.Size(150, 28);
- this.txt_lifnr.TabIndex = 642;
- //
// lb_fngHandle
//
this.lb_fngHandle.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fngHandle.Appearance.Options.UseFont = true;
- this.lb_fngHandle.Location = new System.Drawing.Point(876, 93);
+ this.lb_fngHandle.Location = new System.Drawing.Point(876, 81);
this.lb_fngHandle.Name = "lb_fngHandle";
this.lb_fngHandle.Size = new System.Drawing.Size(68, 21);
this.lb_fngHandle.TabIndex = 427;
this.lb_fngHandle.Text = "澶勭悊鏂瑰紡";
//
- // lb_checkQty
- //
- this.lb_checkQty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_checkQty.Appearance.Options.UseFont = true;
- this.lb_checkQty.Location = new System.Drawing.Point(377, 93);
- this.lb_checkQty.Name = "lb_checkQty";
- this.lb_checkQty.Size = new System.Drawing.Size(73, 21);
- this.lb_checkQty.TabIndex = 258;
- this.lb_checkQty.Text = "鎶芥鏁伴噺 ";
- //
- // txt_checkQty
- //
- this.txt_checkQty.Enabled = false;
- this.txt_checkQty.Location = new System.Drawing.Point(452, 89);
- this.txt_checkQty.Name = "txt_checkQty";
- this.txt_checkQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_checkQty.Properties.Appearance.Options.UseFont = true;
- this.txt_checkQty.Size = new System.Drawing.Size(150, 28);
- this.txt_checkQty.TabIndex = 258;
- //
// lb_fcheckResu
//
this.lb_fcheckResu.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fcheckResu.Appearance.Options.UseFont = true;
- this.lb_fcheckResu.Location = new System.Drawing.Point(627, 93);
+ this.lb_fcheckResu.Location = new System.Drawing.Point(627, 81);
this.lb_fcheckResu.Name = "lb_fcheckResu";
this.lb_fcheckResu.Size = new System.Drawing.Size(73, 21);
this.lb_fcheckResu.TabIndex = 235;
@@ -624,7 +614,7 @@
// txt_fcheckResu
//
this.txt_fcheckResu.Enabled = false;
- this.txt_fcheckResu.Location = new System.Drawing.Point(706, 89);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(706, 77);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckResu.Properties.Appearance.Options.UseFont = true;
@@ -655,7 +645,7 @@
//
this.lb_fcheckBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fcheckBy.Appearance.Options.UseFont = true;
- this.lb_fcheckBy.Location = new System.Drawing.Point(627, 8);
+ this.lb_fcheckBy.Location = new System.Drawing.Point(627, 14);
this.lb_fcheckBy.Name = "lb_fcheckBy";
this.lb_fcheckBy.Size = new System.Drawing.Size(73, 21);
this.lb_fcheckBy.TabIndex = 217;
@@ -664,7 +654,7 @@
// txt_fcheckBy
//
this.txt_fcheckBy.Enabled = false;
- this.txt_fcheckBy.Location = new System.Drawing.Point(706, 7);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(706, 10);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
@@ -675,7 +665,7 @@
//
this.lb_fcheckDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fcheckDate.Appearance.Options.UseFont = true;
- this.lb_fcheckDate.Location = new System.Drawing.Point(627, 52);
+ this.lb_fcheckDate.Location = new System.Drawing.Point(627, 48);
this.lb_fcheckDate.Name = "lb_fcheckDate";
this.lb_fcheckDate.Size = new System.Drawing.Size(73, 21);
this.lb_fcheckDate.TabIndex = 216;
@@ -684,7 +674,7 @@
// txt_fcheckDate
//
this.txt_fcheckDate.Enabled = false;
- this.txt_fcheckDate.Location = new System.Drawing.Point(706, 48);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(706, 44);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
@@ -704,7 +694,7 @@
// txt_releaseNo
//
this.txt_releaseNo.Enabled = false;
- this.txt_releaseNo.Location = new System.Drawing.Point(97, 10);
+ this.txt_releaseNo.Location = new System.Drawing.Point(94, 10);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
@@ -766,33 +756,32 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn13,
+ this.gridColumn19,
+ this.gv_ftype,
this.gv_fsubmit,
this.gridColumn12,
- this.gv_modify1Flag,
+ this.gridColumn13,
+ this.gv_fcheckResu,
this.gv_lotNo,
- this.gv_lifnr,
this.gv_releaseNo,
this.gv_itemNo,
this.gv_boardStyle,
this.gridColumn14,
this.gv_fbatchQty,
- this.gv_ftype,
- this.gv_fcheckResu,
this.gv_fcovertQty,
+ this.gv_lifnr,
this.gv_remarks,
this.gv_createBy,
this.gv_fcheckBy,
this.gridColumn15,
this.gv_fcheckDate,
- this.gv_freceQty,
- this.gv_checkQty,
this.gv_createDate,
this.gv_lastupdateBy,
this.gv_lastupdateDate,
this.gv_fngHandle,
- this.gv_states,
- this.gv_iqcDate});
+ this.gv_iqcDate,
+ this.gridColumn18,
+ this.gridColumn17});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -800,55 +789,85 @@
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
- // gridColumn13
+ // gridColumn19
//
- this.gridColumn13.Caption = "鏄惁鎬ユ枡";
- this.gridColumn13.FieldName = "urgentLag";
- this.gridColumn13.MinWidth = 50;
- this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.OptionsColumn.ReadOnly = true;
- this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 50;
+ this.gridColumn19.Caption = "鏀舵枡缁勭粐";
+ this.gridColumn19.FieldName = "receivingOrg";
+ this.gridColumn19.MinWidth = 250;
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Tag = "org.fnamber";
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 0;
+ this.gridColumn19.Width = 250;
+ //
+ // gv_ftype
+ //
+ this.gv_ftype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_ftype.AppearanceCell.Options.UseFont = true;
+ this.gv_ftype.Caption = "绫诲瀷";
+ this.gv_ftype.FieldName = "ftypeTxt";
+ this.gv_ftype.MaxWidth = 50;
+ this.gv_ftype.MinWidth = 50;
+ this.gv_ftype.Name = "gv_ftype";
+ this.gv_ftype.OptionsColumn.AllowEdit = false;
+ this.gv_ftype.Tag = "query_a.ftype";
+ this.gv_ftype.Visible = true;
+ 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 = "fsubmit";
+ 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 = 1;
+ this.gv_fsubmit.VisibleIndex = 2;
this.gv_fsubmit.Width = 50;
//
// gridColumn12
//
- this.gridColumn12.Caption = "璐ㄩ噺瀹℃牳";
- this.gridColumn12.FieldName = "qualityAudit";
+ this.gridColumn12.Caption = "瀹℃牳鏍囪瘑";
+ this.gridColumn12.FieldName = "modifyFlagTxt";
+ this.gridColumn12.MaxWidth = 50;
this.gridColumn12.MinWidth = 50;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Tag = "query_a.quality_audit";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 2;
+ this.gridColumn12.VisibleIndex = 3;
this.gridColumn12.Width = 50;
//
- // gv_modify1Flag
+ // gridColumn13
//
- this.gv_modify1Flag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_modify1Flag.AppearanceCell.Options.UseFont = true;
- this.gv_modify1Flag.Caption = "缁撴鏍囪瘑";
- this.gv_modify1Flag.FieldName = "modify1Flag";
- this.gv_modify1Flag.MinWidth = 50;
- this.gv_modify1Flag.Name = "gv_modify1Flag";
- this.gv_modify1Flag.OptionsColumn.AllowEdit = false;
- this.gv_modify1Flag.Tag = "query_a.modify1_flag";
- this.gv_modify1Flag.Visible = true;
- this.gv_modify1Flag.VisibleIndex = 3;
- this.gv_modify1Flag.Width = 50;
+ this.gridColumn13.Caption = "鏄惁鎬ユ枡";
+ this.gridColumn13.FieldName = "urgentLagTxt";
+ this.gridColumn13.MaxWidth = 50;
+ this.gridColumn13.MinWidth = 50;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.OptionsColumn.ReadOnly = true;
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 4;
+ this.gridColumn13.Width = 50;
+ //
+ // gv_fcheckResu
+ //
+ this.gv_fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
+ this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
+ this.gv_fcheckResu.FieldName = "fcheckResu";
+ this.gv_fcheckResu.MaxWidth = 70;
+ this.gv_fcheckResu.MinWidth = 70;
+ this.gv_fcheckResu.Name = "gv_fcheckResu";
+ 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.Width = 70;
//
// gv_lotNo
//
@@ -861,22 +880,8 @@
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
- this.gv_lotNo.VisibleIndex = 4;
+ this.gv_lotNo.VisibleIndex = 6;
this.gv_lotNo.Width = 150;
- //
- // gv_lifnr
- //
- this.gv_lifnr.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lifnr.AppearanceCell.Options.UseFont = true;
- this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
- this.gv_lifnr.FieldName = "suppName";
- this.gv_lifnr.MinWidth = 250;
- this.gv_lifnr.Name = "gv_lifnr";
- this.gv_lifnr.OptionsColumn.AllowEdit = false;
- this.gv_lifnr.Tag = "query_a.lifnr";
- this.gv_lifnr.Visible = true;
- this.gv_lifnr.VisibleIndex = 5;
- this.gv_lifnr.Width = 250;
//
// gv_releaseNo
//
@@ -889,7 +894,7 @@
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
this.gv_releaseNo.Visible = true;
- this.gv_releaseNo.VisibleIndex = 6;
+ this.gv_releaseNo.VisibleIndex = 7;
this.gv_releaseNo.Width = 150;
//
// gv_itemNo
@@ -903,7 +908,7 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 7;
+ this.gv_itemNo.VisibleIndex = 8;
this.gv_itemNo.Width = 100;
//
// gv_boardStyle
@@ -917,7 +922,7 @@
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
- this.gv_boardStyle.VisibleIndex = 8;
+ this.gv_boardStyle.VisibleIndex = 9;
this.gv_boardStyle.Width = 200;
//
// gridColumn14
@@ -928,7 +933,7 @@
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 9;
+ this.gridColumn14.VisibleIndex = 10;
this.gridColumn14.Width = 200;
//
// gv_fbatchQty
@@ -945,34 +950,6 @@
this.gv_fbatchQty.VisibleIndex = 11;
this.gv_fbatchQty.Width = 80;
//
- // gv_ftype
- //
- this.gv_ftype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_ftype.AppearanceCell.Options.UseFont = true;
- this.gv_ftype.Caption = "绫诲瀷(0鏉ユ枡,1鍦ㄥ簱)";
- this.gv_ftype.FieldName = "ftype";
- this.gv_ftype.MinWidth = 50;
- this.gv_ftype.Name = "gv_ftype";
- this.gv_ftype.OptionsColumn.AllowEdit = false;
- this.gv_ftype.Tag = "query_a.ftype";
- this.gv_ftype.Visible = true;
- this.gv_ftype.VisibleIndex = 12;
- this.gv_ftype.Width = 50;
- //
- // gv_fcheckResu
- //
- this.gv_fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
- this.gv_fcheckResu.FieldName = "fcheckResu";
- this.gv_fcheckResu.MinWidth = 100;
- this.gv_fcheckResu.Name = "gv_fcheckResu";
- this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
- this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
- this.gv_fcheckResu.Visible = true;
- this.gv_fcheckResu.VisibleIndex = 13;
- this.gv_fcheckResu.Width = 100;
- //
// gv_fcovertQty
//
this.gv_fcovertQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -985,21 +962,35 @@
this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
this.gv_fcovertQty.Visible = true;
- this.gv_fcovertQty.VisibleIndex = 15;
+ this.gv_fcovertQty.VisibleIndex = 12;
this.gv_fcovertQty.Width = 100;
+ //
+ // gv_lifnr
+ //
+ this.gv_lifnr.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lifnr.AppearanceCell.Options.UseFont = true;
+ this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
+ this.gv_lifnr.FieldName = "suppName";
+ this.gv_lifnr.MinWidth = 250;
+ this.gv_lifnr.Name = "gv_lifnr";
+ this.gv_lifnr.OptionsColumn.AllowEdit = false;
+ this.gv_lifnr.Tag = "query_a.lifnr";
+ this.gv_lifnr.Visible = true;
+ this.gv_lifnr.VisibleIndex = 13;
+ this.gv_lifnr.Width = 250;
//
// gv_remarks
//
this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_remarks.AppearanceCell.Options.UseFont = true;
this.gv_remarks.Caption = "涓嶈壇鎻忚堪";
- this.gv_remarks.FieldName = "remarks";
+ this.gv_remarks.FieldName = "fngDesc";
this.gv_remarks.MinWidth = 150;
this.gv_remarks.Name = "gv_remarks";
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 16;
+ this.gv_remarks.VisibleIndex = 14;
this.gv_remarks.Width = 150;
//
// gv_createBy
@@ -1013,7 +1004,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 17;
+ this.gv_createBy.VisibleIndex = 15;
this.gv_createBy.Width = 100;
//
// gv_fcheckBy
@@ -1027,7 +1018,7 @@
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 18;
+ this.gv_fcheckBy.VisibleIndex = 16;
this.gv_fcheckBy.Width = 100;
//
// gridColumn15
@@ -1038,7 +1029,7 @@
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.OptionsColumn.ReadOnly = true;
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 19;
+ this.gridColumn15.VisibleIndex = 18;
this.gridColumn15.Width = 180;
//
// gv_fcheckDate
@@ -1052,36 +1043,8 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 10;
+ this.gv_fcheckDate.VisibleIndex = 17;
this.gv_fcheckDate.Width = 180;
- //
- // gv_freceQty
- //
- this.gv_freceQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_freceQty.AppearanceCell.Options.UseFont = true;
- this.gv_freceQty.Caption = "鍒ゅ畾缁撴灉";
- this.gv_freceQty.FieldName = "freceQty";
- this.gv_freceQty.MinWidth = 100;
- this.gv_freceQty.Name = "gv_freceQty";
- this.gv_freceQty.OptionsColumn.AllowEdit = false;
- this.gv_freceQty.Tag = "query_a.frece_qty";
- this.gv_freceQty.Visible = true;
- this.gv_freceQty.VisibleIndex = 14;
- this.gv_freceQty.Width = 100;
- //
- // gv_checkQty
- //
- this.gv_checkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_checkQty.AppearanceCell.Options.UseFont = true;
- this.gv_checkQty.Caption = "鎶芥鏁伴噺";
- this.gv_checkQty.FieldName = "checkQty";
- this.gv_checkQty.MinWidth = 50;
- this.gv_checkQty.Name = "gv_checkQty";
- this.gv_checkQty.OptionsColumn.AllowEdit = false;
- this.gv_checkQty.Tag = "query_a.check_qty";
- this.gv_checkQty.Visible = true;
- this.gv_checkQty.VisibleIndex = 20;
- this.gv_checkQty.Width = 50;
//
// gv_createDate
//
@@ -1094,7 +1057,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 21;
+ this.gv_createDate.VisibleIndex = 19;
this.gv_createDate.Width = 180;
//
// gv_lastupdateBy
@@ -1108,7 +1071,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 22;
+ this.gv_lastupdateBy.VisibleIndex = 20;
this.gv_lastupdateBy.Width = 100;
//
// gv_lastupdateDate
@@ -1122,7 +1085,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 23;
+ this.gv_lastupdateDate.VisibleIndex = 21;
this.gv_lastupdateDate.Width = 180;
//
// gv_fngHandle
@@ -1136,22 +1099,8 @@
this.gv_fngHandle.OptionsColumn.AllowEdit = false;
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
- this.gv_fngHandle.VisibleIndex = 24;
+ this.gv_fngHandle.VisibleIndex = 22;
this.gv_fngHandle.Width = 100;
- //
- // gv_states
- //
- this.gv_states.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_states.AppearanceCell.Options.UseFont = true;
- this.gv_states.Caption = "鐘舵��";
- this.gv_states.FieldName = "states";
- this.gv_states.MinWidth = 50;
- this.gv_states.Name = "gv_states";
- this.gv_states.OptionsColumn.AllowEdit = false;
- this.gv_states.Tag = "query_a.states";
- this.gv_states.Visible = true;
- this.gv_states.VisibleIndex = 26;
- this.gv_states.Width = 50;
//
// gv_iqcDate
//
@@ -1164,8 +1113,28 @@
this.gv_iqcDate.OptionsColumn.AllowEdit = false;
this.gv_iqcDate.Tag = "query_a.iqc_date";
this.gv_iqcDate.Visible = true;
- this.gv_iqcDate.VisibleIndex = 27;
+ this.gv_iqcDate.VisibleIndex = 23;
this.gv_iqcDate.Width = 180;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.Caption = "瀹℃牳浜�";
+ this.gridColumn18.FieldName = "modify1By";
+ this.gridColumn18.MinWidth = 50;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 24;
+ this.gridColumn18.Width = 50;
+ //
+ // gridColumn17
+ //
+ this.gridColumn17.Caption = "瀹℃牳鏃堕棿";
+ this.gridColumn17.FieldName = "modify1Date";
+ this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Visible = true;
+ this.gridColumn17.VisibleIndex = 25;
+ this.gridColumn17.Width = 180;
//
// pageBar1
//
@@ -1190,10 +1159,10 @@
// xtraTabControl2
//
this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl2.Location = new System.Drawing.Point(0, 196);
+ this.xtraTabControl2.Location = new System.Drawing.Point(0, 184);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
- this.xtraTabControl2.Size = new System.Drawing.Size(1342, 492);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1342, 504);
this.xtraTabControl2.TabIndex = 2;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1204,7 +1173,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, 460);
+ this.tabMxPage3.Size = new System.Drawing.Size(1340, 472);
this.tabMxPage3.Text = "闄勪欢淇℃伅";
//
// gcMx3
@@ -1217,7 +1186,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemButtonEdit2,
this.repositoryItemButtonEdit3});
- this.gcMx3.Size = new System.Drawing.Size(1340, 403);
+ this.gcMx3.Size = new System.Drawing.Size(1340, 415);
this.gcMx3.TabIndex = 1;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -1313,10 +1282,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);
@@ -1334,10 +1303,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);
@@ -1355,10 +1324,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);
@@ -1375,15 +1344,18 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_fsubmit);
this.panel1.Controls.Add(this.txt_qualityAudit);
- this.panel1.Controls.Add(this.txt_modify1Flag);
- this.panel1.Controls.Add(this.lb_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);
+ this.panel1.Controls.Add(this.txt_suppName);
+ this.panel1.Controls.Add(this.txt_itemName);
this.panel1.Controls.Add(this.txt_fmrmode);
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.txt_fngHandle);
this.panel1.Controls.Add(this.txt_itemModel);
- this.panel1.Controls.Add(this.txt_itemId);
this.panel1.Controls.Add(this.lb_itemModel);
this.panel1.Controls.Add(this.lb_tname);
this.panel1.Controls.Add(this.txt_itemNo);
@@ -1393,14 +1365,9 @@
this.panel1.Controls.Add(this.lb_remarks);
this.panel1.Controls.Add(this.txt_fngDesc);
this.panel1.Controls.Add(this.lb_lifnr);
- this.panel1.Controls.Add(this.txt_lifnr);
this.panel1.Controls.Add(this.lb_fngHandle);
- 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_checkQty);
- this.panel1.Controls.Add(this.txt_checkQty);
this.panel1.Controls.Add(this.lb_fcheckResu);
this.panel1.Controls.Add(this.txt_fcheckResu);
this.panel1.Controls.Add(this.lb_fbatchQty);
@@ -1415,49 +1382,88 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1342, 196);
+ this.panel1.Size = new System.Drawing.Size(1342, 184);
this.panel1.TabIndex = 1;
- //
- // txt_fsubmit
- //
- this.txt_fsubmit.Enabled = false;
- this.txt_fsubmit.Location = new System.Drawing.Point(958, 10);
- this.txt_fsubmit.Name = "txt_fsubmit";
- this.txt_fsubmit.Properties.Caption = "";
- this.txt_fsubmit.Size = new System.Drawing.Size(94, 24);
- this.txt_fsubmit.TabIndex = 800;
//
// txt_qualityAudit
//
this.txt_qualityAudit.Enabled = false;
- this.txt_qualityAudit.Location = new System.Drawing.Point(1057, 49);
+ this.txt_qualityAudit.Location = new System.Drawing.Point(981, 12);
this.txt_qualityAudit.Name = "txt_qualityAudit";
this.txt_qualityAudit.Properties.Caption = "";
- this.txt_qualityAudit.Size = new System.Drawing.Size(53, 24);
- this.txt_qualityAudit.TabIndex = 799;
+ this.txt_qualityAudit.Size = new System.Drawing.Size(30, 24);
+ this.txt_qualityAudit.TabIndex = 808;
//
- // txt_modify1Flag
+ // txt_fsubmit
//
- this.txt_modify1Flag.Enabled = false;
- this.txt_modify1Flag.Location = new System.Drawing.Point(958, 50);
- this.txt_modify1Flag.Name = "txt_modify1Flag";
- this.txt_modify1Flag.Properties.Caption = "";
- this.txt_modify1Flag.Size = new System.Drawing.Size(27, 24);
- this.txt_modify1Flag.TabIndex = 798;
+ 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_qualityAudit
+ // lb_fsubmit
//
- this.lb_qualityAudit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_qualityAudit.Appearance.Options.UseFont = true;
- this.lb_qualityAudit.Location = new System.Drawing.Point(983, 52);
- this.lb_qualityAudit.Name = "lb_qualityAudit";
- this.lb_qualityAudit.Size = new System.Drawing.Size(68, 21);
- this.lb_qualityAudit.TabIndex = 796;
- this.lb_qualityAudit.Text = "鏄惁瀹℃牳";
+ 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.Name = "lb_modify1Flag";
+ this.lb_modify1Flag.Size = new System.Drawing.Size(68, 21);
+ this.lb_modify1Flag.TabIndex = 805;
+ this.lb_modify1Flag.Text = "瀹℃牳鏍囪瘑";
+ //
+ // labelControl3
+ //
+ this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ 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.TabIndex = 803;
+ this.labelControl3.Text = "杞崲鏁伴噺 ";
+ //
+ // txt_fcovertQty
+ //
+ this.txt_fcovertQty.Enabled = false;
+ this.txt_fcovertQty.Location = new System.Drawing.Point(452, 77);
+ this.txt_fcovertQty.Name = "txt_fcovertQty";
+ this.txt_fcovertQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fcovertQty.Properties.Appearance.Options.UseFont = true;
+ this.txt_fcovertQty.Size = new System.Drawing.Size(150, 28);
+ this.txt_fcovertQty.TabIndex = 804;
+ //
+ // txt_suppName
+ //
+ this.txt_suppName.Enabled = false;
+ this.txt_suppName.Location = new System.Drawing.Point(452, 117);
+ this.txt_suppName.Name = "txt_suppName";
+ this.txt_suppName.Size = new System.Drawing.Size(150, 24);
+ this.txt_suppName.TabIndex = 802;
+ //
+ // txt_itemName
+ //
+ this.txt_itemName.Enabled = false;
+ this.txt_itemName.Location = new System.Drawing.Point(94, 44);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemName.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemName.Size = new System.Drawing.Size(266, 28);
+ this.txt_itemName.TabIndex = 801;
//
// txt_fmrmode
//
- this.txt_fmrmode.Location = new System.Drawing.Point(958, 133);
+ this.txt_fmrmode.Location = new System.Drawing.Point(958, 119);
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)});
@@ -1471,7 +1477,7 @@
//
this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(876, 135);
+ this.labelControl2.Location = new System.Drawing.Point(876, 121);
this.labelControl2.Name = "labelControl2";
this.labelControl2.Size = new System.Drawing.Size(68, 21);
this.labelControl2.TabIndex = 794;
@@ -1479,7 +1485,7 @@
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(958, 91);
+ this.txt_fngHandle.Location = new System.Drawing.Point(958, 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)});
@@ -1492,7 +1498,7 @@
// txt_itemModel
//
this.txt_itemModel.Enabled = false;
- this.txt_itemModel.Location = new System.Drawing.Point(97, 128);
+ this.txt_itemModel.Location = new System.Drawing.Point(94, 114);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
@@ -1500,20 +1506,11 @@
this.txt_itemModel.TabIndex = 792;
this.txt_itemModel.Tag = "itemName";
//
- // txt_itemId
- //
- this.txt_itemId.IsReadly = true;
- this.txt_itemId.Location = new System.Drawing.Point(97, 46);
- this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(266, 33);
- this.txt_itemId.TabIndex = 791;
- this.txt_itemId.Tag = "no";
- //
// lb_itemModel
//
this.lb_itemModel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_itemModel.Appearance.Options.UseFont = true;
- this.lb_itemModel.Location = new System.Drawing.Point(20, 128);
+ this.lb_itemModel.Location = new System.Drawing.Point(20, 114);
this.lb_itemModel.Name = "lb_itemModel";
this.lb_itemModel.Size = new System.Drawing.Size(68, 21);
this.lb_itemModel.TabIndex = 790;
@@ -1523,7 +1520,7 @@
//
this.lb_tname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tname.Appearance.Options.UseFont = true;
- this.lb_tname.Location = new System.Drawing.Point(20, 93);
+ this.lb_tname.Location = new System.Drawing.Point(20, 81);
this.lb_tname.Name = "lb_tname";
this.lb_tname.Size = new System.Drawing.Size(68, 21);
this.lb_tname.TabIndex = 788;
@@ -1532,7 +1529,7 @@
// txt_itemNo
//
this.txt_itemNo.Enabled = false;
- this.txt_itemNo.Location = new System.Drawing.Point(97, 89);
+ this.txt_itemNo.Location = new System.Drawing.Point(94, 77);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
@@ -1543,7 +1540,7 @@
//
this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(20, 52);
+ this.labelControl1.Location = new System.Drawing.Point(20, 48);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(68, 21);
this.labelControl1.TabIndex = 787;
@@ -1551,7 +1548,7 @@
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(405, 167);
+ this.labelControl11.Location = new System.Drawing.Point(405, 152);
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);
@@ -1562,37 +1559,17 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(456, 167);
+ this.lbGuid.Location = new System.Drawing.Point(456, 152);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
this.lbGuid.Visible = false;
//
- // 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(871, 10);
- this.lb_fsubmit.Name = "lb_fsubmit";
- this.lb_fsubmit.Size = new System.Drawing.Size(73, 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(876, 52);
- 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
//
this.lb_lotNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lotNo.Appearance.Options.UseFont = true;
- this.lb_lotNo.Location = new System.Drawing.Point(394, 52);
+ 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.TabIndex = 262;
@@ -1601,18 +1578,30 @@
// txt_lotNo
//
this.txt_lotNo.Enabled = false;
- this.txt_lotNo.Location = new System.Drawing.Point(452, 48);
+ this.txt_lotNo.Location = new System.Drawing.Point(452, 44);
this.txt_lotNo.Name = "txt_lotNo";
this.txt_lotNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
this.txt_lotNo.Size = new System.Drawing.Size(150, 28);
this.txt_lotNo.TabIndex = 262;
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(903, 30);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 7;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
// Frm_MesQaItemsDetect01Check
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1344, 800);
+ this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesQaItemsDetect01Check";
@@ -1630,8 +1619,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).EndInit();
@@ -1653,14 +1640,17 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_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();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
@@ -1679,12 +1669,8 @@
private DevExpress.XtraEditors.TextEdit txt_fngDesc;
private DevExpress.XtraEditors.LabelControl lb_lifnr;
- private DevExpress.XtraEditors.TextEdit txt_lifnr;
private DevExpress.XtraEditors.LabelControl lb_fngHandle;
-
- private DevExpress.XtraEditors.LabelControl lb_checkQty;
- private DevExpress.XtraEditors.TextEdit txt_checkQty;
private DevExpress.XtraEditors.LabelControl lb_fcheckResu;
private DevExpress.XtraEditors.TextEdit txt_fcheckResu;
@@ -1702,34 +1688,13 @@
private DevExpress.XtraEditors.TextEdit txt_releaseNo;
private DevExpress.XtraTab.XtraTabPage tabMxPage3;
private DevExpress.XtraEditors.MemoEdit txt_itemModel;
- private UserControl.UcLookItems txt_itemId;
private DevExpress.XtraEditors.LabelControl lb_itemModel;
private DevExpress.XtraEditors.LabelControl lb_tname;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraEditors.LabelControl labelControl1;
- 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;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstand;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1fupAllow;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1sampleSizeNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckLevel;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1facLevel;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItem;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1fspecRequ;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkQyt;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckResu;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1facQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1freQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1fngQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1fngRate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1fenterQty;
private DevExpress.XtraEditors.GroupControl groupControl1;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
@@ -1753,7 +1718,6 @@
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_modify1Flag;
private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_lifnr;
private DevExpress.XtraGrid.Columns.GridColumn gv_releaseNo;
@@ -1769,23 +1733,47 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckBy;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_freceQty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkQty;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_fngHandle;
- private DevExpress.XtraGrid.Columns.GridColumn gv_states;
private DevExpress.XtraGrid.Columns.GridColumn gv_iqcDate;
private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode;
private DevExpress.XtraEditors.LabelControl labelControl2;
private DevExpress.XtraEditors.ComboBoxEdit txt_fngHandle;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
- private DevExpress.XtraEditors.LabelControl lb_qualityAudit;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
- private DevExpress.XtraEditors.CheckEdit txt_fsubmit;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ private DevExpress.XtraEditors.TextEdit txt_itemName;
+ private DevExpress.XtraEditors.TextEdit txt_suppName;
+ private DevExpress.XtraEditors.LabelControl labelControl3;
+ private DevExpress.XtraEditors.TextEdit txt_fcovertQty;
private DevExpress.XtraEditors.CheckEdit txt_qualityAudit;
- private DevExpress.XtraEditors.CheckEdit txt_modify1Flag;
+ private DevExpress.XtraEditors.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;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItem;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckTool;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItemDesc;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fspecRequ;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fupAllow;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstand;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1freQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkQyt;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fenterQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckResu;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fngRate;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fngQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1sampleSizeNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckLevel;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1facLevel;
+ private System.Windows.Forms.PictureBox picCheckBox;
}
}
\ 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 820caf5..790fdd7 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -25,16 +25,17 @@
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- this.toolBarMenu1.btnZhiLiangChkClick += ToolBarMenu1_btnZhiLiangChkClick;
- this.toolBarMenu1.btnZhiLiangFchkClick += ToolBarMenu1_btnZhiLiangFchkClick;
+ this.toolBarMenu1.btnChkClick += ToolBarMenu1_btnZhiLiangChkClick;
+ this.toolBarMenu1.btnFChkClick += ToolBarMenu1_btnZhiLiangFchkClick;
this.toolBarMenu1.btnBoHuiClick += ToolBarMenu1_btnBoHuiClick;
+ toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
+ toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
- gcMx1.MouseClick += GcMx1_MouseClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "qualityAudit", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -47,14 +48,9 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷�
- txt_itemId.EditChanged += (s, e) =>
- {
- txt_itemModel.Text = this.txt_itemId.GetModel();
- txt_itemNo.Text = this.txt_itemId.GetCode();
- };
ucUpFile1.UpChanged += UcUpFile1_UpChanged;
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
+ gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -69,7 +65,17 @@
return;
getList12(rowGuid);
}
-
+ private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
+ {
+ if (e.FocusedRowHandle >= 0)
+ {
+ DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
+ string rowGuid = row["guid"].ToString();
+ if (string.IsNullOrEmpty(rowGuid))
+ return;
+ getList12(rowGuid);
+ }
+ }
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -181,6 +187,28 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
}
+ private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_itemName, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ toolBarMenu1.rptParameter = "rpt_Detect01{}";
+ }
+ private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_itemName, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ this.toolBarMenu1.rptParameter = "rpt_Detect01{" + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "}";
+ }
+
/// <summary>
/// 椹冲洖
/// </summary>
@@ -189,32 +217,7 @@
private void ToolBarMenu1_btnBoHuiClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_releaseNo, gridView1);
- toolBarMenu1.guidKey = rowGuid;
-
- if (string.IsNullOrEmpty(rowGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾瑕侀┏鍥炲悧锛�"))
- return;
-
- try
- {
- var strJson = UtilityHelper.HttpPost("", _webServiceName + "IqcQcSubmit13",
- JsonConvert.SerializeObject(rowGuid));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
+ _toolCk(-1);
}
/// <summary>
/// 璐ㄩ噺鍙嶅鏍�
@@ -223,33 +226,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnZhiLiangFchkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_releaseNo, gridView1);
- toolBarMenu1.guidKey = rowGuid;
-
- if (string.IsNullOrEmpty(rowGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺瀹℃牳鍚楋紵"))
- return;
-
- try
- {
- var strJson = UtilityHelper.HttpPost("", _webServiceName + "IqcQcSubmit11",
- JsonConvert.SerializeObject(rowGuid));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
+ _toolCk(0);
}
/// <summary>
/// 璐ㄩ噺瀹℃牳
@@ -258,33 +235,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnZhiLiangChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_releaseNo, gridView1);
- toolBarMenu1.guidKey = rowGuid;
-
- if (string.IsNullOrEmpty(rowGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺瀹℃牳鍚楋紵"))
- return;
-
- try
- {
- var strJson = UtilityHelper.HttpPost("", _webServiceName + "IqcQcSubmit",
- JsonConvert.SerializeObject(rowGuid));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
+ _toolCk(1);
}
/// <summary>
@@ -317,6 +268,7 @@
private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ _sbSqlWhere += " and isnull(fsubmit,0)=1";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -561,5 +513,61 @@
}
}
}
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "瀹℃牳";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
+ break;
+ case -1:
+ strMsg = "椹冲洖";
+ break;
+ };
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ guid = rowGuid,
+ inFieldValue = _inFieldValue,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EditModelSubmitZhiLiang",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim());
+ else
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
index 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/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 7e48bd4..4c028f1 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -438,6 +438,7 @@
lst.Add(btnLog.Name);
lst.Add(btnPiZhun.Name);
lst.Add(btnHelp.Name);
+ lst.Add(btnBoHui.Name);
_enabledBtn(lst);
this.currentAction = "esc";
if (btnEscClick != null) btnEscClick(this, e);
@@ -464,6 +465,12 @@
lst.Add(btnFjianYan.Name);
lst.Add(btnQuery.Name);
lst.Add(btnLog.Name);
+ lst.Add(btnZhiLiangChk.Name);
+ lst.Add(btnZhiLiangFchk.Name);
+ lst.Add(btnPiZhun.Name);
+ lst.Add(btnBoHui.Name);
+ lst.Add(btnDesign.Name);
+ lst.Add(btnReport.Name);
_enabledBtn(lst);
}
}
--
Gitblit v1.9.3