From fa43bc9d26c7b9ec2b07e2d3e1a7f07abe68da5b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 15 五月 2025 14:46:59 +0800
Subject: [PATCH] 导入

---
 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs |  189 +++++++++++++++++++++++++++--------------------
 1 files changed, 109 insertions(+), 80 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
index 4215eee..07225ae 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -85,10 +85,10 @@
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -99,7 +99,7 @@
             this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
             this.rptJYXM = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gvMx1forder = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.rptShunXui = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -117,6 +117,8 @@
             this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.rptStation = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -154,10 +156,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
@@ -165,12 +167,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptShunXui)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptStation)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
@@ -478,7 +481,7 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1127, 570);
-            this.splitMx1.SplitterPosition = 107;
+            this.splitMx1.SplitterPosition = 113;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -502,14 +505,14 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(599, 447, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1127, 107);
+            this.layoutMx1.Size = new System.Drawing.Size(1127, 113);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "dataLayoutControl1";
             // 
             // btnCopy
             // 
             this.btnCopy.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.chartswitchrowcolumn_16x16;
-            this.btnCopy.Location = new System.Drawing.Point(554, 43);
+            this.btnCopy.Location = new System.Drawing.Point(565, 74);
             this.btnCopy.Name = "btnCopy";
             this.btnCopy.Size = new System.Drawing.Size(131, 27);
             this.btnCopy.StyleController = this.layoutMx1;
@@ -530,7 +533,7 @@
             this.txt_fSubsidiary.IsReadly = false;
             this.txt_fSubsidiary.Location = new System.Drawing.Point(84, 12);
             this.txt_fSubsidiary.Name = "txt_fSubsidiary";
-            this.txt_fSubsidiary.Size = new System.Drawing.Size(195, 24);
+            this.txt_fSubsidiary.Size = new System.Drawing.Size(200, 24);
             this.txt_fSubsidiary.TabIndex = 383;
             // 
             // txt_itemId
@@ -538,36 +541,36 @@
             this.txt_itemId.IsReadly = false;
             this.txt_itemId.Location = new System.Drawing.Point(84, 43);
             this.txt_itemId.Name = "txt_itemId";
-            this.txt_itemId.Size = new System.Drawing.Size(195, 24);
+            this.txt_itemId.Size = new System.Drawing.Size(200, 24);
             this.txt_itemId.TabIndex = 380;
             this.txt_itemId.Tag = "no";
             // 
             // txt_foneCheckdate
             // 
-            this.txt_foneCheckdate.Location = new System.Drawing.Point(897, 43);
+            this.txt_foneCheckdate.Location = new System.Drawing.Point(914, 43);
             this.txt_foneCheckdate.Name = "txt_foneCheckdate";
             this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
-            this.txt_foneCheckdate.Size = new System.Drawing.Size(197, 24);
+            this.txt_foneCheckdate.Size = new System.Drawing.Size(201, 24);
             this.txt_foneCheckdate.StyleController = this.layoutMx1;
             this.txt_foneCheckdate.TabIndex = 267;
             this.txt_foneCheckdate.Tag = "readOnly";
             // 
             // txt_foneCheckor
             // 
-            this.txt_foneCheckor.Location = new System.Drawing.Point(897, 12);
+            this.txt_foneCheckor.Location = new System.Drawing.Point(914, 12);
             this.txt_foneCheckor.Name = "txt_foneCheckor";
             this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
-            this.txt_foneCheckor.Size = new System.Drawing.Size(197, 24);
+            this.txt_foneCheckor.Size = new System.Drawing.Size(201, 24);
             this.txt_foneCheckor.StyleController = this.layoutMx1;
             this.txt_foneCheckor.TabIndex = 262;
             this.txt_foneCheckor.Tag = "readOnly";
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(355, 12);
+            this.txt_itemNo.Location = new System.Drawing.Point(360, 12);
             this.txt_itemNo.Name = "txt_itemNo";
             this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(195, 24);
