From c4ebd2f08d72990416f3dd8d4a6a4ea62dc58da0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 28 十二月 2024 10:59:39 +0800
Subject: [PATCH] 线体

---
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs |  585 +++++++++++++---------------------------------------------
 1 files changed, 132 insertions(+), 453 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
index 6e1ae97..5a203c8 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -34,12 +34,9 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
-            this.gvMx1depotSectionNamet = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1kbQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1description = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1completenessFlag = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1depotSectionName = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -48,42 +45,23 @@
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.lb_materialProperti = new DevExpress.XtraEditors.LabelControl();
-            this.txt_materialProperti = new DevExpress.XtraEditors.TextEdit();
             this.lb_isFkc = new DevExpress.XtraEditors.LabelControl();
             this.txt_isFkc = new DevExpress.XtraEditors.TextEdit();
             this.gv_isFkc = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_zuid = new DevExpress.XtraEditors.LabelControl();
             this.txt_zuid = new DevExpress.XtraEditors.TextEdit();
             this.gv_zuid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_piType = new DevExpress.XtraEditors.LabelControl();
-            this.txt_piType = new DevExpress.XtraEditors.TextEdit();
-            this.lb_cwhaddress = new DevExpress.XtraEditors.LabelControl();
-            this.txt_cwhaddress = new DevExpress.XtraEditors.TextEdit();
             this.lb_isNg = new DevExpress.XtraEditors.LabelControl();
             this.txt_isNg = new DevExpress.XtraEditors.TextEdit();
             this.gv_isNg = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_isWy = new DevExpress.XtraEditors.LabelControl();
             this.txt_isWy = new DevExpress.XtraEditors.TextEdit();
             this.gv_isWy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_iconType = new DevExpress.XtraEditors.LabelControl();
-            this.txt_iconType = 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.lb_type1 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_type1 = new DevExpress.XtraEditors.TextEdit();
-            this.lb_factory = new DevExpress.XtraEditors.LabelControl();
-            this.txt_factory = new DevExpress.XtraEditors.TextEdit();
             this.lb_depottype = new DevExpress.XtraEditors.LabelControl();
             this.txt_depottype = new DevExpress.XtraEditors.TextEdit();
             this.gv_depottype = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
-            this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
             this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
@@ -91,7 +69,6 @@
             this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_description = new DevExpress.XtraEditors.LabelControl();
             this.txt_description = new DevExpress.XtraEditors.TextEdit();
-            this.gv_description = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_depotName = new DevExpress.XtraEditors.LabelControl();
             this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
             this.gv_depotName = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -102,10 +79,12 @@
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -119,21 +98,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.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();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cwhaddress.Properties)).BeginInit();
             ((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_depottypecode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_type2.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_type1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).BeginInit();
@@ -151,33 +121,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
-            // gvMx1depotSectionNamet
-            // 
-            this.gvMx1depotSectionNamet.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1depotSectionNamet.AppearanceCell.Options.UseFont = true;
-            this.gvMx1depotSectionNamet.Caption = "浠撲綅鍏ㄥ悕";
-            this.gvMx1depotSectionNamet.FieldName = "depotSectionNamet";
-            this.gvMx1depotSectionNamet.MinWidth = 50;
-            this.gvMx1depotSectionNamet.Name = "gvMx1depotSectionNamet";
-            this.gvMx1depotSectionNamet.Tag = "edit";
-            this.gvMx1depotSectionNamet.Visible = true;
-            this.gvMx1depotSectionNamet.VisibleIndex = 5;
-            this.gvMx1depotSectionNamet.Width = 94;
-            // 
-            // gvMx1kbQty
-            // 
-            this.gvMx1kbQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1kbQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1kbQty.Caption = "鍗℃澘鏁�";
-            this.gvMx1kbQty.FieldName = "kbQty";
-            this.gvMx1kbQty.MinWidth = 50;
-            this.gvMx1kbQty.Name = "gvMx1kbQty";
-            this.gvMx1kbQty.Tag = "yz_quantity_0_edit";
-            this.gvMx1kbQty.UnboundDataType = typeof(decimal);
-            this.gvMx1kbQty.Visible = true;
-            this.gvMx1kbQty.VisibleIndex = 4;
-            this.gvMx1kbQty.Width = 94;
-            // 
             // gvMx1lastupdateDate
             // 
             this.gvMx1lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -189,8 +132,8 @@
             this.gvMx1lastupdateDate.OptionsColumn.ReadOnly = true;
             this.gvMx1lastupdateDate.Tag = "query_a.lastupdate_date";
             this.gvMx1lastupdateDate.Visible = true;
-            this.gvMx1lastupdateDate.VisibleIndex = 7;
-            this.gvMx1lastupdateDate.Width = 94;
+            this.gvMx1lastupdateDate.VisibleIndex = 3;
+            this.gvMx1lastupdateDate.Width = 180;
             // 
             // gvMx1lastupdateBy
             // 
@@ -203,7 +146,7 @@
             this.gvMx1lastupdateBy.OptionsColumn.ReadOnly = true;
             this.gvMx1lastupdateBy.Tag = "query_a.lastupdate_by";
             this.gvMx1lastupdateBy.Visible = true;
-            this.gvMx1lastupdateBy.VisibleIndex = 6;
+            this.gvMx1lastupdateBy.VisibleIndex = 4;
             this.gvMx1lastupdateBy.Width = 94;
             // 
             // gvMx1description
@@ -216,22 +159,8 @@
             this.gvMx1description.Name = "gvMx1description";
             this.gvMx1description.Tag = "edit";
             this.gvMx1description.Visible = true;
-            this.gvMx1description.VisibleIndex = 3;
+            this.gvMx1description.VisibleIndex = 2;
             this.gvMx1description.Width = 94;
-            // 
-            // gvMx1completenessFlag
-            // 
-            this.gvMx1completenessFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1completenessFlag.AppearanceCell.Options.UseFont = true;
-            this.gvMx1completenessFlag.Caption = "鍙備笌榻愬鏍¢獙(0:鍚�,1:鏄�)";
-            this.gvMx1completenessFlag.FieldName = "completenessFlag";
-            this.gvMx1completenessFlag.MinWidth = 50;
-            this.gvMx1completenessFlag.Name = "gvMx1completenessFlag";
-            this.gvMx1completenessFlag.Tag = "edit";
-            this.gvMx1completenessFlag.UnboundDataType = typeof(bool);
-            this.gvMx1completenessFlag.Visible = true;
-            this.gvMx1completenessFlag.VisibleIndex = 2;
-            this.gvMx1completenessFlag.Width = 94;
             // 
             // gvMx1depotSectionName
             // 
@@ -275,7 +204,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 338);
+            this.tabMxPage1.Size = new System.Drawing.Size(1262, 415);
             this.tabMxPage1.Text = "浠撲綅鍒楄〃";
             // 
             // gcMx1
