From 2ea047bd801dd9c0f5ed693be452ee67aa8b5ff3 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 11 十一月 2024 19:35:17 +0800
Subject: [PATCH] 质量审核上的五个按钮

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs |  410 ++++++++++------------------------------------------------
 1 files changed, 72 insertions(+), 338 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
index 398b288..a644760 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
@@ -49,22 +49,8 @@
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.lb_remark5 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_remark5 = new DevExpress.XtraEditors.TextEdit();
-            this.lb_remark4 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_remark4 = new DevExpress.XtraEditors.TextEdit();
-            this.lb_remark3 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_remark3 = new DevExpress.XtraEditors.TextEdit();
-            this.lb_useOrg = new DevExpress.XtraEditors.LabelControl();
-            this.txt_useOrg = new DevExpress.XtraEditors.TextEdit();
-            this.lb_createOrg = new DevExpress.XtraEditors.LabelControl();
-            this.txt_createOrg = new DevExpress.XtraEditors.TextEdit();
             this.lb_materialProperti = new DevExpress.XtraEditors.LabelControl();
             this.txt_materialProperti = new DevExpress.XtraEditors.TextEdit();
-            this.gv_materialProperti = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_productionWorkshop = new DevExpress.XtraEditors.LabelControl();
-            this.txt_productionWorkshop = new DevExpress.XtraEditors.TextEdit();
-            this.gv_productionWorkshop = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_isFkc = new DevExpress.XtraEditors.LabelControl();
             this.txt_isFkc = new DevExpress.XtraEditors.TextEdit();
             this.gv_isFkc = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -83,17 +69,13 @@
             this.gv_isWy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_iconType = new DevExpress.XtraEditors.LabelControl();
             this.txt_iconType = new DevExpress.XtraEditors.TextEdit();
-            this.lb_company = new DevExpress.XtraEditors.LabelControl();
-            this.txt_company = new DevExpress.XtraEditors.TextEdit();
             this.lb_depottypecode = new DevExpress.XtraEditors.LabelControl();
             this.txt_depottypecode = new DevExpress.XtraEditors.TextEdit();
             this.gv_depottypecode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_type2 = new DevExpress.XtraEditors.LabelControl();
             this.txt_type2 = new DevExpress.XtraEditors.TextEdit();
-            this.gv_type2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_type1 = new DevExpress.XtraEditors.LabelControl();
             this.txt_type1 = new DevExpress.XtraEditors.TextEdit();
-            this.gv_type1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_factory = new DevExpress.XtraEditors.LabelControl();
             this.txt_factory = new DevExpress.XtraEditors.TextEdit();
             this.lb_depottype = new DevExpress.XtraEditors.LabelControl();
@@ -101,10 +83,8 @@
             this.gv_depottype = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
-            this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
             this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
-            this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
@@ -122,6 +102,8 @@
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -134,13 +116,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark4.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark3.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_useOrg.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createOrg.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isFkc.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_piType.Properties)).BeginInit();
@@ -148,7 +124,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_iconType.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_company.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_depottypecode.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_type2.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_type1.Properties)).BeginInit();
@@ -307,7 +282,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 285);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 338);
             this.tabMxPage1.Text = "鏄庣粏1";
             // 
             // gcMx1
