From 8dfc8d054b5b14e3fcde6415dd22cedf10c09915 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 05 十一月 2024 14:13:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 77 +++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 15 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index cb7e58b..a3d1e49 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -54,10 +54,13 @@
this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panMsg = new DevExpress.XtraEditors.PanelControl();
+ this.labCurrentItem = new DevExpress.XtraEditors.LabelControl();
+ this.btnLoad = new DevExpress.XtraEditors.SimpleButton();
this.txtJianYan = new DevExpress.XtraEditors.TextEdit();
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
@@ -147,6 +150,7 @@
this.txt_modify1Flag = new DevExpress.XtraEditors.TextEdit();
this.lb_lotNo = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
+ this.labCurrentGuid = new DevExpress.XtraEditors.LabelControl();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -518,11 +522,22 @@
// gvMx2
//
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn4,
this.gridColumn3,
this.gridColumn2,
this.gridColumn1});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "guid涓嶈兘鍒犻櫎";
+ this.gridColumn4.FieldName = "guid";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 3;
+ this.gridColumn4.Width = 94;
//
// gridColumn3
//
@@ -556,6 +571,9 @@
//
// panMsg
//
+ this.panMsg.Controls.Add(this.labCurrentGuid);
+ this.panMsg.Controls.Add(this.labCurrentItem);
+ this.panMsg.Controls.Add(this.btnLoad);
this.panMsg.Controls.Add(this.txtJianYan);
this.panMsg.Controls.Add(this.labelControl3);
this.panMsg.Controls.Add(this.labelControl2);
@@ -565,32 +583,49 @@
this.panMsg.Size = new System.Drawing.Size(1340, 68);
this.panMsg.TabIndex = 1;
//
+ // labCurrentItem
+ //
+ this.labCurrentItem.Location = new System.Drawing.Point(141, 30);
+ this.labCurrentItem.Name = "labCurrentItem";
+ this.labCurrentItem.Size = new System.Drawing.Size(81, 18);
+ this.labCurrentItem.TabIndex = 4;
+ this.labCurrentItem.Text = "labelControl4";
+ //
+ // btnLoad
+ //
+ this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.refresh_32x321;
+ this.btnLoad.Location = new System.Drawing.Point(889, 16);
+ this.btnLoad.Name = "btnLoad";
+ this.btnLoad.Size = new System.Drawing.Size(180, 34);
+ this.btnLoad.TabIndex = 3;
+ this.btnLoad.Text = "閲嶆柊鍔犺浇妫�楠岄」鐩�";
+ //
// txtJianYan
//
- this.txtJianYan.Location = new System.Drawing.Point(556, 12);
+ this.txtJianYan.Location = new System.Drawing.Point(648, 16);
this.txtJianYan.Name = "txtJianYan";
- this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 13F);
+ this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 14F);
this.txtJianYan.Properties.Appearance.Options.UseFont = true;
this.txtJianYan.Size = new System.Drawing.Size(197, 34);
this.txtJianYan.TabIndex = 2;
//
// labelControl3
//
- this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 13F);
+ this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 14F);
this.labelControl3.Appearance.Options.UseFont = true;
- this.labelControl3.Location = new System.Drawing.Point(161, 19);
+ this.labelControl3.Location = new System.Drawing.Point(240, 19);
this.labelControl3.Name = "labelControl3";
- this.labelControl3.Size = new System.Drawing.Size(367, 27);
+ this.labelControl3.Size = new System.Drawing.Size(398, 29);
this.labelControl3.TabIndex = 1;
this.labelControl3.Text = "褰曞叆妫�楠岀粨鏋滐紙OK-19,NG-1,绾暟瀛楋級";
//
// labelControl2
//
- this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 13F);
+ this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 14F);
this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(60, 19);
+ this.labelControl2.Location = new System.Drawing.Point(24, 19);
this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(110, 27);
+ this.labelControl2.Size = new System.Drawing.Size(120, 29);
this.labelControl2.TabIndex = 0;
this.labelControl2.Text = "妫�楠岄」鐩細";
//
@@ -633,13 +668,13 @@
this.gv_itemId.AppearanceCell.Options.UseFont = true;
this.gv_itemId.Caption = "鐗╂枡ID";
this.gv_itemId.FieldName = "itemId";
- this.gv_itemId.MinWidth = 50;
+ this.gv_itemId.MinWidth = 100;
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.item_id";
this.gv_itemId.Visible = true;
this.gv_itemId.VisibleIndex = 5;
- this.gv_itemId.Width = 94;
+ this.gv_itemId.Width = 100;
//
// gv_iqcDate
//
@@ -998,13 +1033,13 @@
this.gv_lotNo.AppearanceCell.Options.UseFont = true;
this.gv_lotNo.Caption = "閫佹鎵规";
this.gv_lotNo.FieldName = "lotNo";
- this.gv_lotNo.MinWidth = 120;
+ this.gv_lotNo.MinWidth = 150;
this.gv_lotNo.Name = "gv_lotNo";
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.Width = 120;
+ this.gv_lotNo.Width = 150;
//
// lb_checkQty
//
@@ -1285,17 +1320,17 @@
this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
this.gv_releaseNo.FieldName = "releaseNo";
- this.gv_releaseNo.MinWidth = 120;
+ this.gv_releaseNo.MinWidth = 150;
this.gv_releaseNo.Name = "gv_releaseNo";
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
this.gv_releaseNo.Visible = true;
this.gv_releaseNo.VisibleIndex = 0;
- this.gv_releaseNo.Width = 120;
+ this.gv_releaseNo.Width = 150;
//
// toolBarMenu1
//
- this.toolBarMenu1.chkParameter = "1,1,1,1,000chk_IqcJianYanCommit";
+ this.toolBarMenu1.chkParameter = "0,0,0,0,000chk_iqc_detect01_submit";
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -1653,6 +1688,14 @@
this.txt_lotNo.Size = new System.Drawing.Size(150, 28);
this.txt_lotNo.TabIndex = 262;
//
+ // labCurrentGuid
+ //
+ this.labCurrentGuid.Location = new System.Drawing.Point(86, 3);
+ this.labCurrentGuid.Name = "labCurrentGuid";
+ this.labCurrentGuid.Size = new System.Drawing.Size(81, 18);
+ this.labCurrentGuid.TabIndex = 5;
+ this.labCurrentGuid.Text = "labelControl4";
+ //
// Frm_MesQaItemsDetect01
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1840,5 +1883,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraEditors.SimpleButton btnLoad;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraEditors.LabelControl labCurrentItem;
+ private DevExpress.XtraEditors.LabelControl labCurrentGuid;
}
}
\ No newline at end of file
--
Gitblit v1.9.3