@@ -286,7 +215,7 @@
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 338);
+            this.gcMx1.Size = new System.Drawing.Size(1262, 415);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -297,10 +226,7 @@
             this.gvMx1guid,
             this.gvMx1depotSectionCode,
             this.gvMx1depotSectionName,
-            this.gvMx1completenessFlag,
             this.gvMx1description,
-            this.gvMx1kbQty,
-            this.gvMx1depotSectionNamet,
             this.gvMx1lastupdateBy,
             this.gvMx1lastupdateDate,
             this.gvMxDel});
@@ -318,8 +244,8 @@
             this.gvMxDel.MinWidth = 25;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 8;
-            this.gvMxDel.Width = 94;
+            this.gvMxDel.VisibleIndex = 5;
+            this.gvMxDel.Width = 100;
             // 
             // repositoryItemButtonEdit1
             // 
@@ -332,31 +258,11 @@
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
-            // lb_materialProperti
-            // 
-            this.lb_materialProperti.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_materialProperti.Appearance.Options.UseFont = true;
-            this.lb_materialProperti.Location = new System.Drawing.Point(558, 52);
-            this.lb_materialProperti.Name = "lb_materialProperti";
-            this.lb_materialProperti.Size = new System.Drawing.Size(73, 21);
-            this.lb_materialProperti.TabIndex = 306;
-            this.lb_materialProperti.Text = "鐗╂枡灞炴�� ";
-            // 
-            // txt_materialProperti
-            // 
-            this.txt_materialProperti.Enabled = false;
-            this.txt_materialProperti.Location = new System.Drawing.Point(638, 48);
-            this.txt_materialProperti.Name = "txt_materialProperti";
-            this.txt_materialProperti.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_materialProperti.Properties.Appearance.Options.UseFont = true;
-            this.txt_materialProperti.Size = new System.Drawing.Size(150, 28);
-            this.txt_materialProperti.TabIndex = 306;
-            // 
             // 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(541, 118);
+            this.lb_isFkc.Location = new System.Drawing.Point(23, 85);
             this.lb_isFkc.Name = "lb_isFkc";
             this.lb_isFkc.Size = new System.Drawing.Size(90, 21);
             this.lb_isFkc.TabIndex = 291;
@@ -365,7 +271,7 @@
             // txt_isFkc
             // 
             this.txt_isFkc.Enabled = false;
-            this.txt_isFkc.Location = new System.Drawing.Point(638, 114);
+            this.txt_isFkc.Location = new System.Drawing.Point(118, 81);
             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;
