From 39cd862ee40f1f5e6e14a4dea383b92112913cdb Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 06 十一月 2024 13:55:20 +0800
Subject: [PATCH] iqc
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 258 ++++++++-------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx | 22 +
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 288 +++++++++++------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 332 ++++++++++----------
5 files changed, 513 insertions(+), 389 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index a3d1e49..ef384fb 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -29,12 +29,22 @@
/// </summary>
private void InitializeComponent()
{
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01));
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fcheckItemDesc = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -59,11 +69,9 @@
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();
this.lb_remarks = new DevExpress.XtraEditors.LabelControl();
this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -130,11 +138,19 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
- this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
- this.btnUp = new DevExpress.XtraEditors.SimpleButton();
- this.btnUpSelect = new System.Windows.Forms.Button();
- this.txtUpUrl = new System.Windows.Forms.TextBox();
- this.label7 = new System.Windows.Forms.Label();
+ this.gcMx3 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.panel1 = new System.Windows.Forms.Panel();
this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
@@ -150,7 +166,6 @@
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();
@@ -187,8 +202,10 @@
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.xtraTabPage3.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
- this.panelControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
@@ -240,7 +257,6 @@
//
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
- this.gvMx1id,
this.gvMx1fcheckItem,
this.gvMx1fcheckTool,
this.gvMx1fcheckItemDesc,
@@ -274,17 +290,6 @@
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
this.gvMx1guid.Width = 94;
- //
- // gvMx1id
- //
- this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1id.AppearanceCell.Options.UseFont = true;
- this.gvMx1id.Caption = "id涓嶈兘鍒犻櫎";
- this.gvMx1id.FieldName = "id";
- this.gvMx1id.MinWidth = 50;
- this.gvMx1id.Name = "gvMx1id";
- this.gvMx1id.Tag = "query_a.id";
- this.gvMx1id.Width = 94;
//
// gvMx1fcheckItem
//
@@ -571,30 +576,19 @@
//
// 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);
this.panMsg.Dock = System.Windows.Forms.DockStyle.Top;
this.panMsg.Location = new System.Drawing.Point(0, 0);
this.panMsg.Name = "panMsg";
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.Location = new System.Drawing.Point(722, 19);
this.btnLoad.Name = "btnLoad";
this.btnLoad.Size = new System.Drawing.Size(180, 34);
this.btnLoad.TabIndex = 3;
@@ -602,7 +596,7 @@
//
// txtJianYan
//
- this.txtJianYan.Location = new System.Drawing.Point(648, 16);
+ this.txtJianYan.Location = new System.Drawing.Point(481, 19);
this.txtJianYan.Name = "txtJianYan";
this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 14F);
this.txtJianYan.Properties.Appearance.Options.UseFont = true;
@@ -613,21 +607,11 @@
//
this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 14F);
this.labelControl3.Appearance.Options.UseFont = true;
- this.labelControl3.Location = new System.Drawing.Point(240, 19);
+ this.labelControl3.Location = new System.Drawing.Point(73, 22);
this.labelControl3.Name = "labelControl3";
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", 14F);
- this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(24, 19);
- this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(120, 29);
- this.labelControl2.TabIndex = 0;
- this.labelControl2.Text = "妫�楠岄」鐩細";
//
// lb_remarks
//
@@ -1457,57 +1441,154 @@
//
// xtraTabPage3
//
- this.xtraTabPage3.Controls.Add(this.panelControl1);
+ this.xtraTabPage3.Controls.Add(this.gcMx3);
+ this.xtraTabPage3.Controls.Add(this.ucUpFile1);
this.xtraTabPage3.Name = "xtraTabPage3";
this.xtraTabPage3.Size = new System.Drawing.Size(1340, 448);
this.xtraTabPage3.Text = "闄勪欢淇℃伅";
//
- // panelControl1
+ // gcMx3
//
- this.panelControl1.Controls.Add(this.btnUp);
- this.panelControl1.Controls.Add(this.btnUpSelect);
- this.panelControl1.Controls.Add(this.txtUpUrl);
- this.panelControl1.Controls.Add(this.label7);
- this.panelControl1.Location = new System.Drawing.Point(297, 11);
- this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(609, 151);
- this.panelControl1.TabIndex = 1;
+ this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx3.Location = new System.Drawing.Point(0, 57);
+ this.gcMx3.MainView = this.gvMx3;
+ this.gcMx3.Name = "gcMx3";
+ this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1,
+ this.repositoryItemButtonEdit2});
+ this.gcMx3.Size = new System.Drawing.Size(1340, 391);
+ this.gcMx3.TabIndex = 2;
+ this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx3});
//
- // btnUp
+ // gvMx3
//
- this.btnUp.Location = new System.Drawing.Point(157, 81);
- this.btnUp.Name = "btnUp";
- this.btnUp.Size = new System.Drawing.Size(94, 29);
- this.btnUp.TabIndex = 270;
- this.btnUp.Text = "纭畾涓婁紶";
+ this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn5,
+ this.gridColumn6,
+ this.gridColumn11,
+ this.gridColumn7,
+ this.gridColumn8,
+ this.gridColumn9,
+ this.gridColumn10,
+ this.gridColumn12});
+ this.gvMx3.GridControl = this.gcMx3;
+ this.gvMx3.Name = "gvMx3";
//
- // btnUpSelect
+ // gridColumn5
//
- this.btnUpSelect.Location = new System.Drawing.Point(452, 48);
- this.btnUpSelect.Margin = new System.Windows.Forms.Padding(4);
- this.btnUpSelect.Name = "btnUpSelect";
- this.btnUpSelect.Size = new System.Drawing.Size(79, 26);
- this.btnUpSelect.TabIndex = 269;
- this.btnUpSelect.Text = "閫夋嫨璺緞";
- this.btnUpSelect.UseVisualStyleBackColor = true;
+ this.gridColumn5.Caption = "guid涓嶈兘鍒犻櫎";
+ this.gridColumn5.FieldName = "guid";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
+ this.gridColumn5.Width = 94;
//
- // txtUpUrl
+ // gridColumn6
//
- this.txtUpUrl.Location = new System.Drawing.Point(125, 48);
- this.txtUpUrl.Margin = new System.Windows.Forms.Padding(4);
- this.txtUpUrl.Name = "txtUpUrl";
- this.txtUpUrl.Size = new System.Drawing.Size(307, 26);
- this.txtUpUrl.TabIndex = 268;
+ this.gridColumn6.Caption = "闄勪欢鍚嶇О";
+ this.gridColumn6.FieldName = "fileTitle";
+ this.gridColumn6.MinWidth = 100;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 0;
+ this.gridColumn6.Width = 100;
//
- // label7
+ // gridColumn11
//
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(12, 52);
- this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(83, 18);
- this.label7.TabIndex = 267;
- this.label7.Text = "閫夋嫨鏂囦欢锛�";
+ this.gridColumn11.Caption = "闄勪欢绫诲瀷";
+ this.gridColumn11.FieldName = "fileType";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.OptionsColumn.ReadOnly = true;
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 1;
+ this.gridColumn11.Width = 94;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "娴忚鍦板潃";
+ this.gridColumn7.FieldName = "urlPath";
+ this.gridColumn7.MinWidth = 200;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.OptionsColumn.ReadOnly = true;
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 2;
+ this.gridColumn7.Width = 200;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "涓婁紶鑰�";
+ this.gridColumn8.FieldName = "createBy";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.OptionsColumn.ReadOnly = true;
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 3;
+ this.gridColumn8.Width = 94;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "涓婁紶鏃堕棿";
+ this.gridColumn9.FieldName = "createDate";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.OptionsColumn.ReadOnly = true;
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 4;
+ this.gridColumn9.Width = 94;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "娴忚";
+ this.gridColumn10.ColumnEdit = this.repositoryItemButtonEdit2;
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 5;
+ this.gridColumn10.Width = 94;
+ //
+ // repositoryItemButtonEdit2
+ //
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娴忚", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+ this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "绉诲嚭";
+ this.gridColumn12.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 6;
+ this.gridColumn12.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ 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, 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);
+ //
+ // ucUpFile1
+ //
+ this.ucUpFile1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.ucUpFile1.Location = new System.Drawing.Point(0, 0);
+ this.ucUpFile1.Name = "ucUpFile1";
+ this.ucUpFile1.parentGuid = null;
+ this.ucUpFile1.Size = new System.Drawing.Size(1340, 57);
+ this.ucUpFile1.TabIndex = 1;
//
// panel1
//
@@ -1688,14 +1769,6 @@
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);
@@ -1741,9 +1814,10 @@
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.xtraTabPage3.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
- this.panelControl1.ResumeLayout(false);
- this.panelControl1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
@@ -1835,11 +1909,6 @@
private DevExpress.XtraEditors.TextEdit txt_releaseNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_releaseNo;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
- private DevExpress.XtraEditors.PanelControl panelControl1;
- private DevExpress.XtraEditors.SimpleButton btnUp;
- private System.Windows.Forms.Button btnUpSelect;
- private System.Windows.Forms.TextBox txtUpUrl;
- private System.Windows.Forms.Label label7;
private DevExpress.XtraEditors.MemoEdit txt_itemModel;
private UserControl.UcLookItems txt_itemId;
private DevExpress.XtraEditors.LabelControl lb_itemModel;
@@ -1848,7 +1917,6 @@
private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraEditors.PanelControl panMsg;
private DevExpress.XtraEditors.LabelControl labelControl3;
- private DevExpress.XtraEditors.LabelControl labelControl2;
private DevExpress.XtraEditors.TextEdit txtJianYan;
private DevExpress.XtraEditors.LabelControl lb_fsubmit;
private DevExpress.XtraEditors.TextEdit txt_fsubmit;
@@ -1860,7 +1928,6 @@
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstand;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fupAllow;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
@@ -1885,7 +1952,18 @@
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;
+ private UserControl.UCUpFile ucUpFile1;
+ private DevExpress.XtraGrid.GridControl gcMx3;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
}
}
\ 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 5a3b3ff..7bb0dad 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -1,7 +1,3 @@
-using DevExpress.DataAccess.Wizard.Model;
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using DevExpress.XtraLayout.Customization;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -10,13 +6,8 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Data;
using System.Drawing;
-using System.IO;
-using System.Net.Http;
-using System.Threading.Tasks;
-using System.Windows.Controls;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -38,7 +29,7 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
+ gcMx1.MouseClick += GcMx1_MouseClick;
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
gridView1.CustomDrawRowIndicator += (s, e) =>
@@ -55,17 +46,35 @@
Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
- //涓婁紶闄勪欢
- btnUpSelect.Click += BtnUpSelect_Click;
- btnUp.Click += BtnUp_Click;
- //鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷�
gvMx2.OptionsFind.ShowSearchNavButtons = false;
gvMx2.OptionsView.ShowGroupPanel = false;
- _setIno();
+ gvMx3.OptionsFind.ShowSearchNavButtons = false;
+ gvMx3.OptionsView.ShowGroupPanel = false;
+ txt_itemId.KeyFile = "id";
+ 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;
}
+ private void GcMx1_MouseClick(object sender, MouseEventArgs e)
+ {
+ string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gvMx1, e, "guid");
+ if (string.IsNullOrEmpty(rowGuid))
+ return;
+ getList12(rowGuid);
+ }
+
+ /// <summary>
+ /// 閲嶆柊鍔犺浇妫�楠�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void BtnLoad_Click(object sender, EventArgs e)
{
if (!MsgHelper.AskQuestion("纭畾閲嶆柊鍔犺浇妫�楠岄」鐩悧锛�"))
@@ -78,12 +87,13 @@
}
var _obj = new
{
- guid = strGuid,//涓诲缓
+ guid = strGuid,
};
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetCheckResultList15Reload", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
@@ -106,27 +116,34 @@
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
}
- else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
-
}
-
+ /// <summary>
+ /// 杈撳叆妫�楠屼簨浠�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void TxtJianYan_KeyDown(object sender, KeyEventArgs e)
{
+ int intHandle = this.gvMx1.FocusedRowHandle;
+ if (intHandle < 0)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛氳閫夋嫨妫�楠岄」鐩紒");
+ return;
+ }
if (e.KeyCode == Keys.Enter)
{
+ string guid5 = this.gvMx1.GetDataRow(intHandle)["guid"].ToString();
string _strCmd = txtJianYan.Text.Trim().ToUpper();
string _strOK = "OK";
string _strNG = "NG";
if (!(_strCmd.StartsWith(_strOK) || _strCmd.StartsWith(_strNG)))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
return;
}
if (!_strCmd.Contains("-"))
@@ -150,7 +167,6 @@
int n;
if (int.TryParse(_str2, out n))
{
-
}
else
{
@@ -169,11 +185,9 @@
if (row != null)
lst.Add(new MesQaItemsDetectDetail12()
{
- ParentGuid= UtilityHelper.ToGuid(labCurrentGuid.Text.Trim()),
+ ParentGuid = UtilityHelper.ToGuid(guid5),
Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
FcheckResu = row["fcheckResu"].ToString(),
- //Fstand = row["fstand"].ToString(),
- FcheckItem = labCurrentItem.Text.Trim(),
GrandpaGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
});
}
@@ -187,7 +201,6 @@
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
-
}
}
catch (Exception ex)
@@ -238,6 +251,11 @@
_filterList = e.FilterList;
getPageList(1, pageBar1.RowsCount);
}
+ /// <summary>
+ /// 鏃ュ織浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
@@ -247,7 +265,7 @@
toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
- /// 妫�楠�
+ ///妫�楠屼簨浠�
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -462,6 +480,8 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ ucUpFile1.parentGuid = lbGuid.Text.Trim();
+ getList12(dt.Rows[0]["guid"].ToString());
}
else
{
@@ -477,101 +497,16 @@
}
}
-
-
- #region 鏂囦欢涓婁紶
-
/// <summary>
- /// 閫夋嫨涓婁紶鏂囦欢
+ /// 鏍规嵁妫�楠岄」鐩鍙栨娊鏍风粨鏋�
/// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void BtnUpSelect_Click(object sender, EventArgs e)
+ /// <param name="guid5"></param>
+ private void getList12(string guid5)
{
- var openFileDialog = new OpenFileDialog();
- // 璁剧疆鍒濆鐩綍
- openFileDialog.InitialDirectory = "c:\\";
- // 璁剧疆鏂囦欢杩囨护閫夐」锛屽锛�"鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*"
- openFileDialog.Filter = "鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*";
- // 璁剧疆鏍囬
- openFileDialog.Title = "閫夋嫨鏂囦欢";
- // 鏄剧ず瀵硅瘽妗�
- var result = openFileDialog.ShowDialog();
- // 纭鐢ㄦ埛娌℃湁鍙栨秷鎿嶄綔
- if (result == DialogResult.OK)
- {
- // 鑾峰彇閫変腑鐨勬枃浠惰矾寰�
- var filePath = openFileDialog.FileName;
- Console.WriteLine($"閫変腑鐨勬枃浠�: {filePath}");
- txtUpUrl.Text = filePath;
- }
- }
-
- /// <summary>
- /// 纭畾涓婁紶
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private async void BtnUp_Click(object sender, EventArgs e)
- {
- var WebApiUrl = ConfigurationSettings.AppSettings.Get("WebApiUrl");
- var address = WebApiUrl + "Upload/UploadFile";
- var filePath = txtUpUrl.Text.Trim();
- var apiUrl = address; // 鏇挎崲涓轰綘鐨凙PI鍦板潃
- await UploadFileAsync(apiUrl, filePath);
- }
-
- private async Task UploadFileAsync(string url, string filePath)
- {
- UcLoading _loading = new UcLoading();
- using (var httpClient = new HttpClient())
- using (var form = new MultipartFormDataContent())
- {
- httpClient.DefaultRequestHeaders.Add("token",
- UtilityHelper.GetBasicAuthTicket());
- using (var fs = File.OpenRead(filePath))
- using (var streamContent = new StreamContent(fs))
- {
- form.Add(streamContent, "file", Path.GetFileName(filePath));
- var response = await httpClient.PostAsync(url, form);
- var responseString =
- await response.Content.ReadAsStringAsync();
- MessageBox.Show(responseString);
- }
- }
- _loading.Close();
- }
-
- #endregion
-
- private void _setIno()
- {
- txt_itemId.KeyFile = "id";
- txt_itemId.EditChanged += (s, e) =>
- {
- txt_itemModel.Text = this.txt_itemId.GetModel();
- txt_itemNo.Text = this.txt_itemId.GetCode();
- };
- }
- /// <summary>
- /// 璇诲彇妫�楠岀粨鏋�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
- {
- var myDataRow = gvMx1.GetDataRow(e.FocusedRowHandle);
- if (myDataRow == null) return;
- labCurrentItem.Text = myDataRow["fcheckItem"].ToString();
- labCurrentGuid.Text = myDataRow["guid"].ToString();
var _obj = new
{
parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- guid = UtilityHelper.ToGuid(myDataRow["guid"].ToString()), //涓诲缓
- //id = myDataRow["id"].ToString(),
- id = -1,
- checkQyt = myDataRow["checkQyt"].ToString(),
- chkItem = myDataRow["fcheckItem"].ToString()
+ guid = UtilityHelper.ToGuid(guid5), //涓诲缓
};
try
{
@@ -587,5 +522,94 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+ /// <summary>
+ /// 閫夐」鍗″垏鎹�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void XtraTabControl2_SelectedPageChanged(object sender, DevExpress.XtraTab.TabPageChangedEventArgs e)
+ {
+ if (e.Page.Name == "xtraTabPage3")
+ {
+ getFileList();
+ }
+ }
+ /// <summary>
+ /// 涓婁紶鍚庡埛鏂版枃浠跺垪琛�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void UcUpFile1_UpChanged(object sender, EventArgs e)
+ {
+ getFileList();
+ }
+ private void getFileList()
+ {
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and parent_Guid='" + lbGuid.Text.Trim() + "'");
+ PageQueryModel pgq = new PageQueryModel(1, 100, "create_date", "asc", "", _sbSqlWhere.ToString());
+ string json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ string strReturn = UtilityHelper.HttpPost("", "MesFile/GetListPage", json);
+ ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMx3.BindingContext = new BindingContext();
+ gcMx3.DataSource = dt;
+ gcMx3.ForceInitialize();
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx3.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx3.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ var strJson = "";
+ var lst = new List<string>();
+ lst.Add(mxGuid);
+ try
+ {
+ strJson = UtilityHelper.HttpPost("", "MesFile/DeleteModel",
+ JsonConvert.SerializeObject(lst));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0) gvMx3.DeleteRow(rowhandle);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+
+ private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx3.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + "寮�鍙戜腑");
+ }
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
index d58980a..058296f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
@@ -117,4 +117,26 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0
+ bGUAV2ViO1dvcmxkO0V5ZQdEODoAAAONSURBVDhPVZJtTNNXFIcvoHOyLhMTt2Qsm4oMI5luEE3jZlsR
+ lDGrVWBzo7oBRibyYgWmWYtQoams4gAHghawaMABAgGZIg1CacUWKxUISqG8jBUrMJaVFFwz99v9M4fx
+ JE/uh3POc8/NPUSpMxAAhIarXLXNr/A6v1ZWEW09XdsNeY1pXFZlrD2YKfWnebdyjZwU03qam+953kdc
+ dkYluQtPHpGeqRI49cM/oGukHdPOZxidcaJcdwPppaHOM1cDT/n4v/0qU59Z1fWSYNHnx+OKxFfq8fMd
+ Baaf9mLgcQ+ezP0NG+WR1QR13zmobocjVs67QOsXSy7rXwj2JHgFHUjdgWy1GlrzfRgtOvRa+zFkd84z
+ MD0L/XA3SlrjIL64HQHC0B1U4vpCcNTrmrzyMxy/JIbRNgfTxBx6Jp+iZ+o/NA876JMaoRlLhFIdBt5X
+ W2uo4JUFQdBB38eKmt04ppSiyWJH+5gDut8oY7PQjEzimrYSV1ou4WpnDEravkBQJNtGBe4Lgi0RUc79
+ p2IgrtOiQD+Fhn47Gs12VNxRo/hGISo6tMjX2xBfkApFbSg4wo1OKmB9zM8h7JCzhIQkqGyHL3QiVtWD
+ 9OZxnNVOoMT4O1RNlzE40YIuSxtM5ge4/6iX0oeK67ccVPAGxWVTcDYh3hxuPT/uAMIzC/B1vgGiygHc
+ HvwT3UMWVN9sR1bRLxAr6hErqUNSRh3iU6tm+RFZCSyPVa9TiRtZyX5z96Z9K/GtIhx80TfIrW6A1jSG
+ 9Dw1SquNaDcM4nt5GfZGZ8yfrR1m/HixDRu3y4dWfyBcSyWE5cXzrORFeiMx91O03DMiq7AVpr5x2B1/
+ IUmqRKftD6Skn0NimhKHUnJhm5pBQ/MDrOekaRmBm/vypW+t+uSdIp+A4Ge39ANIljVictoB65MZBISm
+ QCTJYVYOYfuPgCM4BsuvUzCYhrGem+EgEZITjMSVwlq+2jcku+SmWRhf9k+zph/9IxOIEmXP3/xl5FHE
+ fJeLsEgJjL2jKKu+i3WbxTqyJjiTvMeJZiQulMWUZe/6BLN5gpxRUVoNfiptBn9fMrw+3IWd9MwrbkJM
+ cjk2cKUjnu8LfBd2mmFr2HnC3ZvPyNxWePp7bOCeSPAPlN31C5RZ/badpiNLx9dtlhjWfHQ4ieXhvYLW
+ LXpJwKHNWwR5hFkSGv9P9BplGcXjOcz3LaG4rmWfJP8CiUU9Vuoq7pwAAAAASUVORK5CYII=
+</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 1f5aac0..430bd73 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 editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01Check));
- 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- 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.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -124,18 +124,6 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage3 = new DevExpress.XtraTab.XtraTabPage();
- this.gcMx3 = new DevExpress.XtraGrid.GridControl();
- this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.panel1 = new System.Windows.Forms.Panel();
this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
@@ -151,7 +139,19 @@
this.txt_modify1Flag = new DevExpress.XtraEditors.TextEdit();
this.lb_lotNo = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gcMx3 = new DevExpress.XtraGrid.GridControl();
+ this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -185,16 +185,16 @@
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage3.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.panel1.SuspendLayout();
((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.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
this.SuspendLayout();
//
// tabMxPage1
@@ -1244,138 +1244,6 @@
this.tabMxPage3.Size = new System.Drawing.Size(1340, 448);
this.tabMxPage3.Text = "闄勪欢淇℃伅";
//
- // gcMx3
- //
- this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx3.Location = new System.Drawing.Point(0, 57);
- this.gcMx3.MainView = this.gvMx3;
- this.gcMx3.Name = "gcMx3";
- this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit1,
- this.repositoryItemButtonEdit2});
- this.gcMx3.Size = new System.Drawing.Size(1340, 391);
- this.gcMx3.TabIndex = 1;
- this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx3});
- //
- // gvMx3
- //
- this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn4,
- this.gridColumn5,
- this.gridColumn11,
- this.gridColumn6,
- this.gridColumn7,
- this.gridColumn8,
- this.gridColumn10,
- this.gridColumn9});
- this.gvMx3.GridControl = this.gcMx3;
- this.gvMx3.Name = "gvMx3";
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "guid涓嶈兘鍒犻櫎";
- this.gridColumn4.FieldName = "guid";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.OptionsColumn.ReadOnly = true;
- this.gridColumn4.Width = 94;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "闄勪欢鍚嶇О";
- this.gridColumn5.FieldName = "fileTitle";
- this.gridColumn5.MinWidth = 100;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.OptionsColumn.ReadOnly = true;
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 0;
- this.gridColumn5.Width = 100;
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "娴忚鍦板潃";
- this.gridColumn6.FieldName = "urlPath";
- this.gridColumn6.MinWidth = 200;
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.OptionsColumn.ReadOnly = true;
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 2;
- this.gridColumn6.Width = 200;
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "涓婁紶鑰�";
- this.gridColumn7.FieldName = "createBy";
- this.gridColumn7.MinWidth = 25;
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.OptionsColumn.ReadOnly = true;
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 3;
- this.gridColumn7.Width = 94;
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "涓婁紶鏃堕棿";
- this.gridColumn8.FieldName = "createDate";
- this.gridColumn8.MinWidth = 25;
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.OptionsColumn.ReadOnly = true;
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 4;
- this.gridColumn8.Width = 94;
- //
- // gridColumn10
- //
- this.gridColumn10.Caption = "娴忚";
- this.gridColumn10.ColumnEdit = this.repositoryItemButtonEdit2;
- this.gridColumn10.MinWidth = 25;
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 5;
- this.gridColumn10.Width = 94;
- //
- // repositoryItemButtonEdit2
- //
- this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions3.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions3.Image")));
- editorButtonImageOptions3.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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);
- //
- // gridColumn9
- //
- this.gridColumn9.Caption = "绉诲嚭";
- this.gridColumn9.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gridColumn9.MinWidth = 25;
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 6;
- this.gridColumn9.Width = 94;
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions4.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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", 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);
- //
- // ucUpFile1
- //
- this.ucUpFile1.Dock = System.Windows.Forms.DockStyle.Top;
- this.ucUpFile1.Location = new System.Drawing.Point(0, 0);
- this.ucUpFile1.Name = "ucUpFile1";
- this.ucUpFile1.parentGuid = null;
- this.ucUpFile1.Size = new System.Drawing.Size(1340, 57);
- this.ucUpFile1.TabIndex = 0;
- //
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
@@ -1553,6 +1421,62 @@
this.txt_lotNo.Size = new System.Drawing.Size(150, 28);
this.txt_lotNo.TabIndex = 262;
//
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ 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, 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);
+ //
+ // repositoryItemButtonEdit2
+ //
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娴忚", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+ this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+ //
+ // gvMx3
+ //
+ this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn4,
+ this.gridColumn5,
+ this.gridColumn11,
+ this.gridColumn6,
+ this.gridColumn7,
+ this.gridColumn8,
+ this.gridColumn10,
+ this.gridColumn9});
+ this.gvMx3.GridControl = this.gcMx3;
+ this.gvMx3.Name = "gvMx3";
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "guid涓嶈兘鍒犻櫎";
+ this.gridColumn4.FieldName = "guid";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.ReadOnly = true;
+ this.gridColumn4.Width = 94;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "闄勪欢鍚嶇О";
+ this.gridColumn5.FieldName = "fileTitle";
+ this.gridColumn5.MinWidth = 100;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 0;
+ this.gridColumn5.Width = 100;
+ //
// gridColumn11
//
this.gridColumn11.Caption = "闄勪欢绫诲瀷";
@@ -1562,6 +1486,82 @@
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 1;
this.gridColumn11.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "娴忚鍦板潃";
+ this.gridColumn6.FieldName = "urlPath";
+ this.gridColumn6.MinWidth = 200;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 2;
+ this.gridColumn6.Width = 200;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "涓婁紶鑰�";
+ this.gridColumn7.FieldName = "createBy";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.OptionsColumn.ReadOnly = true;
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 3;
+ this.gridColumn7.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "涓婁紶鏃堕棿";
+ this.gridColumn8.FieldName = "createDate";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.OptionsColumn.ReadOnly = true;
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 4;
+ this.gridColumn8.Width = 94;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "娴忚";
+ this.gridColumn10.ColumnEdit = this.repositoryItemButtonEdit2;
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 5;
+ this.gridColumn10.Width = 94;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "绉诲嚭";
+ this.gridColumn9.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 6;
+ this.gridColumn9.Width = 94;
+ //
+ // gcMx3
+ //
+ this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx3.Location = new System.Drawing.Point(0, 57);
+ this.gcMx3.MainView = this.gvMx3;
+ this.gcMx3.Name = "gcMx3";
+ this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1,
+ this.repositoryItemButtonEdit2});
+ this.gcMx3.Size = new System.Drawing.Size(1340, 391);
+ this.gcMx3.TabIndex = 1;
+ this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx3});
+ //
+ // ucUpFile1
+ //
+ this.ucUpFile1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.ucUpFile1.Location = new System.Drawing.Point(0, 0);
+ this.ucUpFile1.Name = "ucUpFile1";
+ this.ucUpFile1.parentGuid = null;
+ this.ucUpFile1.Size = new System.Drawing.Size(1340, 57);
+ this.ucUpFile1.TabIndex = 0;
//
// Frm_MesQaItemsDetect01Check
//
@@ -1604,10 +1604,6 @@
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage3.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
@@ -1615,6 +1611,10 @@
((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.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
this.ResumeLayout(false);
}
@@ -1728,18 +1728,18 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private UserControl.UCUpFile ucUpFile1;
private DevExpress.XtraGrid.GridControl gcMx3;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private UserControl.UCUpFile ucUpFile1;
}
}
\ 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 5cb86e4..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="editorButtonImageOptions3.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
--
Gitblit v1.9.3