@@ -318,7 +293,7 @@
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 285);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 338);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -365,101 +340,6 @@
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
-            // lb_remark5
-            // 
-            this.lb_remark5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_remark5.Appearance.Options.UseFont = true;
-            this.lb_remark5.Location = new System.Drawing.Point(532, 215);
-            this.lb_remark5.Name = "lb_remark5";
-            this.lb_remark5.Size = new System.Drawing.Size(99, 21);
-            this.lb_remark5.TabIndex = 343;
-            this.lb_remark5.Text = "鑷畾涔夊瓧娈�5 ";
-            // 
-            // txt_remark5
-            // 
-            this.txt_remark5.Location = new System.Drawing.Point(638, 211);
-            this.txt_remark5.Name = "txt_remark5";
-            this.txt_remark5.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_remark5.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark5.Size = new System.Drawing.Size(150, 28);
-            this.txt_remark5.TabIndex = 343;
-            // 
-            // lb_remark4
-            // 
-            this.lb_remark4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_remark4.Appearance.Options.UseFont = true;
-            this.lb_remark4.Location = new System.Drawing.Point(279, 215);
-            this.lb_remark4.Name = "lb_remark4";
-            this.lb_remark4.Size = new System.Drawing.Size(99, 21);
-            this.lb_remark4.TabIndex = 336;
-            this.lb_remark4.Text = "鑷畾涔夊瓧娈�4 ";
-            // 
-            // txt_remark4
-            // 
-            this.txt_remark4.Location = new System.Drawing.Point(382, 211);
-            this.txt_remark4.Name = "txt_remark4";
-            this.txt_remark4.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_remark4.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark4.Size = new System.Drawing.Size(150, 28);
-            this.txt_remark4.TabIndex = 336;
-            // 
-            // lb_remark3
-            // 
-            this.lb_remark3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_remark3.Appearance.Options.UseFont = true;
-            this.lb_remark3.Location = new System.Drawing.Point(14, 215);
-            this.lb_remark3.Name = "lb_remark3";
-            this.lb_remark3.Size = new System.Drawing.Size(99, 21);
-            this.lb_remark3.TabIndex = 327;
-            this.lb_remark3.Text = "鑷畾涔夊瓧娈�3 ";
-            // 
-            // txt_remark3
-            // 
-            this.txt_remark3.Location = new System.Drawing.Point(118, 211);
-            this.txt_remark3.Name = "txt_remark3";
-            this.txt_remark3.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_remark3.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark3.Size = new System.Drawing.Size(150, 28);
-            this.txt_remark3.TabIndex = 327;
-            // 
-            // lb_useOrg
-            // 
-            this.lb_useOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_useOrg.Appearance.Options.UseFont = true;
-            this.lb_useOrg.Location = new System.Drawing.Point(848, 116);
-            this.lb_useOrg.Name = "lb_useOrg";
-            this.lb_useOrg.Size = new System.Drawing.Size(73, 21);
-            this.lb_useOrg.TabIndex = 319;
-            this.lb_useOrg.Text = "浣跨敤缁勭粐 ";
-            // 
-            // txt_useOrg
-            // 
-            this.txt_useOrg.Location = new System.Drawing.Point(927, 112);
-            this.txt_useOrg.Name = "txt_useOrg";
-            this.txt_useOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_useOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_useOrg.Size = new System.Drawing.Size(150, 28);
-            this.txt_useOrg.TabIndex = 319;
-            // 
-            // lb_createOrg
-            // 
-            this.lb_createOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_createOrg.Appearance.Options.UseFont = true;
-            this.lb_createOrg.Location = new System.Drawing.Point(558, 116);
-            this.lb_createOrg.Name = "lb_createOrg";
-            this.lb_createOrg.Size = new System.Drawing.Size(73, 21);
-            this.lb_createOrg.TabIndex = 312;
-            this.lb_createOrg.Text = "鍒涘缓缁勭粐 ";
-            // 
-            // txt_createOrg
-            // 
-            this.txt_createOrg.Location = new System.Drawing.Point(638, 112);
-            this.txt_createOrg.Name = "txt_createOrg";
-            this.txt_createOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_createOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_createOrg.Size = new System.Drawing.Size(150, 28);
-            this.txt_createOrg.TabIndex = 312;
-            // 
             // lb_materialProperti
             // 
             this.lb_materialProperti.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -479,58 +359,11 @@
             this.txt_materialProperti.Size = new System.Drawing.Size(150, 28);
             this.txt_materialProperti.TabIndex = 306;
             // 
