From 8c7ac11905cc442d9cf8920de01dc5ef29179987 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期一, 01 九月 2025 17:48:50 +0800
Subject: [PATCH] 工单撤回报工条码选择

---
 DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs |  237 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 153 insertions(+), 84 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs
index 76ab316..abfce37 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs
@@ -28,16 +28,16 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
             this.wizardControl1 = new DevExpress.XtraWizard.WizardControl();
             this.welcomeWizardPage1 = new DevExpress.XtraWizard.WelcomeWizardPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -75,6 +75,8 @@
             this.gv_salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_tcode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_tname = new DevExpress.XtraGrid.Columns.GridColumn();
             this.panBom = new DevExpress.XtraEditors.PanelControl();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.splitRight = new DevExpress.XtraEditors.SplitContainerControl();
@@ -90,6 +92,7 @@
             this.rptBtnDel = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.completionWizardPage1 = new DevExpress.XtraWizard.CompletionWizardPage();
+            this.gv_materialProperti = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).BeginInit();
             this.wizardControl1.SuspendLayout();
             this.welcomeWizardPage1.SuspendLayout();
@@ -132,9 +135,9 @@
             this.wizardControl1.Controls.Add(this.completionWizardPage1);
             this.wizardControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.wizardControl1.FinishText = "&淇濆瓨";
-            this.wizardControl1.ImageOptions.ImageWidth = 100;
-            this.wizardControl1.Margin = new System.Windows.Forms.Padding(4);
-            this.wizardControl1.MinimumSize = new System.Drawing.Size(133, 138);
+            this.wizardControl1.ImageOptions.ImageWidth = 87;
+            this.wizardControl1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.wizardControl1.MinimumSize = new System.Drawing.Size(116, 107);
             this.wizardControl1.Name = "wizardControl1";
             this.wizardControl1.NextText = "&涓嬩竴姝� >";
             this.wizardControl1.Pages.AddRange(new DevExpress.XtraWizard.BaseWizardPage[] {
@@ -142,24 +145,26 @@
             this.wizardPage1,
             this.completionWizardPage1});
             this.wizardControl1.PreviousText = "< &涓婁竴姝�";
-            this.wizardControl1.Size = new System.Drawing.Size(1038, 718);
+            this.wizardControl1.Size = new System.Drawing.Size(908, 558);
             this.wizardControl1.Text = "";
             // 
             // welcomeWizardPage1
             // 
             this.welcomeWizardPage1.Controls.Add(this.gcMx1);
             this.welcomeWizardPage1.IntroductionText = "璇ュ悜瀵硷紝灏嗘妸褰撳墠鐗╂枡鐨勬楠岄」鐩紝澶嶅埗涓�涓垨澶氫釜鐗╂枡锛屽鍒惰繃绋嬩腑锛岃嫢閲嶅閫夋嫨浜嗙墿鏂欙紝灏嗚嚜鍔ㄨ繃婊わ紝鍙細澶嶅埗涓�娆★紒";
-            this.welcomeWizardPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.welcomeWizardPage1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.welcomeWizardPage1.Name = "welcomeWizardPage1";
             this.welcomeWizardPage1.ProceedText = "鐐瑰嚮 Next 缁х画杩涜";
-            this.welcomeWizardPage1.Size = new System.Drawing.Size(898, 553);
+            this.welcomeWizardPage1.Size = new System.Drawing.Size(789, 426);
             this.welcomeWizardPage1.Text = "褰撳墠妫�楠岄」鐩俊鎭�";
             // 
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.rptJYXM,
@@ -169,7 +174,7 @@
             this.rptJYSP,
             this.repositoryItemButtonEdit1,
             this.repositoryItemComboBox1});
-            this.gcMx1.Size = new System.Drawing.Size(898, 553);
+            this.gcMx1.Size = new System.Drawing.Size(789, 426);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -192,6 +197,7 @@
             this.gvMx1fstand,
             this.gvMx1fdownAllow,
             this.gridColumn19});