@@ -378,19 +284,19 @@
             this.gv_isFkc.AppearanceCell.Options.UseFont = true;
             this.gv_isFkc.Caption = "鍏佽鍗虫椂搴撳瓨璐熷簱瀛�";
             this.gv_isFkc.FieldName = "isFkc";
-            this.gv_isFkc.MinWidth = 50;
+            this.gv_isFkc.MinWidth = 70;
             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 = 12;
-            this.gv_isFkc.Width = 94;
+            this.gv_isFkc.VisibleIndex = 8;
+            this.gv_isFkc.Width = 70;
             // 
             // 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(592, 149);
+            this.lb_zuid.Location = new System.Drawing.Point(571, 52);
             this.lb_zuid.Name = "lb_zuid";
             this.lb_zuid.Size = new System.Drawing.Size(39, 21);
             this.lb_zuid.TabIndex = 285;
@@ -399,11 +305,11 @@
             // txt_zuid
             // 
             this.txt_zuid.Enabled = false;
-            this.txt_zuid.Location = new System.Drawing.Point(638, 145);
+            this.txt_zuid.Location = new System.Drawing.Point(617, 48);
             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;
-            this.txt_zuid.Size = new System.Drawing.Size(150, 28);
+            this.txt_zuid.Size = new System.Drawing.Size(119, 28);
             this.txt_zuid.TabIndex = 285;
             // 
             // gv_zuid
@@ -417,54 +323,14 @@
             this.gv_zuid.OptionsColumn.AllowEdit = false;
             this.gv_zuid.Tag = "query_a.zuid";
             this.gv_zuid.Visible = true;
-            this.gv_zuid.VisibleIndex = 11;
-            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, 118);
-            this.lb_piType.Name = "lb_piType";
-            this.lb_piType.Size = new System.Drawing.Size(107, 21);
-            this.lb_piType.TabIndex = 280;
-            this.lb_piType.Text = "鐪嬫澘鍖哄煙缂栧彿 ";
-            // 
-            // txt_piType
-            // 
-            this.txt_piType.Enabled = false;
-            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;
-            this.txt_piType.Size = new System.Drawing.Size(150, 28);
-            this.txt_piType.TabIndex = 280;
-            // 
-            // lb_cwhaddress
-            // 
-            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(305, 119);
-            this.lb_cwhaddress.Name = "lb_cwhaddress";
-            this.lb_cwhaddress.Size = new System.Drawing.Size(73, 21);
-            this.lb_cwhaddress.TabIndex = 273;
-            this.lb_cwhaddress.Text = "浠撳簱鍦板潃 ";
-            // 
-            // txt_cwhaddress
-            // 
-            this.txt_cwhaddress.Enabled = false;
-            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;
-            this.txt_cwhaddress.Size = new System.Drawing.Size(150, 28);
-            this.txt_cwhaddress.TabIndex = 273;
+            this.gv_zuid.VisibleIndex = 7;
+            this.gv_zuid.Width = 71;
             // 
             // lb_isNg
             // 
             this.lb_isNg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_isNg.Appearance.Options.UseFont = true;
-            this.lb_isNg.Location = new System.Drawing.Point(271, 148);
+            this.lb_isNg.Location = new System.Drawing.Point(914, 86);
             this.lb_isNg.Name = "lb_isNg";
             this.lb_isNg.Size = new System.Drawing.Size(107, 21);
             this.lb_isNg.TabIndex = 267;
@@ -473,11 +339,11 @@
             // txt_isNg
             // 
             this.txt_isNg.Enabled = false;
-            this.txt_isNg.Location = new System.Drawing.Point(382, 144);
+            this.txt_isNg.Location = new System.Drawing.Point(1026, 82);
             this.txt_isNg.Name = "txt_isNg";
             this.txt_isNg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_isNg.Properties.Appearance.Options.UseFont = true;
-            this.txt_isNg.Size = new System.Drawing.Size(150, 28);
+            this.txt_isNg.Size = new System.Drawing.Size(35, 28);
             this.txt_isNg.TabIndex = 267;
             // 
             // gv_isNg
@@ -486,19 +352,19 @@
             this.gv_isNg.AppearanceCell.Options.UseFont = true;
             this.gv_isNg.Caption = "鏄惁涓嶈壇鍝佷粨";
             this.gv_isNg.FieldName = "isNg";
-            this.gv_isNg.MinWidth = 50;
+            this.gv_isNg.MinWidth = 70;
             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 = 10;
-            this.gv_isNg.Width = 94;
+            this.gv_isNg.VisibleIndex = 6;
+            this.gv_isNg.Width = 70;
             // 
             // lb_isWy
             // 
             this.lb_isWy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_isWy.Appearance.Options.UseFont = true;