-            // gv_materialProperti
-            // 
-            this.gv_materialProperti.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_materialProperti.AppearanceCell.Options.UseFont = true;
-            this.gv_materialProperti.Caption = "鐗╂枡灞炴�� ";
-            this.gv_materialProperti.FieldName = "materialProperti";
-            this.gv_materialProperti.MinWidth = 50;
-            this.gv_materialProperti.Name = "gv_materialProperti";
-            this.gv_materialProperti.OptionsColumn.AllowEdit = false;
-            this.gv_materialProperti.Tag = "query_a.material_properti";
-            this.gv_materialProperti.Visible = true;
-            this.gv_materialProperti.VisibleIndex = 15;
-            this.gv_materialProperti.Width = 94;
-            // 
-            // lb_productionWorkshop
-            // 
-            this.lb_productionWorkshop.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_productionWorkshop.Appearance.Options.UseFont = true;
-            this.lb_productionWorkshop.Location = new System.Drawing.Point(558, 180);
-            this.lb_productionWorkshop.Name = "lb_productionWorkshop";
-            this.lb_productionWorkshop.Size = new System.Drawing.Size(73, 21);
-            this.lb_productionWorkshop.TabIndex = 298;
-            this.lb_productionWorkshop.Text = "鐢熶骇杞﹂棿 ";
-            // 
-            // txt_productionWorkshop
-            // 
-            this.txt_productionWorkshop.Location = new System.Drawing.Point(638, 176);
-            this.txt_productionWorkshop.Name = "txt_productionWorkshop";
-            this.txt_productionWorkshop.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_productionWorkshop.Properties.Appearance.Options.UseFont = true;
-            this.txt_productionWorkshop.Size = new System.Drawing.Size(150, 28);
-            this.txt_productionWorkshop.TabIndex = 298;
-            // 
-            // gv_productionWorkshop
-            // 
-            this.gv_productionWorkshop.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_productionWorkshop.AppearanceCell.Options.UseFont = true;
-            this.gv_productionWorkshop.Caption = "鐢熶骇杞﹂棿 ";
-            this.gv_productionWorkshop.FieldName = "productionWorkshop";
-            this.gv_productionWorkshop.MinWidth = 50;
-            this.gv_productionWorkshop.Name = "gv_productionWorkshop";
-            this.gv_productionWorkshop.OptionsColumn.AllowEdit = false;
-            this.gv_productionWorkshop.Tag = "query_a.production_workshop";
-            this.gv_productionWorkshop.Visible = true;
-            this.gv_productionWorkshop.VisibleIndex = 14;
-            this.gv_productionWorkshop.Width = 94;
-            // 
             // lb_isFkc
             // 
             this.lb_isFkc.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_isFkc.Appearance.Options.UseFont = true;
-            this.lb_isFkc.Location = new System.Drawing.Point(288, 180);
+            this.lb_isFkc.Location = new System.Drawing.Point(541, 118);
             this.lb_isFkc.Name = "lb_isFkc";
             this.lb_isFkc.Size = new System.Drawing.Size(90, 21);
             this.lb_isFkc.TabIndex = 291;
@@ -538,7 +371,7 @@
             // 
             // txt_isFkc
             // 
-            this.txt_isFkc.Location = new System.Drawing.Point(382, 176);
+            this.txt_isFkc.Location = new System.Drawing.Point(638, 114);
             this.txt_isFkc.Name = "txt_isFkc";
             this.txt_isFkc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_isFkc.Properties.Appearance.Options.UseFont = true;
@@ -549,21 +382,21 @@
             // 
             this.gv_isFkc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_isFkc.AppearanceCell.Options.UseFont = true;
-            this.gv_isFkc.Caption = "鍏佽鍗虫椂搴撳瓨璐熷簱瀛� ";
+            this.gv_isFkc.Caption = "鍏佽鍗虫椂搴撳瓨璐熷簱瀛�";
             this.gv_isFkc.FieldName = "isFkc";
             this.gv_isFkc.MinWidth = 50;
             this.gv_isFkc.Name = "gv_isFkc";
             this.gv_isFkc.OptionsColumn.AllowEdit = false;
             this.gv_isFkc.Tag = "query_a.is_fkc";
             this.gv_isFkc.Visible = true;
-            this.gv_isFkc.VisibleIndex = 13;
+            this.gv_isFkc.VisibleIndex = 11;
             this.gv_isFkc.Width = 94;
             // 
             // lb_zuid
             // 
             this.lb_zuid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_zuid.Appearance.Options.UseFont = true;
-            this.lb_zuid.Location = new System.Drawing.Point(74, 180);
+            this.lb_zuid.Location = new System.Drawing.Point(592, 149);
             this.lb_zuid.Name = "lb_zuid";
             this.lb_zuid.Size = new System.Drawing.Size(39, 21);
             this.lb_zuid.TabIndex = 285;
@@ -571,7 +404,7 @@
             // 
             // txt_zuid
             // 