+            this.gvMx1.DetailHeight = 272;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -203,18 +209,20 @@
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
             this.gvMx1guid.Caption = "guid";
             this.gvMx1guid.FieldName = "guid";
+            this.gvMx1guid.MinWidth = 17;
             this.gvMx1guid.Name = "gvMx1guid";
             this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Width = 94;
+            this.gvMx1guid.Width = 82;
             // 
             // gvMx1pid
             // 
             this.gvMx1pid.AppearanceCell.Options.UseFont = true;
             this.gvMx1pid.Caption = "pid";
             this.gvMx1pid.FieldName = "pid";
+            this.gvMx1pid.MinWidth = 17;
             this.gvMx1pid.Name = "gvMx1pid";
             this.gvMx1pid.Tag = "query_a.pid";
-            this.gvMx1pid.Width = 94;
+            this.gvMx1pid.Width = 82;
             // 
             // gvMx1fcheckItem
             // 
@@ -222,11 +230,12 @@
             this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
             this.gvMx1fcheckItem.ColumnEdit = this.rptJYXM;
             this.gvMx1fcheckItem.FieldName = "fcheckItem";
+            this.gvMx1fcheckItem.MinWidth = 17;
             this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
             this.gvMx1fcheckItem.Tag = "edit";
             this.gvMx1fcheckItem.Visible = true;
             this.gvMx1fcheckItem.VisibleIndex = 0;
-            this.gvMx1fcheckItem.Width = 150;
+            this.gvMx1fcheckItem.Width = 131;
             // 
             // rptJYXM
             // 
@@ -241,11 +250,12 @@
             this.gvMx1forder.Caption = "椤哄簭";
             this.gvMx1forder.ColumnEdit = this.repositoryItemComboBox1;
             this.gvMx1forder.FieldName = "forder";
+            this.gvMx1forder.MinWidth = 17;
             this.gvMx1forder.Name = "gvMx1forder";
             this.gvMx1forder.Tag = "yz_quantity_0_edit";
             this.gvMx1forder.Visible = true;
             this.gvMx1forder.VisibleIndex = 1;
-            this.gvMx1forder.Width = 50;
+            this.gvMx1forder.Width = 44;
             // 
             // repositoryItemComboBox1
             // 
@@ -274,18 +284,20 @@
             // 
             this.gridColumn5.Caption = "瑙勬牸瑕佹眰";
             this.gridColumn5.FieldName = "fspecRequ";
+            this.gridColumn5.MinWidth = 17;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Tag = "edit";
-            this.gridColumn5.Width = 150;
+            this.gridColumn5.Width = 131;
             // 
             // gvMx1memo
             // 
             this.gvMx1memo.AppearanceCell.Options.UseFont = true;
             this.gvMx1memo.Caption = "妫�楠岄」鐩弿杩�";
             this.gvMx1memo.FieldName = "memo";
+            this.gvMx1memo.MinWidth = 17;
             this.gvMx1memo.Name = "gvMx1memo";
             this.gvMx1memo.Tag = "edit";
-            this.gvMx1memo.Width = 150;
+            this.gvMx1memo.Width = 131;
             // 
             // gvMx1fcheckTool
             // 
@@ -293,11 +305,12 @@
             this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
             this.gvMx1fcheckTool.ColumnEdit = this.rptJYGJ;
             this.gvMx1fcheckTool.FieldName = "fcheckTool";
+            this.gvMx1fcheckTool.MinWidth = 17;
             this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
             this.gvMx1fcheckTool.Tag = "edit";
             this.gvMx1fcheckTool.Visible = true;
             this.gvMx1fcheckTool.VisibleIndex = 2;
-            this.gvMx1fcheckTool.Width = 150;
+            this.gvMx1fcheckTool.Width = 131;
             // 
             // rptJYGJ
             // 
