From f5b68343056a31c0d221e6aa0d671a9f8ef798cd Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 05 五月 2025 11:25:17 +0800
Subject: [PATCH] 结案

---
 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs |  111 +++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 70 insertions(+), 41 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
index 4215eee..094d876 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();
             // 
@@ -509,7 +512,7 @@
             // 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(554, 74);
             this.btnCopy.Name = "btnCopy";
             this.btnCopy.Size = new System.Drawing.Size(131, 27);
             this.btnCopy.StyleController = this.layoutMx1;
@@ -611,7 +614,7 @@
             // 
             // txt_isenabled
             // 
-            this.txt_isenabled.Location = new System.Drawing.Point(554, 74);
+            this.txt_isenabled.Location = new System.Drawing.Point(554, 43);
             this.txt_isenabled.Name = "txt_isenabled";
             this.txt_isenabled.Properties.Caption = "鍙敤鏍囪瘑";
             this.txt_isenabled.Size = new System.Drawing.Size(267, 24);
@@ -641,10 +644,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";
@@ -737,6 +740,21 @@
             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(542, 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(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;
+            // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_ftype;
@@ -744,7 +762,7 @@
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
-            this.layoutControlItem3.Text = "绫诲埆";
+            this.layoutControlItem3.Text = "椤圭洰鍒嗙被";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem7
@@ -768,29 +786,15 @@
             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(542, 31);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem5.Text = "鍙敤鏍囪瘑";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem5.TextVisible = false;
             // 
@@ -825,7 +829,8 @@
             this.rptJSSP,
             this.rptJYSP,
             this.repositoryItemButtonEdit1,
-            this.repositoryItemComboBox1});
+            this.rptShunXui,
+            this.rptStation});
             this.gcMx1.Size = new System.Drawing.Size(1125, 419);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -849,7 +854,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 +866,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 +875,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 +904,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 +912,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 +933,7 @@
             "13",
             "14",
             "15"});
-            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+            this.rptShunXui.Name = "rptShunXui";
             // 
             // gridColumn5
             // 
@@ -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