-            this.lb_isWy.Location = new System.Drawing.Point(6, 148);
+            this.lb_isWy.Location = new System.Drawing.Point(756, 86);
             this.lb_isWy.Name = "lb_isWy";
             this.lb_isWy.Size = new System.Drawing.Size(107, 21);
             this.lb_isWy.TabIndex = 262;
@@ -507,11 +373,11 @@
             // txt_isWy
             // 
             this.txt_isWy.Enabled = false;
-            this.txt_isWy.Location = new System.Drawing.Point(118, 144);
+            this.txt_isWy.Location = new System.Drawing.Point(869, 82);
             this.txt_isWy.Name = "txt_isWy";
             this.txt_isWy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_isWy.Properties.Appearance.Options.UseFont = true;
-            this.txt_isWy.Size = new System.Drawing.Size(150, 28);
+            this.txt_isWy.Size = new System.Drawing.Size(35, 28);
             this.txt_isWy.TabIndex = 262;
             // 
             // gv_isWy
@@ -520,133 +386,19 @@
             this.gv_isWy.AppearanceCell.Options.UseFont = true;
             this.gv_isWy.Caption = "鏄惁濮斿浠撳簱";
             this.gv_isWy.FieldName = "isWy";
-            this.gv_isWy.MinWidth = 50;
+            this.gv_isWy.MinWidth = 70;
             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 = 9;
-            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, 149);
-            this.lb_iconType.Name = "lb_iconType";
-            this.lb_iconType.Size = new System.Drawing.Size(73, 21);
-            this.lb_iconType.TabIndex = 258;
-            this.lb_iconType.Text = "鐪嬫澘鍥炬爣 ";
-            // 
-            // txt_iconType
-            // 
-            this.txt_iconType.Enabled = false;
-            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_depottypecode
-            // 
-            this.lb_depottypecode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_depottypecode.Appearance.Options.UseFont = true;
-            this.lb_depottypecode.Location = new System.Drawing.Point(6, 86);
-            this.lb_depottypecode.Name = "lb_depottypecode";
-            this.lb_depottypecode.Size = new System.Drawing.Size(107, 21);
-            this.lb_depottypecode.TabIndex = 247;
-            this.lb_depottypecode.Text = "浠撳簱绫诲瀷缂栫爜 ";
-            // 
-            // txt_depottypecode
-            // 
-            this.txt_depottypecode.Enabled = false;
-            this.txt_depottypecode.Location = new System.Drawing.Point(118, 82);
-            this.txt_depottypecode.Name = "txt_depottypecode";
-            this.txt_depottypecode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_depottypecode.Properties.Appearance.Options.UseFont = true;
-            this.txt_depottypecode.Size = new System.Drawing.Size(150, 28);
-            this.txt_depottypecode.TabIndex = 247;
-            // 
-            // gv_depottypecode
-            // 
-            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.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 = 8;
-            this.gv_depottypecode.Width = 94;
-            // 
-            // lb_type2
-            // 
-            this.lb_type2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_type2.Appearance.Options.UseFont = true;
-            this.lb_type2.Location = new System.Drawing.Point(40, 116);
-            this.lb_type2.Name = "lb_type2";
-            this.lb_type2.Size = new System.Drawing.Size(73, 21);
-            this.lb_type2.TabIndex = 243;
-            this.lb_type2.Text = "鎴愬搧浣跨敤 ";
-            // 
-            // txt_type2
-            // 
-            this.txt_type2.Enabled = false;
-            this.txt_type2.Location = new System.Drawing.Point(118, 112);
-            this.txt_type2.Name = "txt_type2";
-            this.txt_type2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_type2.Properties.Appearance.Options.UseFont = true;
-            this.txt_type2.Size = new System.Drawing.Size(150, 28);
-            this.txt_type2.TabIndex = 243;
-            // 
-            // lb_type1
-            // 
-            this.lb_type1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_type1.Appearance.Options.UseFont = true;
-            this.lb_type1.Location = new System.Drawing.Point(305, 86);
-            this.lb_type1.Name = "lb_type1";
-            this.lb_type1.Size = new System.Drawing.Size(73, 21);
-            this.lb_type1.TabIndex = 240;
-            this.lb_type1.Text = "鐗╂枡浣跨敤 ";
-            // 
-            // txt_type1
-            // 
-            this.txt_type1.Enabled = false;
-            this.txt_type1.Location = new System.Drawing.Point(382, 82);
-            this.txt_type1.Name = "txt_type1";
-            this.txt_type1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_type1.Properties.Appearance.Options.UseFont = true;
-            this.txt_type1.Size = new System.Drawing.Size(150, 28);
-            this.txt_type1.TabIndex = 240;
-            // 
-            // lb_factory
-            // 
-            this.lb_factory.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_factory.Appearance.Options.UseFont = true;
-            this.lb_factory.Location = new System.Drawing.Point(558, 86);
-            this.lb_factory.Name = "lb_factory";
-            this.lb_factory.Size = new System.Drawing.Size(73, 21);
-            this.lb_factory.TabIndex = 235;
-            this.lb_factory.Text = "鍒嗗巶缂栫爜 ";
-            // 
-            // txt_factory
-            // 
-            this.txt_factory.Enabled = false;
-            this.txt_factory.Location = new System.Drawing.Point(638, 82);
-            this.txt_factory.Name = "txt_factory";
-            this.txt_factory.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_factory.Properties.Appearance.Options.UseFont = true;
-            this.txt_factory.Size = new System.Drawing.Size(150, 28);
-            this.txt_factory.TabIndex = 235;
+            this.gv_isWy.VisibleIndex = 5;
+            this.gv_isWy.Width = 70;
             // 
             // lb_depottype
             // 
             this.lb_depottype.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_depottype.Appearance.Options.UseFont = true;