@@ -313,11 +326,12 @@
             this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗗悕绉�";
             this.gvMx1sampleSizeNo.ColumnEdit = this.rptJYBZ;
             this.gvMx1sampleSizeNo.FieldName = "sampleSizeName";
+            this.gvMx1sampleSizeNo.MinWidth = 17;
             this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
             this.gvMx1sampleSizeNo.Tag = "edit";
             this.gvMx1sampleSizeNo.Visible = true;
             this.gvMx1sampleSizeNo.VisibleIndex = 3;
-            this.gvMx1sampleSizeNo.Width = 150;
+            this.gvMx1sampleSizeNo.Width = 131;
             // 
             // rptJYBZ
             // 
@@ -331,10 +345,11 @@
             // 
             this.sampleSizeName.Caption = "妫�楠屾爣鍑嗙紪鐮�";
             this.sampleSizeName.FieldName = "sampleSizeNo";
+            this.sampleSizeName.MinWidth = 17;
             this.sampleSizeName.Name = "sampleSizeName";
             this.sampleSizeName.OptionsColumn.ReadOnly = true;
             this.sampleSizeName.Tag = "edit";
-            this.sampleSizeName.Width = 150;
+            this.sampleSizeName.Width = 131;
             // 
             // gvMx1fcheckLevel
             // 
@@ -342,11 +357,12 @@
             this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
             this.gvMx1fcheckLevel.ColumnEdit = this.rptJYSP;
             this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
+            this.gvMx1fcheckLevel.MinWidth = 17;
             this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
             this.gvMx1fcheckLevel.Tag = "edit";
             this.gvMx1fcheckLevel.Visible = true;
             this.gvMx1fcheckLevel.VisibleIndex = 4;
-            this.gvMx1fcheckLevel.Width = 200;
+            this.gvMx1fcheckLevel.Width = 175;
             // 
             // rptJYSP
             // 
@@ -362,11 +378,12 @@
             this.gvMx1facLevel.Caption = "鎺ユ敹姘村钩";
             this.gvMx1facLevel.ColumnEdit = this.rptJSSP;
             this.gvMx1facLevel.FieldName = "facLevel";
+            this.gvMx1facLevel.MinWidth = 17;
             this.gvMx1facLevel.Name = "gvMx1facLevel";
             this.gvMx1facLevel.Tag = "edit";
             this.gvMx1facLevel.Visible = true;
             this.gvMx1facLevel.VisibleIndex = 5;
-            this.gvMx1facLevel.Width = 150;
+            this.gvMx1facLevel.Width = 131;
             // 
             // rptJSSP
             // 
@@ -381,51 +398,55 @@
             this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
             this.gvMx1fupAllow.Caption = "涓婇檺";
             this.gvMx1fupAllow.FieldName = "fupAllow";
+            this.gvMx1fupAllow.MinWidth = 17;
             this.gvMx1fupAllow.Name = "gvMx1fupAllow";
             this.gvMx1fupAllow.Tag = "yz_quantity_0_edit";
             this.gvMx1fupAllow.Visible = true;
             this.gvMx1fupAllow.VisibleIndex = 6;
-            this.gvMx1fupAllow.Width = 60;
+            this.gvMx1fupAllow.Width = 52;
             // 
             // gvMx1fstand
             // 
             this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
             this.gvMx1fstand.Caption = "鏍囧噯鍊�";
             this.gvMx1fstand.FieldName = "fstand";
+            this.gvMx1fstand.MinWidth = 17;
             this.gvMx1fstand.Name = "gvMx1fstand";
             this.gvMx1fstand.Tag = "yz_quantity_0_edit";
             this.gvMx1fstand.Visible = true;
             this.gvMx1fstand.VisibleIndex = 7;
-            this.gvMx1fstand.Width = 60;
+            this.gvMx1fstand.Width = 52;
             // 
             // gvMx1fdownAllow
             // 
             this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
             this.gvMx1fdownAllow.Caption = "涓嬮檺";
             this.gvMx1fdownAllow.FieldName = "fdownAllow";
