From 4d44c3e74f5872c85ce2eb4453978c7e9176a338 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 09 十一月 2024 18:04:03 +0800
Subject: [PATCH] 11
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 45 +++++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj.user | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx | 2
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9 -
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 221 ++++++++++++++++++++++++++------------------
5 files changed, 178 insertions(+), 101 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index d762af8..17753d8 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -29,17 +29,17 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = 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 serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = 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();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -138,6 +138,9 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.panel1 = new System.Windows.Forms.Panel();
+ 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();
@@ -152,9 +155,9 @@
this.txt_modify1Flag = new DevExpress.XtraEditors.TextEdit();
this.lb_lotNo = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit();
- this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
- this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.lb_qualityAudit = new DevExpress.XtraEditors.LabelControl();
+ this.txt_qualityAudit = new DevExpress.XtraEditors.TextEdit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -192,13 +195,14 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.panel1.SuspendLayout();
+ ((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_fsubmit.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).BeginInit();
this.SuspendLayout();
//
// tabMxPage1
@@ -790,6 +794,7 @@
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn13,
this.gv_fsubmit,
+ this.gridColumn12,
this.gv_modify1Flag,
this.gv_lotNo,
this.gv_lifnr,
@@ -832,7 +837,7 @@
this.gridColumn13.OptionsColumn.ReadOnly = true;
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 50;
//
// gv_fsubmit
//
@@ -846,21 +851,21 @@
this.gv_fsubmit.Tag = "query_a.fsubmit";
this.gv_fsubmit.Visible = true;
this.gv_fsubmit.VisibleIndex = 1;
- this.gv_fsubmit.Width = 94;
+ this.gv_fsubmit.Width = 50;
//
// gv_modify1Flag
//
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.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 = 2;
- this.gv_modify1Flag.Width = 100;
+ this.gv_modify1Flag.VisibleIndex = 3;
+ this.gv_modify1Flag.Width = 50;
//
// gv_lotNo
//
@@ -873,7 +878,7 @@
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
- this.gv_lotNo.VisibleIndex = 3;
+ this.gv_lotNo.VisibleIndex = 4;
this.gv_lotNo.Width = 150;
//
// gv_lifnr
@@ -887,7 +892,7 @@
this.gv_lifnr.OptionsColumn.AllowEdit = false;
this.gv_lifnr.Tag = "query_a.lifnr";
this.gv_lifnr.Visible = true;
- this.gv_lifnr.VisibleIndex = 4;
+ this.gv_lifnr.VisibleIndex = 5;
this.gv_lifnr.Width = 250;
//
// gv_releaseNo
@@ -901,7 +906,7 @@
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
this.gv_releaseNo.Visible = true;
- this.gv_releaseNo.VisibleIndex = 5;
+ this.gv_releaseNo.VisibleIndex = 6;
this.gv_releaseNo.Width = 150;
//
// gv_itemId
@@ -915,8 +920,8 @@
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.item_id";
this.gv_itemId.Visible = true;
- this.gv_itemId.VisibleIndex = 6;
- this.gv_itemId.Width = 100;
+ this.gv_itemId.VisibleIndex = 7;
+ this.gv_itemId.Width = 80;
//
// gv_itemNo
//
@@ -929,7 +934,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
@@ -943,7 +948,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
@@ -954,7 +959,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
@@ -968,8 +973,8 @@
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
this.gv_fbatchQty.Visible = true;
- this.gv_fbatchQty.VisibleIndex = 11;
- this.gv_fbatchQty.Width = 100;
+ this.gv_fbatchQty.VisibleIndex = 12;
+ this.gv_fbatchQty.Width = 80;
//
// gv_ftype
//
@@ -982,8 +987,8 @@
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 = 94;
+ this.gv_ftype.VisibleIndex = 13;
+ this.gv_ftype.Width = 50;
//
// gv_fcheckResu
//
@@ -996,7 +1001,7 @@
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.VisibleIndex = 14;
this.gv_fcheckResu.Width = 100;
//
// gv_fcovertQty
@@ -1011,7 +1016,7 @@
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 = 16;
this.gv_fcovertQty.Width = 100;
//
// gv_remarks
@@ -1025,7 +1030,7 @@
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 = 17;
this.gv_remarks.Width = 150;
//
// gv_createBy
@@ -1039,7 +1044,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 = 18;
this.gv_createBy.Width = 100;
//
// gv_fcheckBy
@@ -1053,7 +1058,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 = 19;
this.gv_fcheckBy.Width = 100;
//
// gridColumn15
@@ -1064,7 +1069,7 @@
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.OptionsColumn.ReadOnly = true;
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 19;
+ this.gridColumn15.VisibleIndex = 20;
this.gridColumn15.Width = 180;
//
// gv_fcheckDate
@@ -1078,7 +1083,7 @@
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 = 11;
this.gv_fcheckDate.Width = 180;
//
// gv_freceQty
@@ -1092,7 +1097,7 @@
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.VisibleIndex = 15;
this.gv_freceQty.Width = 100;
//
// gv_checkQty
@@ -1106,8 +1111,8 @@
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 = 94;
+ this.gv_checkQty.VisibleIndex = 21;
+ this.gv_checkQty.Width = 50;
//
// gv_createDate
//
@@ -1120,7 +1125,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 = 22;
this.gv_createDate.Width = 180;
//
// gv_lastupdateBy
@@ -1134,7 +1139,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 = 23;
this.gv_lastupdateBy.Width = 100;
//
// gv_lastupdateDate
@@ -1148,7 +1153,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 = 24;
this.gv_lastupdateDate.Width = 180;
//
// gv_fngHandle
@@ -1162,7 +1167,7 @@
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 = 25;
this.gv_fngHandle.Width = 100;
//
// gv_fversion
@@ -1176,8 +1181,8 @@
this.gv_fversion.OptionsColumn.AllowEdit = false;
this.gv_fversion.Tag = "query_a.fversion";
this.gv_fversion.Visible = true;
- this.gv_fversion.VisibleIndex = 25;
- this.gv_fversion.Width = 94;
+ this.gv_fversion.VisibleIndex = 26;
+ this.gv_fversion.Width = 50;
//
// gv_states
//
@@ -1190,8 +1195,8 @@
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 = 94;
+ this.gv_states.VisibleIndex = 27;
+ this.gv_states.Width = 50;
//
// gv_iqcDate
//
@@ -1204,7 +1209,7 @@
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 = 28;
this.gv_iqcDate.Width = 180;
//
// pageBar1
@@ -1353,10 +1358,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions7.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions7.Image")));
- editorButtonImageOptions7.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, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", 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);
@@ -1374,10 +1379,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions8.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.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, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", 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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1394,6 +1399,8 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.lb_qualityAudit);
+ this.panel1.Controls.Add(this.txt_qualityAudit);
this.panel1.Controls.Add(this.txt_fmrmode);
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.txt_fngHandle);
@@ -1438,6 +1445,40 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1342, 208);
this.panel1.TabIndex = 1;
+ //
+ // txt_fmrmode
+ //
+ this.txt_fmrmode.Location = new System.Drawing.Point(963, 163);
+ this.txt_fmrmode.Name = "txt_fmrmode";
+ this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_fmrmode.Properties.Items.AddRange(new object[] {
+ "閫�鏂欒ˉ鏂�",
+ "閫�鏂欏苟鎵ｆ"});
+ this.txt_fmrmode.Size = new System.Drawing.Size(140, 24);
+ this.txt_fmrmode.TabIndex = 795;
+ //
+ // labelControl2
+ //
+ this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl2.Appearance.Options.UseFont = true;
+ this.labelControl2.Location = new System.Drawing.Point(884, 169);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(68, 21);
+ this.labelControl2.TabIndex = 794;
+ this.labelControl2.Text = "閫�鏂欐柟寮�";
+ //
+ // txt_fngHandle
+ //
+ this.txt_fngHandle.Location = new System.Drawing.Point(963, 130);
+ this.txt_fngHandle.Name = "txt_fngHandle";
+ this.txt_fngHandle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_fngHandle.Properties.Items.AddRange(new object[] {
+ "閫�璐�",
+ "鐗归噰鐩存帴浣跨敤"});
+ this.txt_fngHandle.Size = new System.Drawing.Size(140, 24);
+ this.txt_fngHandle.TabIndex = 793;
//
// txt_itemModel
//
@@ -1538,9 +1579,9 @@
this.lb_modify1Flag.Appearance.Options.UseFont = true;
this.lb_modify1Flag.Location = new System.Drawing.Point(884, 53);
this.lb_modify1Flag.Name = "lb_modify1Flag";
- this.lb_modify1Flag.Size = new System.Drawing.Size(73, 21);
+ this.lb_modify1Flag.Size = new System.Drawing.Size(68, 21);
this.lb_modify1Flag.TabIndex = 306;
- this.lb_modify1Flag.Text = "鏄惁瀹℃牳 ";
+ this.lb_modify1Flag.Text = "鏄惁缁撴";
//
// txt_modify1Flag
//
@@ -1548,7 +1589,7 @@
this.txt_modify1Flag.Name = "txt_modify1Flag";
this.txt_modify1Flag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_modify1Flag.Properties.Appearance.Options.UseFont = true;
- this.txt_modify1Flag.Size = new System.Drawing.Size(150, 28);
+ this.txt_modify1Flag.Size = new System.Drawing.Size(45, 28);
this.txt_modify1Flag.TabIndex = 306;
//
// lb_lotNo
@@ -1570,39 +1611,35 @@
this.txt_lotNo.Size = new System.Drawing.Size(150, 28);
this.txt_lotNo.TabIndex = 262;
//
- // txt_fngHandle
+ // gridColumn12
//
- this.txt_fngHandle.Location = new System.Drawing.Point(963, 130);
- this.txt_fngHandle.Name = "txt_fngHandle";
- this.txt_fngHandle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_fngHandle.Properties.Items.AddRange(new object[] {
- "閫�璐�",
- "鐗归噰鐩存帴浣跨敤"});
- this.txt_fngHandle.Size = new System.Drawing.Size(140, 24);
- this.txt_fngHandle.TabIndex = 793;
+ this.gridColumn12.Caption = "璐ㄩ噺瀹℃牳";
+ this.gridColumn12.FieldName = "qualityAudit";
+ 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.Width = 50;
//
- // labelControl2
+ // lb_qualityAudit
//
- this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(884, 169);
- this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(68, 21);
- this.labelControl2.TabIndex = 794;
- this.labelControl2.Text = "閫�鏂欐柟寮�";
+ 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(1025, 53);
+ 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 = "鏄惁瀹℃牳";
//
- // txt_fmrmode
+ // txt_qualityAudit
//
- this.txt_fmrmode.Location = new System.Drawing.Point(963, 163);
- this.txt_fmrmode.Name = "txt_fmrmode";
- this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_fmrmode.Properties.Items.AddRange(new object[] {
- "閫�鏂欒ˉ鏂�",
- "閫�鏂欏苟鎵ｆ"});
- this.txt_fmrmode.Size = new System.Drawing.Size(140, 24);
- this.txt_fmrmode.TabIndex = 795;
+ this.txt_qualityAudit.Location = new System.Drawing.Point(1099, 46);
+ this.txt_qualityAudit.Name = "txt_qualityAudit";
+ this.txt_qualityAudit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_qualityAudit.Properties.Appearance.Options.UseFont = true;
+ this.txt_qualityAudit.Size = new System.Drawing.Size(51, 28);
+ this.txt_qualityAudit.TabIndex = 797;
//
// Frm_MesQaItemsDetect01Check
//
@@ -1650,13 +1687,14 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((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_fsubmit.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -1786,5 +1824,8 @@
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.XtraEditors.TextEdit txt_qualityAudit;
}
}
\ 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 1dc64ea..e21b553 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -8,6 +8,7 @@
using System.Data;
using System.Drawing;
using System.Windows.Forms;
+using static DevExpress.XtraPrinting.Native.PageSizeInfo;
namespace Gs.DevApp.DevFrm.QC
{
@@ -165,6 +166,28 @@
(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);
+ }
}
/// <summary>
/// 璐ㄩ噺瀹℃牳
@@ -178,6 +201,28 @@
(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);
+ }
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
index 8679993..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="editorButtonImageOptions7.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/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 9498d85..7191ab2 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -437,12 +437,6 @@
<Compile Include="TestForm\XtraForm2.Designer.cs">
<DependentUpon>XtraForm2.cs</DependentUpon>
</Compile>
- <Compile Include="TestForm\XtraForm3.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="TestForm\XtraForm3.Designer.cs">
- <DependentUpon>XtraForm3.cs</DependentUpon>
- </Compile>
<Compile Include="ToolBox\LogHelper.cs" />
<Compile Include="ToolBox\MsgHelper.cs" />
<Compile Include="ToolBox\UpdateParentEventArgs.cs" />
@@ -663,9 +657,6 @@
</EmbeddedResource>
<EmbeddedResource Include="TestForm\XtraForm2.resx">
<DependentUpon>XtraForm2.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="TestForm\XtraForm3.resx">
- <DependentUpon>XtraForm3.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectCgMx.resx">
<DependentUpon>SelectCgMx.cs</DependentUpon>
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
index 7a74901..cebb4cf 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
<PublishUrlHistory>publish\</PublishUrlHistory>
<InstallUrlHistory />
<SupportUrlHistory />
--
Gitblit v1.9.3