-            this.txt_zuid.Location = new System.Drawing.Point(118, 176);
+            this.txt_zuid.Location = new System.Drawing.Point(638, 145);
             this.txt_zuid.Name = "txt_zuid";
             this.txt_zuid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_zuid.Properties.Appearance.Options.UseFont = true;
@@ -582,21 +415,21 @@
             // 
             this.gv_zuid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_zuid.AppearanceCell.Options.UseFont = true;
-            this.gv_zuid.Caption = "鍒嗙粍 ";
+            this.gv_zuid.Caption = "鍒嗙粍";
             this.gv_zuid.FieldName = "zuid";
             this.gv_zuid.MinWidth = 50;
             this.gv_zuid.Name = "gv_zuid";
             this.gv_zuid.OptionsColumn.AllowEdit = false;
             this.gv_zuid.Tag = "query_a.zuid";
             this.gv_zuid.Visible = true;
-            this.gv_zuid.VisibleIndex = 12;
+            this.gv_zuid.VisibleIndex = 10;
             this.gv_zuid.Width = 94;
             // 
             // lb_piType
             // 
             this.lb_piType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_piType.Appearance.Options.UseFont = true;
-            this.lb_piType.Location = new System.Drawing.Point(814, 148);
+            this.lb_piType.Location = new System.Drawing.Point(814, 118);
             this.lb_piType.Name = "lb_piType";
             this.lb_piType.Size = new System.Drawing.Size(107, 21);
             this.lb_piType.TabIndex = 280;
@@ -604,7 +437,7 @@
             // 
             // txt_piType
             // 
-            this.txt_piType.Location = new System.Drawing.Point(927, 144);
+            this.txt_piType.Location = new System.Drawing.Point(927, 114);
             this.txt_piType.Name = "txt_piType";
             this.txt_piType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_piType.Properties.Appearance.Options.UseFont = true;
@@ -615,7 +448,7 @@
             // 
             this.lb_cwhaddress.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_cwhaddress.Appearance.Options.UseFont = true;
-            this.lb_cwhaddress.Location = new System.Drawing.Point(558, 148);
+            this.lb_cwhaddress.Location = new System.Drawing.Point(305, 119);
             this.lb_cwhaddress.Name = "lb_cwhaddress";
             this.lb_cwhaddress.Size = new System.Drawing.Size(73, 21);
             this.lb_cwhaddress.TabIndex = 273;
@@ -623,7 +456,7 @@
             // 
             // txt_cwhaddress
             // 
-            this.txt_cwhaddress.Location = new System.Drawing.Point(638, 144);
+            this.txt_cwhaddress.Location = new System.Drawing.Point(382, 115);
             this.txt_cwhaddress.Name = "txt_cwhaddress";
             this.txt_cwhaddress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_cwhaddress.Properties.Appearance.Options.UseFont = true;
@@ -653,14 +486,14 @@
             // 
             this.gv_isNg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_isNg.AppearanceCell.Options.UseFont = true;
-            this.gv_isNg.Caption = "鏄惁涓嶈壇鍝佷粨 ";
+            this.gv_isNg.Caption = "鏄惁涓嶈壇鍝佷粨";
             this.gv_isNg.FieldName = "isNg";
             this.gv_isNg.MinWidth = 50;
             this.gv_isNg.Name = "gv_isNg";
             this.gv_isNg.OptionsColumn.AllowEdit = false;
             this.gv_isNg.Tag = "query_a.is_ng";
             this.gv_isNg.Visible = true;
-            this.gv_isNg.VisibleIndex = 11;
+            this.gv_isNg.VisibleIndex = 9;
             this.gv_isNg.Width = 94;
             // 
             // lb_isWy
@@ -686,21 +519,21 @@
             // 
             this.gv_isWy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_isWy.AppearanceCell.Options.UseFont = true;
-            this.gv_isWy.Caption = "鏄惁濮斿浠撳簱 ";
+            this.gv_isWy.Caption = "鏄惁濮斿浠撳簱";
             this.gv_isWy.FieldName = "isWy";
             this.gv_isWy.MinWidth = 50;
             this.gv_isWy.Name = "gv_isWy";
             this.gv_isWy.OptionsColumn.AllowEdit = false;
             this.gv_isWy.Tag = "query_a.is_wy";
             this.gv_isWy.Visible = true;