+            this.gvMx1fdownAllow.MinWidth = 17;
             this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
             this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit";
             this.gvMx1fdownAllow.Visible = true;
             this.gvMx1fdownAllow.VisibleIndex = 8;
-            this.gvMx1fdownAllow.Width = 60;
+            this.gvMx1fdownAllow.Width = 52;
             // 
             // gridColumn19
             // 
             this.gridColumn19.Caption = "鏍峰搧鍩烘暟";
             this.gridColumn19.FieldName = "ypsl";
+            this.gridColumn19.MinWidth = 17;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Tag = "edit";
             this.gridColumn19.Visible = true;
             this.gridColumn19.VisibleIndex = 9;
-            this.gridColumn19.Width = 94;
+            this.gridColumn19.Width = 82;
             // 
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             // 
@@ -433,15 +454,16 @@
             // 
             this.wizardPage1.Controls.Add(this.splitLeft);
             this.wizardPage1.DescriptionText = "浣犲彲閫夋嫨涓�涓垨澶氫釜锛岄噸澶嶆垨宸茶缃殑鐗╂枡锛屼繚瀛樻椂灏嗚嚜鍔ㄥ拷鐣�";
-            this.wizardPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.wizardPage1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.wizardPage1.Name = "wizardPage1";
-            this.wizardPage1.Size = new System.Drawing.Size(998, 540);
+            this.wizardPage1.Size = new System.Drawing.Size(876, 415);
             this.wizardPage1.Text = "閫夋嫨鐗╂枡";
             // 
             // splitLeft
             // 
             this.splitLeft.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitLeft.Location = new System.Drawing.Point(0, 0);
+            this.splitLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.splitLeft.Name = "splitLeft";
             // 
             // splitLeft.Panel1
@@ -455,17 +477,19 @@
             this.splitLeft.Panel2.Controls.Add(this.splitRight);
             this.splitLeft.Panel2.Text = "Panel2";
             this.splitLeft.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitLeft.Size = new System.Drawing.Size(998, 540);
-            this.splitLeft.SplitterPosition = 519;
+            this.splitLeft.Size = new System.Drawing.Size(876, 415);
+            this.splitLeft.SplitterPosition = 454;
             this.splitLeft.TabIndex = 1;
             // 
             // gcMain
             // 
             this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMain.Location = new System.Drawing.Point(0, 0);
             this.gcMain.MainView = this.gvMain;
+            this.gcMain.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(519, 496);
+            this.gcMain.Size = new System.Drawing.Size(454, 381);
             this.gcMain.TabIndex = 7;
             this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMain});
@@ -475,7 +499,7 @@
             this.gvMain.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gvMain.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gvMain.Appearance.Row.Options.UseFont = true;
-            this.gvMain.ColumnPanelRowHeight = 50;
+            this.gvMain.ColumnPanelRowHeight = 39;
             this.gvMain.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.colChkInt,
             this.gv_guid,
@@ -483,9 +507,13 @@
             this.gv2,
             this.gv_salesOrderId,
             this.gv_orderLineId,
-            this.gv_itemId});
+            this.gv_itemId,
+            this.gv_materialProperti,
+            this.gv_tcode,
+            this.gv_tname});
+            this.gvMain.DetailHeight = 272;
             this.gvMain.GridControl = this.gcMain;
-            this.gvMain.IndicatorWidth = 50;
+            this.gvMain.IndicatorWidth = 44;
             this.gvMain.Name = "gvMain";
             this.gvMain.OptionsFind.ShowSearchNavButtons = false;
             this.gvMain.OptionsView.ShowAutoFilterRow = true;
@@ -495,86 +523,110 @@
             // 
             this.colChkInt.Caption = ".";
             this.colChkInt.FieldName = "chkInt";
-            this.colChkInt.MinWidth = 25;
+            this.colChkInt.MinWidth = 22;
             this.colChkInt.Name = "colChkInt";
             this.colChkInt.Visible = true;
             this.colChkInt.VisibleIndex = 0;