-            this.lb_depottype.Location = new System.Drawing.Point(305, 52);
+            this.lb_depottype.Location = new System.Drawing.Point(284, 52);
             this.lb_depottype.Name = "lb_depottype";
             this.lb_depottype.Size = new System.Drawing.Size(73, 21);
             this.lb_depottype.TabIndex = 231;
@@ -655,7 +407,7 @@
             // txt_depottype
             // 
             this.txt_depottype.Enabled = false;
-            this.txt_depottype.Location = new System.Drawing.Point(382, 48);
+            this.txt_depottype.Location = new System.Drawing.Point(361, 48);
             this.txt_depottype.Name = "txt_depottype";
             this.txt_depottype.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_depottype.Properties.Appearance.Options.UseFont = true;
@@ -668,19 +420,19 @@
             this.gv_depottype.AppearanceCell.Options.UseFont = true;
             this.gv_depottype.Caption = "浠撳簱绫诲瀷";
             this.gv_depottype.FieldName = "depottype";
-            this.gv_depottype.MinWidth = 50;
+            this.gv_depottype.MinWidth = 80;
             this.gv_depottype.Name = "gv_depottype";
             this.gv_depottype.OptionsColumn.AllowEdit = false;
             this.gv_depottype.Tag = "query_a.depottype";
             this.gv_depottype.Visible = true;
-            this.gv_depottype.VisibleIndex = 7;
-            this.gv_depottype.Width = 94;
+            this.gv_depottype.VisibleIndex = 3;
+            this.gv_depottype.Width = 80;
             // 
             // lb_lastupdateDate
             // 
             this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_lastupdateDate.Appearance.Options.UseFont = true;
-            this.lb_lastupdateDate.Location = new System.Drawing.Point(814, 86);
+            this.lb_lastupdateDate.Location = new System.Drawing.Point(756, 52);
             this.lb_lastupdateDate.Name = "lb_lastupdateDate";
             this.lb_lastupdateDate.Size = new System.Drawing.Size(107, 21);
             this.lb_lastupdateDate.TabIndex = 228;
@@ -689,38 +441,18 @@
             // txt_lastupdateDate
             // 
             this.txt_lastupdateDate.Enabled = false;
-            this.txt_lastupdateDate.Location = new System.Drawing.Point(927, 82);
+            this.txt_lastupdateDate.Location = new System.Drawing.Point(869, 48);
             this.txt_lastupdateDate.Name = "txt_lastupdateDate";
             this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_lastupdateDate.Size = new System.Drawing.Size(150, 28);
+            this.txt_lastupdateDate.Size = new System.Drawing.Size(192, 28);
             this.txt_lastupdateDate.TabIndex = 228;
-            // 
-            // lb_lastupdateBy
-            // 
-            this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_lastupdateBy.Appearance.Options.UseFont = true;
-            this.lb_lastupdateBy.Location = new System.Drawing.Point(831, 52);
-            this.lb_lastupdateBy.Name = "lb_lastupdateBy";
-            this.lb_lastupdateBy.Size = new System.Drawing.Size(90, 21);
-            this.lb_lastupdateBy.TabIndex = 226;
-            this.lb_lastupdateBy.Text = "鏈�鍚庢洿鏂颁汉 ";
-            // 
-            // txt_lastupdateBy
-            // 
-            this.txt_lastupdateBy.Enabled = false;
-            this.txt_lastupdateBy.Location = new System.Drawing.Point(927, 48);
-            this.txt_lastupdateBy.Name = "txt_lastupdateBy";
-            this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_lastupdateBy.Size = new System.Drawing.Size(150, 28);
-            this.txt_lastupdateBy.TabIndex = 226;
             // 
             // lb_createDate
             // 
             this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_createDate.Appearance.Options.UseFont = true;