-            this.gv_isWy.VisibleIndex = 10;
+            this.gv_isWy.VisibleIndex = 8;
             this.gv_isWy.Width = 94;
             // 
             // lb_iconType
             // 
             this.lb_iconType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_iconType.Appearance.Options.UseFont = true;
-            this.lb_iconType.Location = new System.Drawing.Point(848, 180);
+            this.lb_iconType.Location = new System.Drawing.Point(848, 149);
             this.lb_iconType.Name = "lb_iconType";
             this.lb_iconType.Size = new System.Drawing.Size(73, 21);
             this.lb_iconType.TabIndex = 258;
@@ -708,31 +541,12 @@
             // 
             // txt_iconType
             // 
-            this.txt_iconType.Location = new System.Drawing.Point(927, 176);
+            this.txt_iconType.Location = new System.Drawing.Point(927, 145);
             this.txt_iconType.Name = "txt_iconType";
             this.txt_iconType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_iconType.Properties.Appearance.Options.UseFont = true;
             this.txt_iconType.Size = new System.Drawing.Size(150, 28);
             this.txt_iconType.TabIndex = 258;
-            // 
-            // lb_company
-            // 
-            this.lb_company.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_company.Appearance.Options.UseFont = true;
-            this.lb_company.Location = new System.Drawing.Point(305, 116);
-            this.lb_company.Name = "lb_company";
-            this.lb_company.Size = new System.Drawing.Size(73, 21);
-            this.lb_company.TabIndex = 252;
-            this.lb_company.Text = "鍏徃浠g爜 ";
-            // 
-            // txt_company
-            // 
-            this.txt_company.Location = new System.Drawing.Point(382, 112);
-            this.txt_company.Name = "txt_company";
-            this.txt_company.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_company.Properties.Appearance.Options.UseFont = true;
-            this.txt_company.Size = new System.Drawing.Size(150, 28);
-            this.txt_company.TabIndex = 252;
             // 
             // lb_depottypecode
             // 
@@ -757,14 +571,14 @@
             // 
             this.gv_depottypecode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_depottypecode.AppearanceCell.Options.UseFont = true;
-            this.gv_depottypecode.Caption = "浠撳簱绫诲瀷缂栫爜 ";
+            this.gv_depottypecode.Caption = "浠撳簱绫诲瀷缂栫爜";
             this.gv_depottypecode.FieldName = "depottypecode";
             this.gv_depottypecode.MinWidth = 50;
             this.gv_depottypecode.Name = "gv_depottypecode";
             this.gv_depottypecode.OptionsColumn.AllowEdit = false;
             this.gv_depottypecode.Tag = "query_a.depottypecode";
             this.gv_depottypecode.Visible = true;
-            this.gv_depottypecode.VisibleIndex = 9;
+            this.gv_depottypecode.VisibleIndex = 7;
             this.gv_depottypecode.Width = 94;
             // 
             // lb_type2
@@ -786,20 +600,6 @@
             this.txt_type2.Size = new System.Drawing.Size(150, 28);
             this.txt_type2.TabIndex = 243;
             // 
-            // gv_type2
-            // 
-            this.gv_type2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_type2.AppearanceCell.Options.UseFont = true;
-            this.gv_type2.Caption = "鎴愬搧浣跨敤 ";
-            this.gv_type2.FieldName = "type2";
-            this.gv_type2.MinWidth = 50;
-            this.gv_type2.Name = "gv_type2";
-            this.gv_type2.OptionsColumn.AllowEdit = false;
-            this.gv_type2.Tag = "query_a.type_2";
-            this.gv_type2.Visible = true;
-            this.gv_type2.VisibleIndex = 8;
-            this.gv_type2.Width = 94;
-            // 
             // lb_type1
             // 
             this.lb_type1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -818,20 +618,6 @@
             this.txt_type1.Properties.Appearance.Options.UseFont = true;
             this.txt_type1.Size = new System.Drawing.Size(150, 28);
             this.txt_type1.TabIndex = 240;