-            this.colChkInt.Width = 94;
+            this.colChkInt.Width = 82;
             // 
             // gv_guid
             // 
             this.gv_guid.AppearanceCell.Options.UseFont = true;
             this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
             this.gv_guid.FieldName = "guid";
-            this.gv_guid.MinWidth = 50;
+            this.gv_guid.MinWidth = 44;
             this.gv_guid.Name = "gv_guid";
             this.gv_guid.OptionsColumn.AllowEdit = false;
             this.gv_guid.Tag = "a.guid";
-            this.gv_guid.Width = 94;
+            this.gv_guid.Width = 82;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "浣跨敤缁勭粐";
             this.gridColumn1.FieldName = "fSubsidiary";
+            this.gridColumn1.MinWidth = 17;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Tag = "org.FNumber";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 4;
-            this.gridColumn1.Width = 50;
+            this.gridColumn1.VisibleIndex = 5;
+            this.gridColumn1.Width = 44;
             // 
             // gv2
             // 
             this.gv2.AppearanceCell.Options.UseFont = true;
             this.gv2.Caption = "鐗╂枡ID";
             this.gv2.FieldName = "id";
+            this.gv2.MinWidth = 17;
             this.gv2.Name = "gv2";
             this.gv2.OptionsColumn.AllowEdit = false;
             this.gv2.Tag = "a.id";
             this.gv2.Visible = true;
-            this.gv2.VisibleIndex = 1;
-            this.gv2.Width = 50;
+            this.gv2.VisibleIndex = 6;
+            this.gv2.Width = 44;
             // 
             // gv_salesOrderId
             // 
             this.gv_salesOrderId.AppearanceCell.Options.UseFont = true;
             this.gv_salesOrderId.Caption = "鐗╂枡缂栫爜";
             this.gv_salesOrderId.FieldName = "itemNo";
+            this.gv_salesOrderId.MinWidth = 17;
             this.gv_salesOrderId.Name = "gv_salesOrderId";
             this.gv_salesOrderId.OptionsColumn.AllowEdit = false;
             this.gv_salesOrderId.Tag = "a.item_no";
             this.gv_salesOrderId.Visible = true;
-            this.gv_salesOrderId.VisibleIndex = 2;
-            this.gv_salesOrderId.Width = 50;
+            this.gv_salesOrderId.VisibleIndex = 3;
+            this.gv_salesOrderId.Width = 44;
             // 
             // gv_orderLineId
             // 
             this.gv_orderLineId.AppearanceCell.Options.UseFont = true;
             this.gv_orderLineId.Caption = "鐗╂枡鍚嶇О";
             this.gv_orderLineId.FieldName = "itemName";
+            this.gv_orderLineId.MinWidth = 17;
             this.gv_orderLineId.Name = "gv_orderLineId";
             this.gv_orderLineId.OptionsColumn.AllowEdit = false;
             this.gv_orderLineId.Tag = "a.item_name";
             this.gv_orderLineId.Visible = true;
-            this.gv_orderLineId.VisibleIndex = 3;
-            this.gv_orderLineId.Width = 50;
+            this.gv_orderLineId.VisibleIndex = 4;
+            this.gv_orderLineId.Width = 44;
             // 
             // gv_itemId
             // 
             this.gv_itemId.AppearanceCell.Options.UseFont = true;
             this.gv_itemId.Caption = "鐗╂枡瑙勬牸";
             this.gv_itemId.FieldName = "itemModel";
+            this.gv_itemId.MinWidth = 17;
             this.gv_itemId.Name = "gv_itemId";
             this.gv_itemId.OptionsColumn.AllowEdit = false;
             this.gv_itemId.Tag = "a.item_model";