-            this.lb_createDate.Location = new System.Drawing.Point(848, 18);
+            this.lb_createDate.Location = new System.Drawing.Point(790, 18);
             this.lb_createDate.Name = "lb_createDate";
             this.lb_createDate.Size = new System.Drawing.Size(73, 21);
             this.lb_createDate.TabIndex = 222;
@@ -729,18 +461,18 @@
             // txt_createDate
             // 
             this.txt_createDate.Enabled = false;
-            this.txt_createDate.Location = new System.Drawing.Point(927, 14);
+            this.txt_createDate.Location = new System.Drawing.Point(869, 14);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(150, 28);
+            this.txt_createDate.Size = new System.Drawing.Size(192, 28);
             this.txt_createDate.TabIndex = 222;
             // 
             // lb_createBy
             // 
             this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_createBy.Appearance.Options.UseFont = true;
-            this.lb_createBy.Location = new System.Drawing.Point(541, 18);
+            this.lb_createBy.Location = new System.Drawing.Point(520, 18);
             this.lb_createBy.Name = "lb_createBy";
             this.lb_createBy.Size = new System.Drawing.Size(90, 21);
             this.lb_createBy.TabIndex = 219;
@@ -749,11 +481,11 @@
             // txt_createBy
             // 
             this.txt_createBy.Enabled = false;
-            this.txt_createBy.Location = new System.Drawing.Point(638, 14);
+            this.txt_createBy.Location = new System.Drawing.Point(617, 14);
             this.txt_createBy.Name = "txt_createBy";
             this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(150, 28);
+            this.txt_createBy.Size = new System.Drawing.Size(119, 28);
             this.txt_createBy.TabIndex = 219;
             // 
             // gv_createBy
@@ -767,8 +499,8 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 6;
-            this.gv_createBy.Width = 94;
+            this.gv_createBy.VisibleIndex = 4;
+            this.gv_createBy.Width = 71;
             // 
             // lb_description
             // 
@@ -790,25 +522,11 @@
             this.txt_description.Size = new System.Drawing.Size(150, 28);
             this.txt_description.TabIndex = 217;
             // 
-            // gv_description
-            // 
-            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.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 = 5;
-            this.gv_description.Width = 94;
-            // 
             // lb_depotName
             // 
             this.lb_depotName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_depotName.Appearance.Options.UseFont = true;
-            this.lb_depotName.Location = new System.Drawing.Point(305, 18);
+            this.lb_depotName.Location = new System.Drawing.Point(284, 18);
             this.lb_depotName.Name = "lb_depotName";
             this.lb_depotName.Size = new System.Drawing.Size(73, 21);
             this.lb_depotName.TabIndex = 216;
@@ -817,7 +535,7 @@
             // txt_depotName
             // 
             this.txt_depotName.Enabled = false;
-            this.txt_depotName.Location = new System.Drawing.Point(382, 14);
+            this.txt_depotName.Location = new System.Drawing.Point(361, 14);
             this.txt_depotName.Name = "txt_depotName";
             this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_depotName.Properties.Appearance.Options.UseFont = true;
@@ -835,7 +553,7 @@
             this.gv_depotName.OptionsColumn.AllowEdit = false;
             this.gv_depotName.Tag = "query_a.depot_name";
             this.gv_depotName.Visible = true;
-            this.gv_depotName.VisibleIndex = 4;
+            this.gv_depotName.VisibleIndex = 2;
             this.gv_depotName.Width = 150;
             // 
             // lb_depotCode
@@ -869,7 +587,7 @@
             this.gv_depotCode.OptionsColumn.AllowEdit = false;
             this.gv_depotCode.Tag = "query_a.depot_code";
             this.gv_depotCode.Visible = true;
-            this.gv_depotCode.VisibleIndex = 3;
+            this.gv_depotCode.VisibleIndex = 1;
             this.gv_depotCode.Width = 100;
             // 
             // toolBarMenu1
@@ -882,7 +600,7 @@
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1266, 80);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = "xlsOut_depots{}";
             this.toolBarMenu1.xlsOutParameter = null;
@@ -894,7 +612,7 @@
             this.gcMain.Location = new System.Drawing.Point(0, 0);
             this.gcMain.MainView = this.gridView1;
             this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(1126, 531);
+            this.gcMain.Size = new System.Drawing.Size(1264, 531);
             this.gcMain.TabIndex = 1;
             this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -908,20 +626,20 @@
             this.gridView1.ColumnPanelRowHeight = 60;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn1,
-            this.gridColumn4,
-            this.gv_id,
             this.gv_depotCode,
             this.gv_depotName,
             this.gv_depottype,
-            this.gv_description,
             this.gv_createBy,
-            this.gv_depottypecode,
             this.gv_isWy,
             this.gv_isNg,
             this.gv_zuid,
             this.gv_isFkc,