-            // 
-            // gv_type1
-            // 
-            this.gv_type1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_type1.AppearanceCell.Options.UseFont = true;
-            this.gv_type1.Caption = "鐗╂枡浣跨敤 ";
-            this.gv_type1.FieldName = "type1";
-            this.gv_type1.MinWidth = 50;
-            this.gv_type1.Name = "gv_type1";
-            this.gv_type1.OptionsColumn.AllowEdit = false;
-            this.gv_type1.Tag = "query_a.type_1";
-            this.gv_type1.Visible = true;
-            this.gv_type1.VisibleIndex = 7;
-            this.gv_type1.Width = 94;
             // 
             // lb_factory
             // 
@@ -875,7 +661,7 @@
             // 
             this.gv_depottype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_depottype.AppearanceCell.Options.UseFont = true;
-            this.gv_depottype.Caption = "浠撳簱绫诲瀷 ";
+            this.gv_depottype.Caption = "浠撳簱绫诲瀷";
             this.gv_depottype.FieldName = "depottype";
             this.gv_depottype.MinWidth = 50;
             this.gv_depottype.Name = "gv_depottype";
@@ -904,20 +690,6 @@
             this.txt_lastupdateDate.Size = new System.Drawing.Size(150, 28);
             this.txt_lastupdateDate.TabIndex = 228;
             // 
-            // gv_lastupdateDate
-            // 
-            this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
-            this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
-            this.gv_lastupdateDate.FieldName = "lastupdateDate";
-            this.gv_lastupdateDate.MinWidth = 50;
-            this.gv_lastupdateDate.Name = "gv_lastupdateDate";
-            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
-            this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
-            this.gv_lastupdateDate.Visible = true;
-            this.gv_lastupdateDate.VisibleIndex = 5;
-            this.gv_lastupdateDate.Width = 94;
-            // 
             // lb_lastupdateBy
             // 
             this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -936,20 +708,6 @@
             this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
             this.txt_lastupdateBy.Size = new System.Drawing.Size(150, 28);
             this.txt_lastupdateBy.TabIndex = 226;
-            // 
-            // gv_lastupdateBy
-            // 
-            this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
-            this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
-            this.gv_lastupdateBy.FieldName = "lastupdateBy";
-            this.gv_lastupdateBy.MinWidth = 50;
-            this.gv_lastupdateBy.Name = "gv_lastupdateBy";
-            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
-            this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
-            this.gv_lastupdateBy.Visible = true;
-            this.gv_lastupdateBy.VisibleIndex = 4;
-            this.gv_lastupdateBy.Width = 94;
             // 
             // lb_createDate
             // 
@@ -993,14 +751,14 @@
             // 
             this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_createBy.AppearanceCell.Options.UseFont = true;
-            this.gv_createBy.Caption = "浠撳簱璐熻矗浜� ";
+            this.gv_createBy.Caption = "浠撳簱璐熻矗浜�";
             this.gv_createBy.FieldName = "createBy";
             this.gv_createBy.MinWidth = 50;
             this.gv_createBy.Name = "gv_createBy";
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 3;
+            this.gv_createBy.VisibleIndex = 5;
             this.gv_createBy.Width = 94;
             // 
             // lb_description
@@ -1026,14 +784,14 @@
             // 
             this.gv_description.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_description.AppearanceCell.Options.UseFont = true;
-            this.gv_description.Caption = "澶囨敞 ";
+            this.gv_description.Caption = "澶囨敞";
             this.gv_description.FieldName = "description";
             this.gv_description.MinWidth = 50;
             this.gv_description.Name = "gv_description";
             this.gv_description.OptionsColumn.AllowEdit = false;
             this.gv_description.Tag = "query_a.description";
             this.gv_description.Visible = true;
-            this.gv_description.VisibleIndex = 2;
+            this.gv_description.VisibleIndex = 4;
             this.gv_description.Width = 94;
             // 
             // lb_depotName
@@ -1059,15 +817,15 @@
             // 
             this.gv_depotName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_depotName.AppearanceCell.Options.UseFont = true;
-            this.gv_depotName.Caption = "浠撳簱鍚嶇О ";
+            this.gv_depotName.Caption = "浠撳簱鍚嶇О";
             this.gv_depotName.FieldName = "depotName";
-            this.gv_depotName.MinWidth = 50;
+            this.gv_depotName.MinWidth = 150;
             this.gv_depotName.Name = "gv_depotName";
             this.gv_depotName.OptionsColumn.AllowEdit = false;
             this.gv_depotName.Tag = "query_a.depot_name";
             this.gv_depotName.Visible = true;