-            this.gv_itemId.Width = 50;
+            this.gv_itemId.Width = 44;
+            // 
+            // gv_tcode
+            // 
+            this.gv_tcode.Caption = "鐗╂枡绫诲瀷";
+            this.gv_tcode.FieldName = "tcode";
+            this.gv_tcode.Name = "gv_tcode";
+            this.gv_tcode.Tag = "it.tcode";
+            this.gv_tcode.Visible = true;
+            this.gv_tcode.VisibleIndex = 1;
+            // 
+            // gv_tname
+            // 
+            this.gv_tname.Caption = "鐗╂枡绫诲瀷鍚嶇О";
+            this.gv_tname.FieldName = "tname";
+            this.gv_tname.Name = "gv_tname";
+            this.gv_tname.Tag = "it.tname";
+            this.gv_tname.Visible = true;
+            this.gv_tname.VisibleIndex = 2;
             // 
             // panBom
             // 
             this.panBom.Controls.Add(this.pageBar1);
             this.panBom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panBom.Location = new System.Drawing.Point(0, 496);
+            this.panBom.Location = new System.Drawing.Point(0, 381);
+            this.panBom.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panBom.Name = "panBom";
-            this.panBom.Size = new System.Drawing.Size(519, 44);
+            this.panBom.Size = new System.Drawing.Size(454, 34);
             this.panBom.TabIndex = 6;
             // 
             // pageBar1
@@ -582,10 +634,10 @@
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pageBar1.Location = new System.Drawing.Point(2, 2);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(515, 40);
+            this.pageBar1.Size = new System.Drawing.Size(450, 30);
             this.pageBar1.TabIndex = 3;
             this.pageBar1.TotalPages = 0;
             // 
@@ -593,6 +645,7 @@
             // 
             this.splitRight.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitRight.Location = new System.Drawing.Point(0, 0);
+            this.splitRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.splitRight.Name = "splitRight";
             // 
             // splitRight.Panel1
@@ -604,29 +657,32 @@
             // 
             this.splitRight.Panel2.Controls.Add(this.gcMainCopy);
             this.splitRight.Panel2.Text = "Panel2";
-            this.splitRight.Size = new System.Drawing.Size(467, 540);
-            this.splitRight.SplitterPosition = 45;
+            this.splitRight.Size = new System.Drawing.Size(412, 415);
+            this.splitRight.SplitterPosition = 39;
             this.splitRight.TabIndex = 3;
             // 
             // btnIn
             // 
             this.btnIn.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.btnIn.Appearance.Options.UseForeColor = true;
-            this.btnIn.Location = new System.Drawing.Point(4, 199);
+            this.btnIn.Location = new System.Drawing.Point(4, 155);
+            this.btnIn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnIn.Name = "btnIn";
-            this.btnIn.Size = new System.Drawing.Size(39, 29);
+            this.btnIn.Size = new System.Drawing.Size(34, 23);
             this.btnIn.TabIndex = 0;
             this.btnIn.Text = ">>";
             // 
             // gcMainCopy
             // 
             this.gcMainCopy.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMainCopy.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMainCopy.Location = new System.Drawing.Point(0, 0);
             this.gcMainCopy.MainView = this.gvMainCopy;
+            this.gcMainCopy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMainCopy.Name = "gcMainCopy";
             this.gcMainCopy.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.rptBtnDel});
-            this.gcMainCopy.Size = new System.Drawing.Size(410, 540);
+            this.gcMainCopy.Size = new System.Drawing.Size(363, 415);
             this.gcMainCopy.TabIndex = 2;
             this.gcMainCopy.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMainCopy});
@@ -641,6 +697,7 @@
             this.gridColumn15,
             this.gridColumn6,
             this.gridColumn9});
+            this.gvMainCopy.DetailHeight = 272;
             this.gvMainCopy.GridControl = this.gcMainCopy;
             this.gvMainCopy.Name = "gvMainCopy";
             this.gvMainCopy.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -658,7 +715,7 @@
             this.gridColumn11.Tag = "query_a.FCHECK_ITEM";
             this.gridColumn11.Visible = true;
             this.gridColumn11.VisibleIndex = 0;