-            this.gridColumn3,
-            this.gridColumn2});
+            this.gridColumn2,
+            this.gridColumn6,
+            this.gridColumn5,
+            this.gridColumn4,
+            this.gridColumn7,
+            this.gridColumn3});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -941,52 +659,70 @@
             this.gridColumn1.VisibleIndex = 0;
             this.gridColumn1.Width = 250;
             // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "绂佺敤鐘舵��";
+            this.gridColumn2.MinWidth = 50;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Tag = "query_a.zuid";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 9;
+            this.gridColumn2.Width = 52;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "渚涘簲鍟�";
+            this.gridColumn6.FieldName = "SUPPLIER_ID";
+            this.gridColumn6.MinWidth = 60;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Tag = "query_a.SUPPLIER_ID";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 10;
+            this.gridColumn6.Width = 70;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "瀹㈡埛";
+            this.gridColumn5.FieldName = "Client_Id";
+            this.gridColumn5.MinWidth = 60;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Tag = "query_a.Client_Id";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 11;
+            this.gridColumn5.Width = 60;
+            // 
             // gridColumn4
             // 
-            this.gridColumn4.Caption = "瀹℃牳鐘舵��";
-            this.gridColumn4.FieldName = "checkStatus";
-            this.gridColumn4.MaxWidth = 50;
-            this.gridColumn4.MinWidth = 50;
+            this.gridColumn4.Caption = "閮ㄩ棬";
+            this.gridColumn4.FieldName = "department";
+            this.gridColumn4.MinWidth = 60;
             this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.OptionsColumn.AllowEdit = false;
-            this.gridColumn4.UnboundDataType = typeof(bool);
+            this.gridColumn4.Tag = "query_a.department";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 1;
-            this.gridColumn4.Width = 50;
+            this.gridColumn4.VisibleIndex = 12;
+            this.gridColumn4.Width = 60;
             // 
-            // gv_id
+            // gridColumn7
             // 
-            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.Tag = "query_a.depot_Id";
-            this.gv_id.Visible = true;
-            this.gv_id.VisibleIndex = 2;
-            this.gv_id.Width = 94;
+            this.gridColumn7.Caption = "鑱旂郴鐢佃瘽";
+            this.gridColumn7.FieldName = "phone";
+            this.gridColumn7.MinWidth = 60;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Tag = "query_a.Phone";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 13;
+            this.gridColumn7.Width = 60;
             // 
             // gridColumn3
             // 
-            this.gridColumn3.Caption = "瀹℃牳浜�";
-            this.gridColumn3.FieldName = "checkBy";
-            this.gridColumn3.MinWidth = 100;
+            this.gridColumn3.Caption = "鍚屾鏃堕棿";
+            this.gridColumn3.FieldName = "lastupdateDate";
+            this.gridColumn3.MinWidth = 180;
             this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.OptionsColumn.AllowEdit = false;
+            this.gridColumn3.Tag = "query_a.lastupdate_date";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 13;
-            this.gridColumn3.Width = 100;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "瀹℃牳鏃堕棿";
-            this.gridColumn2.FieldName = "checkDate";
-            this.gridColumn2.MinWidth = 180;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.OptionsColumn.AllowEdit = false;
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 14;
-            this.gridColumn2.Width = 180;
+            this.gridColumn3.VisibleIndex = 14;
+            this.gridColumn3.Width = 180;
             // 
             // xtraTabControl1
             // 
@@ -994,7 +730,7 @@
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1266, 602);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -1005,7 +741,7 @@
             this.xtraTabPage1.Controls.Add(this.gcMain);
             this.xtraTabPage1.Controls.Add(this.pageBar1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1264, 570);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // pageBar1
@@ -1016,7 +752,7 @@
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1264, 39);
             this.pageBar1.TabIndex = 3;
             this.pageBar1.TotalPages = 0;
             // 
@@ -1025,16 +761,16 @@
             this.xtraTabPage2.Controls.Add(this.tabMx);
             this.xtraTabPage2.Controls.Add(this.panel1);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1264, 570);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 200);
+            this.tabMx.Location = new System.Drawing.Point(0, 123);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 370);
+            this.tabMx.Size = new System.Drawing.Size(1264, 447);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -1044,36 +780,18 @@
             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_materialProperti);
-            this.panel1.Controls.Add(this.txt_materialProperti);
             this.panel1.Controls.Add(this.lb_isFkc);
             this.panel1.Controls.Add(this.txt_isFkc);
             this.panel1.Controls.Add(this.lb_zuid);
             this.panel1.Controls.Add(this.txt_zuid);