-            this.gv_depotName.VisibleIndex = 1;
-            this.gv_depotName.Width = 94;
+            this.gv_depotName.VisibleIndex = 3;
+            this.gv_depotName.Width = 150;
             // 
             // lb_depotCode
             // 
@@ -1092,15 +850,15 @@
             // 
             this.gv_depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_depotCode.AppearanceCell.Options.UseFont = true;
-            this.gv_depotCode.Caption = "浠撳簱缂栫爜 ";
+            this.gv_depotCode.Caption = "浠撳簱缂栫爜";
             this.gv_depotCode.FieldName = "depotCode";
-            this.gv_depotCode.MinWidth = 50;
+            this.gv_depotCode.MinWidth = 100;
             this.gv_depotCode.Name = "gv_depotCode";
             this.gv_depotCode.OptionsColumn.AllowEdit = false;
             this.gv_depotCode.Tag = "query_a.depot_code";
             this.gv_depotCode.Visible = true;
-            this.gv_depotCode.VisibleIndex = 0;
-            this.gv_depotCode.Width = 94;
+            this.gv_depotCode.VisibleIndex = 2;
+            this.gv_depotCode.Width = 100;
             // 
             // toolBarMenu1
             // 
@@ -1130,31 +888,52 @@
             // 
             // gridView1
             // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.ColumnPanelRowHeight = 60;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn1,
+            this.gv_id,
             this.gv_depotCode,
             this.gv_depotName,
             this.gv_depottype,
             this.gv_description,
             this.gv_createBy,
-            this.gv_lastupdateBy,
-            this.gv_lastupdateDate,
-            this.gv_type1,
-            this.gv_type2,
             this.gv_depottypecode,
             this.gv_isWy,
             this.gv_isNg,
             this.gv_zuid,
-            this.gv_isFkc,
-            this.gv_productionWorkshop,
-            this.gv_materialProperti});
+            this.gv_isFkc});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "浣跨敤缁勭粐";
+            this.gridColumn1.FieldName = "fSubsidiary";
+            this.gridColumn1.MinWidth = 250;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.OptionsColumn.AllowEdit = false;
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 0;
+            this.gridColumn1.Width = 250;
+            // 
+            // gv_id
+            // 
+            this.gv_id.Caption = "浠撳簱ID";
+            this.gv_id.FieldName = "depotId";
+            this.gv_id.MinWidth = 25;
+            this.gv_id.Name = "gv_id";
+            this.gv_id.OptionsColumn.AllowEdit = false;
+            this.gv_id.Visible = true;
+            this.gv_id.VisibleIndex = 1;
+            this.gv_id.Width = 94;
             // 
             // xtraTabControl1
             // 
@@ -1201,10 +980,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 253);
+            this.tabMx.Location = new System.Drawing.Point(0, 200);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 317);
+            this.tabMx.Size = new System.Drawing.Size(1126, 370);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -1214,20 +993,8 @@
             this.panel1.BackColor = System.Drawing.Color.White;
             this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.lbGuid);
-            this.panel1.Controls.Add(this.lb_remark5);
-            this.panel1.Controls.Add(this.txt_remark5);
-            this.panel1.Controls.Add(this.lb_remark4);
-            this.panel1.Controls.Add(this.txt_remark4);
-            this.panel1.Controls.Add(this.lb_remark3);
-            this.panel1.Controls.Add(this.txt_remark3);
-            this.panel1.Controls.Add(this.lb_useOrg);
-            this.panel1.Controls.Add(this.txt_useOrg);
-            this.panel1.Controls.Add(this.lb_createOrg);
-            this.panel1.Controls.Add(this.txt_createOrg);
             this.panel1.Controls.Add(this.lb_materialProperti);
             this.panel1.Controls.Add(this.txt_materialProperti);
-            this.panel1.Controls.Add(this.lb_productionWorkshop);
-            this.panel1.Controls.Add(this.txt_productionWorkshop);
             this.panel1.Controls.Add(this.lb_isFkc);
             this.panel1.Controls.Add(this.txt_isFkc);
             this.panel1.Controls.Add(this.lb_zuid);