+            this.txt_itemNo.Size = new System.Drawing.Size(201, 24);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 370;
             this.txt_itemNo.Tag = "readOnly";
@@ -577,46 +580,47 @@
             this.txt_memo.Location = new System.Drawing.Point(84, 74);
             this.txt_memo.Name = "txt_memo";
             this.txt_memo.Properties.Appearance.Options.UseFont = true;
-            this.txt_memo.Size = new System.Drawing.Size(466, 24);
+            this.txt_memo.Size = new System.Drawing.Size(477, 24);
             this.txt_memo.StyleController = this.layoutMx1;
             this.txt_memo.TabIndex = 219;
             // 
             // txt_gg
             // 
-            this.txt_gg.Location = new System.Drawing.Point(355, 43);
+            this.txt_gg.Location = new System.Drawing.Point(360, 43);
             this.txt_gg.Name = "txt_gg";
-            this.txt_gg.Size = new System.Drawing.Size(195, 24);
+            this.txt_gg.Size = new System.Drawing.Size(201, 24);
             this.txt_gg.StyleController = this.layoutMx1;
             this.txt_gg.TabIndex = 384;
             this.txt_gg.Tag = "readOnly";
             // 
             // txt_foneChecked
             // 
-            this.txt_foneChecked.Location = new System.Drawing.Point(825, 74);
+            this.txt_foneChecked.Location = new System.Drawing.Point(842, 74);
             this.txt_foneChecked.Name = "txt_foneChecked";
             this.txt_foneChecked.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_foneChecked.Size = new System.Drawing.Size(269, 24);
+            this.txt_foneChecked.Size = new System.Drawing.Size(273, 24);
             this.txt_foneChecked.StyleController = this.layoutMx1;
             this.txt_foneChecked.TabIndex = 386;
             this.txt_foneChecked.Tag = "readOnly";
             // 
             // txt_ftype
             // 
-            this.txt_ftype.Location = new System.Drawing.Point(626, 12);
+            this.txt_ftype.Location = new System.Drawing.Point(637, 12);
             this.txt_ftype.Name = "txt_ftype";
-            this.txt_ftype.Size = new System.Drawing.Size(195, 24);
+            this.txt_ftype.Size = new System.Drawing.Size(201, 24);
             this.txt_ftype.StyleController = this.layoutMx1;
             this.txt_ftype.TabIndex = 389;
             this.txt_ftype.Tag = "readOnly";
             // 
             // txt_isenabled
             // 
-            this.txt_isenabled.Location = new System.Drawing.Point(554, 74);
+            this.txt_isenabled.Location = new System.Drawing.Point(565, 43);
             this.txt_isenabled.Name = "txt_isenabled";
             this.txt_isenabled.Properties.Caption = "鍙敤鏍囪瘑";
-            this.txt_isenabled.Size = new System.Drawing.Size(267, 24);
+            this.txt_isenabled.Size = new System.Drawing.Size(273, 24);
             this.txt_isenabled.StyleController = this.layoutMx1;
             this.txt_isenabled.TabIndex = 390;
+            this.txt_isenabled.Tag = "readOnly";
             // 
             // layoutControlItem13
             // 
@@ -641,10 +645,10 @@
             this.layoutControlItem10,
             this.layoutControlItem11,
             this.layoutControlItem12,
+            this.layoutControlItem14,
             this.layoutControlItem3,
             this.layoutControlItem7,
             this.layoutControlItem8,
-            this.layoutControlItem14,
             this.layoutControlItem5});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
@@ -671,7 +675,7 @@
             rowDefinition1,
             rowDefinition2,
             rowDefinition3});