-            this.gridColumn11.Width = 150;
+            this.gridColumn11.Width = 131;
             // 
             // gridColumn12
             // 
@@ -670,7 +727,7 @@
             this.gridColumn12.Tag = "query_a.item_id";
             this.gridColumn12.Visible = true;
             this.gridColumn12.VisibleIndex = 1;
-            this.gridColumn12.Width = 150;
+            this.gridColumn12.Width = 131;
             // 
             // gridColumn13
             // 
@@ -683,7 +740,7 @@
             this.gridColumn13.Tag = "query_a.item_no";
             this.gridColumn13.Visible = true;
             this.gridColumn13.VisibleIndex = 2;
-            this.gridColumn13.Width = 150;
+            this.gridColumn13.Width = 131;
             // 
             // gridColumn14
             // 
@@ -696,7 +753,7 @@
             this.gridColumn14.Tag = "query_a.item_name";
             this.gridColumn14.Visible = true;
             this.gridColumn14.VisibleIndex = 3;
-            this.gridColumn14.Width = 150;
+            this.gridColumn14.Width = 131;
             // 
             // gridColumn15
             // 
@@ -707,25 +764,25 @@
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.OptionsColumn.ReadOnly = true;
             this.gridColumn15.Tag = "query_a.item_model";
-            this.gridColumn15.Width = 150;
+            this.gridColumn15.Width = 131;
             // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "绉诲嚭";
             this.gridColumn6.ColumnEdit = this.rptBtnDel;
-            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.MinWidth = 22;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 4;
-            this.gridColumn6.Width = 94;
+            this.gridColumn6.Width = 82;
             // 
             // rptBtnDel
             // 
             this.rptBtnDel.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.rptBtnDel.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.rptBtnDel.Name = "rptBtnDel";
             this.rptBtnDel.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.rptBtnDel.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBtnDel_ButtonClick);
@@ -734,30 +791,39 @@
             // 
             this.gridColumn9.Caption = "gridColumn9";
             this.gridColumn9.FieldName = "guid";
-            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.MinWidth = 22;
             this.gridColumn9.Name = "gridColumn9";
-            this.gridColumn9.Width = 94;
+            this.gridColumn9.Width = 82;
             // 
             // completionWizardPage1
             // 
             this.completionWizardPage1.FinishText = "鏈�鍚庝竴姝ワ紝鐐瑰嚮鈥滀繚瀛樷�濆畬鎴愭搷浣�";
-            this.completionWizardPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.completionWizardPage1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.completionWizardPage1.Name = "completionWizardPage1";
             this.completionWizardPage1.ProceedText = "鐐瑰嚮鈥滀繚瀛樷�濆畬鎴愭搷浣�";
-            this.completionWizardPage1.Size = new System.Drawing.Size(898, 553);
+            this.completionWizardPage1.Size = new System.Drawing.Size(789, 426);
             this.completionWizardPage1.Text = "淇濆瓨淇℃伅";
             // 
-            // JyxmShow
+            // gv_materialProperti
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.gv_materialProperti.Caption = "鐗╂枡灞炴��";
+            this.gv_materialProperti.FieldName = "materialProperti";
+            this.gv_materialProperti.Name = "gv_materialProperti";
+            this.gv_materialProperti.Tag = "a.material_properti";
+            this.gv_materialProperti.Visible = true;
+            this.gv_materialProperti.VisibleIndex = 7;
+            // 
+            // JyxmShowCopy
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1038, 718);
+            this.ClientSize = new System.Drawing.Size(908, 558);
             this.Controls.Add(this.wizardControl1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-            this.Name = "JyxmShow";
+            this.Name = "JyxmShowCopy";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "妫�楠岄」鐩鍒�";
             ((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).EndInit();
@@ -850,5 +916,8 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_tcode;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_tname;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_materialProperti;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3