@@ -1242,8 +1009,6 @@
             this.panel1.Controls.Add(this.txt_isWy);
             this.panel1.Controls.Add(this.lb_iconType);
             this.panel1.Controls.Add(this.txt_iconType);
-            this.panel1.Controls.Add(this.lb_company);
-            this.panel1.Controls.Add(this.txt_company);
             this.panel1.Controls.Add(this.lb_depottypecode);
             this.panel1.Controls.Add(this.txt_depottypecode);
             this.panel1.Controls.Add(this.lb_type2);
@@ -1272,12 +1037,12 @@
             this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1126, 253);
+            this.panel1.Size = new System.Drawing.Size(1126, 200);
             this.panel1.TabIndex = 1;
             // 
             // labelControl11
             // 
-            this.labelControl11.Location = new System.Drawing.Point(864, 221);
+            this.labelControl11.Location = new System.Drawing.Point(918, 177);
             this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl11.Name = "labelControl11";
             this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -1288,7 +1053,7 @@
             // lbGuid
             // 
             this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(915, 221);
+            this.lbGuid.Location = new System.Drawing.Point(969, 177);
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
@@ -1306,13 +1071,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark4.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark3.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_useOrg.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createOrg.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isFkc.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_piType.Properties)).EndInit();
@@ -1320,7 +1079,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_iconType.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_company.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_depottypecode.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_type2.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_type1.Properties)).EndInit();
@@ -1371,28 +1129,9 @@
  private DevExpress.XtraTab.XtraTabPage tabMxPage1;
  private DevExpress.XtraGrid.GridControl gcMx1;
  private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-private DevExpress.XtraEditors.LabelControl lb_remark5;
-private DevExpress.XtraEditors.TextEdit txt_remark5;
-
-private DevExpress.XtraEditors.LabelControl lb_remark4;
-private DevExpress.XtraEditors.TextEdit txt_remark4;
-
-private DevExpress.XtraEditors.LabelControl lb_remark3;
-private DevExpress.XtraEditors.TextEdit txt_remark3;
-
-private DevExpress.XtraEditors.LabelControl lb_useOrg;
-private DevExpress.XtraEditors.TextEdit txt_useOrg;
-
-private DevExpress.XtraEditors.LabelControl lb_createOrg;
-private DevExpress.XtraEditors.TextEdit txt_createOrg;
 
 private DevExpress.XtraEditors.LabelControl lb_materialProperti;
 private DevExpress.XtraEditors.TextEdit txt_materialProperti;
- private DevExpress.XtraGrid.Columns.GridColumn gv_materialProperti;
-
-private DevExpress.XtraEditors.LabelControl lb_productionWorkshop;
-private DevExpress.XtraEditors.TextEdit txt_productionWorkshop;
- private DevExpress.XtraGrid.Columns.GridColumn gv_productionWorkshop;
 
 private DevExpress.XtraEditors.LabelControl lb_isFkc;
 private DevExpress.XtraEditors.TextEdit txt_isFkc;
@@ -1419,20 +1158,15 @@
 private DevExpress.XtraEditors.LabelControl lb_iconType;
 private DevExpress.XtraEditors.TextEdit txt_iconType;
 
-private DevExpress.XtraEditors.LabelControl lb_company;
-private DevExpress.XtraEditors.TextEdit txt_company;
-
 private DevExpress.XtraEditors.LabelControl lb_depottypecode;
 private DevExpress.XtraEditors.TextEdit txt_depottypecode;
  private DevExpress.XtraGrid.Columns.GridColumn gv_depottypecode;
 
 private DevExpress.XtraEditors.LabelControl lb_type2;
 private DevExpress.XtraEditors.TextEdit txt_type2;
- private DevExpress.XtraGrid.Columns.GridColumn gv_type2;
 
 private DevExpress.XtraEditors.LabelControl lb_type1;
 private DevExpress.XtraEditors.TextEdit txt_type1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_type1;
 
 private DevExpress.XtraEditors.LabelControl lb_factory;
 private DevExpress.XtraEditors.TextEdit txt_factory;
@@ -1443,11 +1177,9 @@
 
 private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
 private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
 
 private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
 private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
 
 private DevExpress.XtraEditors.LabelControl lb_createDate;
 private DevExpress.XtraEditors.TextEdit txt_createDate;
@@ -1469,5 +1201,7 @@
  private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3