-            this.Root.Size = new System.Drawing.Size(1106, 113);
+            this.Root.Size = new System.Drawing.Size(1127, 113);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -679,7 +683,7 @@
             this.layoutControlItem1.Control = this.txt_fSubsidiary;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
             this.layoutControlItem1.Text = "閫夋嫨缁勭粐";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -689,7 +693,7 @@
             this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
             this.layoutControlItem4.Text = "閫夋嫨鐗╂枡";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -700,97 +704,98 @@
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem2.Size = new System.Drawing.Size(542, 31);
+            this.layoutControlItem2.Size = new System.Drawing.Size(553, 31);
             this.layoutControlItem2.Text = "澶囨敞";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_foneCheckor;
-            this.layoutControlItem10.Location = new System.Drawing.Point(813, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(830, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(273, 31);
+            this.layoutControlItem10.Size = new System.Drawing.Size(277, 31);
             this.layoutControlItem10.Text = "瀹℃牳浜哄憳";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_foneCheckdate;
-            this.layoutControlItem11.Location = new System.Drawing.Point(813, 31);
+            this.layoutControlItem11.Location = new System.Drawing.Point(830, 31);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(273, 31);
+            this.layoutControlItem11.Size = new System.Drawing.Size(277, 31);
             this.layoutControlItem11.Text = "瀹℃牳鏃堕棿";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_foneChecked;
-            this.layoutControlItem12.Location = new System.Drawing.Point(813, 62);
+            this.layoutControlItem12.Location = new System.Drawing.Point(830, 62);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(273, 31);
+            this.layoutControlItem12.Size = new System.Drawing.Size(277, 31);
             this.layoutControlItem12.Text = "瀹℃牳鏍囪瘑";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
             // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.btnCopy;
+            this.layoutControlItem14.Location = new System.Drawing.Point(553, 62);
+            this.layoutControlItem14.MaxSize = new System.Drawing.Size(135, 31);
+            this.layoutControlItem14.MinSize = new System.Drawing.Size(135, 31);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem14.Size = new System.Drawing.Size(277, 31);
+            this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem14.Text = "澶嶅埗";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem14.TextVisible = false;
+            // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_ftype;
-            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(553, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
-            this.layoutControlItem3.Text = "绫诲埆";
+            this.layoutControlItem3.Size = new System.Drawing.Size(277, 31);
+            this.layoutControlItem3.Text = "椤圭洰鍒嗙被";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_itemNo;
-            this.layoutControlItem7.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem7.Location = new System.Drawing.Point(276, 0);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem7.Size = new System.Drawing.Size(277, 31);
             this.layoutControlItem7.Text = "鐗╂枡缂栫爜";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_gg;
-            this.layoutControlItem8.Location = new System.Drawing.Point(271, 31);
+            this.layoutControlItem8.Location = new System.Drawing.Point(276, 31);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem8.Size = new System.Drawing.Size(277, 31);
             this.layoutControlItem8.Text = "鐗╂枡瑙勬牸";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.btnCopy;
-            this.layoutControlItem14.Location = new System.Drawing.Point(542, 31);
-            this.layoutControlItem14.MaxSize = new System.Drawing.Size(135, 31);
-            this.layoutControlItem14.MinSize = new System.Drawing.Size(135, 31);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
-            this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem14.Text = "澶嶅埗";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem14.TextVisible = false;
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_isenabled;
-            this.layoutControlItem5.Location = new System.Drawing.Point(542, 62);
+            this.layoutControlItem5.Location = new System.Drawing.Point(553, 31);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem5.Size = new System.Drawing.Size(277, 31);
+            this.layoutControlItem5.Text = "鍙敤鏍囪瘑";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem5.TextVisible = false;
             // 
@@ -800,7 +805,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1127, 451);
+            this.tabMx.Size = new System.Drawing.Size(1127, 445);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -809,7 +814,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1125, 419);
+            this.tabMxPage1.Size = new System.Drawing.Size(1125, 413);
             this.tabMxPage1.Text = "妫�楠岄」鐩槑缁�";
             // 
             // gcMx1
@@ -825,8 +830,9 @@
             this.rptJSSP,
             this.rptJYSP,
             this.repositoryItemButtonEdit1,
-            this.repositoryItemComboBox1});
-            this.gcMx1.Size = new System.Drawing.Size(1125, 419);
+            this.rptShunXui,
+            this.rptStation});
+            this.gcMx1.Size = new System.Drawing.Size(1125, 413);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -849,7 +855,8 @@
             this.gvMx1fstand,
             this.gvMx1fdownAllow,
             this.gridColumn19,