-            this.panel1.Controls.Add(this.lb_piType);
-            this.panel1.Controls.Add(this.txt_piType);
-            this.panel1.Controls.Add(this.lb_cwhaddress);
-            this.panel1.Controls.Add(this.txt_cwhaddress);
             this.panel1.Controls.Add(this.lb_isNg);
             this.panel1.Controls.Add(this.txt_isNg);
             this.panel1.Controls.Add(this.lb_isWy);
             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_depottypecode);
-            this.panel1.Controls.Add(this.txt_depottypecode);
-            this.panel1.Controls.Add(this.lb_type2);
-            this.panel1.Controls.Add(this.txt_type2);
-            this.panel1.Controls.Add(this.lb_type1);
-            this.panel1.Controls.Add(this.txt_type1);
-            this.panel1.Controls.Add(this.lb_factory);
-            this.panel1.Controls.Add(this.txt_factory);
             this.panel1.Controls.Add(this.lb_depottype);
             this.panel1.Controls.Add(this.txt_depottype);
             this.panel1.Controls.Add(this.lb_lastupdateDate);
             this.panel1.Controls.Add(this.txt_lastupdateDate);
-            this.panel1.Controls.Add(this.lb_lastupdateBy);
-            this.panel1.Controls.Add(this.txt_lastupdateBy);
             this.panel1.Controls.Add(this.lb_createDate);
             this.panel1.Controls.Add(this.txt_createDate);
             this.panel1.Controls.Add(this.lb_createBy);
@@ -1088,12 +806,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, 200);
+            this.panel1.Size = new System.Drawing.Size(1264, 123);
             this.panel1.TabIndex = 1;
             // 
             // labelControl11
             // 
-            this.labelControl11.Location = new System.Drawing.Point(918, 177);
+            this.labelControl11.Location = new System.Drawing.Point(545, 88);
             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);
@@ -1104,7 +822,7 @@
             // lbGuid
             // 
             this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(969, 177);
+            this.lbGuid.Location = new System.Drawing.Point(596, 86);
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
@@ -1125,7 +843,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.ClientSize = new System.Drawing.Size(1266, 682);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
@@ -1135,21 +853,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.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();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cwhaddress.Properties)).EndInit();
             ((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_depottypecode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_type2.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_type1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit();
@@ -1181,21 +890,15 @@
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.LabelControl labelControl11;
         private DevExpress.XtraTab.XtraTabControl tabMx;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionNamet;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1kbQty;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateDate;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateBy;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1description;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1completenessFlag;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionName;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
         private DevExpress.XtraGrid.GridControl gcMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-
-        private DevExpress.XtraEditors.LabelControl lb_materialProperti;
-        private DevExpress.XtraEditors.TextEdit txt_materialProperti;
 
         private DevExpress.XtraEditors.LabelControl lb_isFkc;
         private DevExpress.XtraEditors.TextEdit txt_isFkc;
@@ -1205,12 +908,6 @@
         private DevExpress.XtraEditors.TextEdit txt_zuid;
         private DevExpress.XtraGrid.Columns.GridColumn gv_zuid;
 
-        private DevExpress.XtraEditors.LabelControl lb_piType;
-        private DevExpress.XtraEditors.TextEdit txt_piType;
-
-        private DevExpress.XtraEditors.LabelControl lb_cwhaddress;
-        private DevExpress.XtraEditors.TextEdit txt_cwhaddress;
-
         private DevExpress.XtraEditors.LabelControl lb_isNg;
         private DevExpress.XtraEditors.TextEdit txt_isNg;
         private DevExpress.XtraGrid.Columns.GridColumn gv_isNg;
@@ -1219,31 +916,12 @@
         private DevExpress.XtraEditors.TextEdit txt_isWy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_isWy;
 
-        private DevExpress.XtraEditors.LabelControl lb_iconType;
-        private DevExpress.XtraEditors.TextEdit txt_iconType;
-
-        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.XtraEditors.LabelControl lb_type1;
-        private DevExpress.XtraEditors.TextEdit txt_type1;
-
-        private DevExpress.XtraEditors.LabelControl lb_factory;
-        private DevExpress.XtraEditors.TextEdit txt_factory;
-
         private DevExpress.XtraEditors.LabelControl lb_depottype;
         private DevExpress.XtraEditors.TextEdit txt_depottype;
         private DevExpress.XtraGrid.Columns.GridColumn gv_depottype;
 
         private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
         private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
-        private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
 
         private DevExpress.XtraEditors.LabelControl lb_createDate;
         private DevExpress.XtraEditors.TextEdit txt_createDate;
@@ -1254,7 +932,6 @@
 
         private DevExpress.XtraEditors.LabelControl lb_description;
         private DevExpress.XtraEditors.TextEdit txt_description;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_description;
 
         private DevExpress.XtraEditors.LabelControl lb_depotName;
         private DevExpress.XtraEditors.TextEdit txt_depotName;
@@ -1265,11 +942,13 @@
         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;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3