-            this.gvMxDel});
+            this.gvMxDel,
+            this.gridColumn6});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -860,7 +867,7 @@
             // gvMx1guid
             // 
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1guid.Caption = "guid";
+            this.gvMx1guid.Caption = "瀛愯〃涓婚敭GUID";
             this.gvMx1guid.FieldName = "guid";
             this.gvMx1guid.Name = "gvMx1guid";
             this.gvMx1guid.Tag = "query_a.guid";
@@ -869,7 +876,7 @@
             // gvMx1pid
             // 
             this.gvMx1pid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1pid.Caption = "pid";
+            this.gvMx1pid.Caption = "涓昏〃涓婚敭GUID";
             this.gvMx1pid.FieldName = "pid";
             this.gvMx1pid.Name = "gvMx1pid";
             this.gvMx1pid.Tag = "query_a.pid";
@@ -898,7 +905,7 @@
             // 
             this.gvMx1forder.AppearanceCell.Options.UseFont = true;
             this.gvMx1forder.Caption = "椤哄簭";
-            this.gvMx1forder.ColumnEdit = this.repositoryItemComboBox1;
+            this.gvMx1forder.ColumnEdit = this.rptShunXui;
             this.gvMx1forder.FieldName = "forder";
             this.gvMx1forder.Name = "gvMx1forder";
             this.gvMx1forder.Tag = "yz_quantity_0_edit";
@@ -906,12 +913,12 @@
             this.gvMx1forder.VisibleIndex = 1;
             this.gvMx1forder.Width = 50;
             // 
-            // repositoryItemComboBox1
+            // rptShunXui
             // 
-            this.repositoryItemComboBox1.AutoHeight = false;
-            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.rptShunXui.AutoHeight = false;
+            this.rptShunXui.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBox1.Items.AddRange(new object[] {
+            this.rptShunXui.Items.AddRange(new object[] {
             "1",
             "2",
             "3",
@@ -927,7 +934,7 @@
             "13",
             "14",
             "15"});
-            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+            this.rptShunXui.Name = "rptShunXui";
             // 
             // gridColumn5
             // 
@@ -968,7 +975,6 @@
             this.rptJYGJ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.rptJYGJ.Name = "rptJYGJ";
-            this.rptJYGJ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             // 
             // gvMx1sampleSizeNo
             // 
@@ -1092,7 +1098,7 @@
             this.gvMxDel.MinWidth = 50;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 13;
+            this.gvMxDel.VisibleIndex = 14;
             this.gvMxDel.Width = 100;
             // 
             // repositoryItemButtonEdit1
@@ -1105,6 +1111,26 @@
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "宸ヤ綅";
+            this.gridColumn6.ColumnEdit = this.rptStation;
+            this.gridColumn6.FieldName = "stationName";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Tag = "edit";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 13;
+            this.gridColumn6.Width = 94;
+            // 
+            // rptStation
+            // 
+            this.rptStation.AutoHeight = false;
+            this.rptStation.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.rptStation.Name = "rptStation";
+            this.rptStation.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             // 
             // picCheckBox
             // 
@@ -1161,10 +1187,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
@@ -1172,12 +1198,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptShunXui)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptStation)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
@@ -1226,7 +1253,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1pid;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1forder;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptShunXui;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItem;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYXM;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
@@ -1255,11 +1282,13 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraEditors.CheckEdit txt_isenabled;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
-        private DevExpress.XtraEditors.CheckEdit txt_isenabled;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptStation;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3