From 306711615d5923e3410792310febf642c304dd3c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 12 十一月 2024 08:11:51 +0800
Subject: [PATCH] 细节

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs                  |    6 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs   |  107 +++++++++++++++-----
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs                |    5 -
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs           |    6 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepots.cs        |   36 +++---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs                    |    6 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs            |   69 +------------
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs              |    6 
 DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs                 |    6 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs |   42 ++++---
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs                    |   11 ++
 11 files changed, 158 insertions(+), 142 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
index c3ca727..430472e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -118,8 +118,10 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
-            UtilityHelper.JumpToTab(xtraTabControl1, 0);
-            getPageList(1, UtilityHelper.GetPageSize());
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim(), false, 999);
+            else
+                getPageList(1, UtilityHelper.GetPageSize());
         }
 
         /// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
index a1e2cfd..f0e4cad 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -181,8 +181,10 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
-            UtilityHelper.JumpToTab(xtraTabControl1, 0);
-            getPageList(1, UtilityHelper.GetPageSize());
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim(), false, 999);
+            else
+                getPageList(1, UtilityHelper.GetPageSize());
         }
         /// <summary>
         /// 淇敼浜嬩欢
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index c57c9f3..a8ff22b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -186,8 +186,10 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
-            UtilityHelper.JumpToTab(xtraTabControl1, 0);
-            getPageList(1, UtilityHelper.GetPageSize());
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim(), false, 999);
+            else
+                getPageList(1, UtilityHelper.GetPageSize());
         }
         /// <summary>
         /// 淇敼浜嬩欢
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index e01e3ab..777eaf2 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -215,8 +215,10 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
-            UtilityHelper.JumpToTab(xtraTabControl1, 0);
-            getPageList(1, UtilityHelper.GetPageSize());
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim(), false, 999);
+            else
+                getPageList(1, UtilityHelper.GetPageSize());
         }
 
         /// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
index 030fbae..b285435 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -117,8 +117,10 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
-            UtilityHelper.JumpToTab(xtraTabControl1, 0);
-            getPageList(1, UtilityHelper.GetPageSize());
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim(), false, 999);
+            else
+                getPageList(1, UtilityHelper.GetPageSize());
         }
 
         /// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
index a644760..b3decce 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
@@ -35,7 +35,6 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
             this.gvMx1depotSectionNamet = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1zuid = 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();
@@ -104,6 +103,9 @@
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -151,37 +153,25 @@
             // 
             this.gvMx1depotSectionNamet.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1depotSectionNamet.AppearanceCell.Options.UseFont = true;
-            this.gvMx1depotSectionNamet.Caption = "浠撲綅鍏ㄥ悕 ";
+            this.gvMx1depotSectionNamet.Caption = "浠撲綅鍏ㄥ悕";
             this.gvMx1depotSectionNamet.FieldName = "depotSectionNamet";
             this.gvMx1depotSectionNamet.MinWidth = 50;
             this.gvMx1depotSectionNamet.Name = "gvMx1depotSectionNamet";
             this.gvMx1depotSectionNamet.Tag = "query_a.depot_section_namet";
             this.gvMx1depotSectionNamet.Visible = true;
-            this.gvMx1depotSectionNamet.VisibleIndex = 6;
+            this.gvMx1depotSectionNamet.VisibleIndex = 5;
             this.gvMx1depotSectionNamet.Width = 94;
-            // 
-            // gvMx1zuid
-            // 
-            this.gvMx1zuid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1zuid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1zuid.Caption = "浠撲綅缁処D ";
-            this.gvMx1zuid.FieldName = "zuid";
-            this.gvMx1zuid.MinWidth = 50;
-            this.gvMx1zuid.Name = "gvMx1zuid";
-            this.gvMx1zuid.Tag = "query_a.zuid";
-            this.gvMx1zuid.Visible = true;
-            this.gvMx1zuid.VisibleIndex = 5;
-            this.gvMx1zuid.Width = 94;
             // 
             // gvMx1kbQty
             // 
             this.gvMx1kbQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1kbQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1kbQty.Caption = "鍗℃澘鏁� ";
+            this.gvMx1kbQty.Caption = "鍗℃澘鏁�";
             this.gvMx1kbQty.FieldName = "kbQty";
             this.gvMx1kbQty.MinWidth = 50;
             this.gvMx1kbQty.Name = "gvMx1kbQty";
             this.gvMx1kbQty.Tag = "query_a.kb_qty";
+            this.gvMx1kbQty.UnboundDataType = typeof(decimal);
             this.gvMx1kbQty.Visible = true;
             this.gvMx1kbQty.VisibleIndex = 4;
             this.gvMx1kbQty.Width = 94;
@@ -190,35 +180,35 @@
             // 
             this.gvMx1lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1lastupdateDate.AppearanceCell.Options.UseFont = true;
-            this.gvMx1lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
+            this.gvMx1lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂�";
             this.gvMx1lastupdateDate.FieldName = "lastupdateDate";
             this.gvMx1lastupdateDate.MinWidth = 50;
             this.gvMx1lastupdateDate.Name = "gvMx1lastupdateDate";
             this.gvMx1lastupdateDate.OptionsColumn.ReadOnly = true;
             this.gvMx1lastupdateDate.Tag = "query_a.lastupdate_date";
             this.gvMx1lastupdateDate.Visible = true;
-            this.gvMx1lastupdateDate.VisibleIndex = 8;
+            this.gvMx1lastupdateDate.VisibleIndex = 7;
             this.gvMx1lastupdateDate.Width = 94;
             // 
             // gvMx1lastupdateBy
             // 
             this.gvMx1lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1lastupdateBy.AppearanceCell.Options.UseFont = true;
-            this.gvMx1lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
+            this.gvMx1lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉";
             this.gvMx1lastupdateBy.FieldName = "lastupdateBy";
             this.gvMx1lastupdateBy.MinWidth = 50;
             this.gvMx1lastupdateBy.Name = "gvMx1lastupdateBy";
             this.gvMx1lastupdateBy.OptionsColumn.ReadOnly = true;
             this.gvMx1lastupdateBy.Tag = "query_a.lastupdate_by";
             this.gvMx1lastupdateBy.Visible = true;
-            this.gvMx1lastupdateBy.VisibleIndex = 7;
+            this.gvMx1lastupdateBy.VisibleIndex = 6;
             this.gvMx1lastupdateBy.Width = 94;
             // 
             // gvMx1description
             // 
             this.gvMx1description.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1description.AppearanceCell.Options.UseFont = true;
-            this.gvMx1description.Caption = "澶囨敞 ";
+            this.gvMx1description.Caption = "澶囨敞";
             this.gvMx1description.FieldName = "description";
             this.gvMx1description.MinWidth = 50;
             this.gvMx1description.Name = "gvMx1description";
@@ -231,11 +221,12 @@
             // 
             this.gvMx1completenessFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1completenessFlag.AppearanceCell.Options.UseFont = true;
-            this.gvMx1completenessFlag.Caption = "鍙備笌榻愬鏍¢獙(0:鍚�,1:鏄�) ";
+            this.gvMx1completenessFlag.Caption = "鍙備笌榻愬鏍¢獙(0:鍚�,1:鏄�)";
             this.gvMx1completenessFlag.FieldName = "completenessFlag";
             this.gvMx1completenessFlag.MinWidth = 50;
             this.gvMx1completenessFlag.Name = "gvMx1completenessFlag";
             this.gvMx1completenessFlag.Tag = "query_a.completeness_flag";
+            this.gvMx1completenessFlag.UnboundDataType = typeof(bool);
             this.gvMx1completenessFlag.Visible = true;
             this.gvMx1completenessFlag.VisibleIndex = 2;
             this.gvMx1completenessFlag.Width = 94;
@@ -244,7 +235,7 @@
             // 
             this.gvMx1depotSectionName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1depotSectionName.AppearanceCell.Options.UseFont = true;
-            this.gvMx1depotSectionName.Caption = "璐т綅鍚嶇О ";
+            this.gvMx1depotSectionName.Caption = "璐т綅鍚嶇О";
             this.gvMx1depotSectionName.FieldName = "depotSectionName";
             this.gvMx1depotSectionName.MinWidth = 50;
             this.gvMx1depotSectionName.Name = "gvMx1depotSectionName";
@@ -257,7 +248,7 @@
             // 
             this.gvMx1depotSectionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
-            this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜 ";
+            this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜";
             this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
             this.gvMx1depotSectionCode.MinWidth = 50;
             this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
@@ -307,7 +298,6 @@
             this.gvMx1completenessFlag,
             this.gvMx1description,
             this.gvMx1kbQty,
-            this.gvMx1zuid,
             this.gvMx1depotSectionNamet,
             this.gvMx1lastupdateBy,
             this.gvMx1lastupdateDate,
@@ -326,7 +316,7 @@
             this.gvMxDel.MinWidth = 25;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 9;
+            this.gvMxDel.VisibleIndex = 8;
             this.gvMxDel.Width = 94;
             // 
             // repositoryItemButtonEdit1
@@ -352,6 +342,7 @@
             // 
             // 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);
@@ -371,6 +362,7 @@
             // 
             // txt_isFkc
             // 
+            this.txt_isFkc.Enabled = false;
             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);
@@ -404,6 +396,7 @@
             // 
             // txt_zuid
             // 
+            this.txt_zuid.Enabled = false;
             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);
@@ -437,6 +430,7 @@
             // 
             // 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);
@@ -456,6 +450,7 @@
             // 
             // 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);
@@ -475,6 +470,7 @@
             // 
             // txt_isNg
             // 
+            this.txt_isNg.Enabled = false;
             this.txt_isNg.Location = new System.Drawing.Point(382, 144);
             this.txt_isNg.Name = "txt_isNg";
             this.txt_isNg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -508,6 +504,7 @@
             // 
             // txt_isWy
             // 
+            this.txt_isWy.Enabled = false;
             this.txt_isWy.Location = new System.Drawing.Point(118, 144);
             this.txt_isWy.Name = "txt_isWy";
             this.txt_isWy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -541,6 +538,7 @@
             // 
             // 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);
@@ -560,6 +558,7 @@
             // 
             // 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);
@@ -593,6 +592,7 @@
             // 
             // 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);
@@ -612,6 +612,7 @@
             // 
             // 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);
@@ -631,6 +632,7 @@
             // 
             // 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);
@@ -650,6 +652,7 @@
             // 
             // txt_depottype
             // 
+            this.txt_depottype.Enabled = false;
             this.txt_depottype.Location = new System.Drawing.Point(382, 48);
             this.txt_depottype.Name = "txt_depottype";
             this.txt_depottype.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -683,6 +686,7 @@
             // 
             // txt_lastupdateDate
             // 
+            this.txt_lastupdateDate.Enabled = false;
             this.txt_lastupdateDate.Location = new System.Drawing.Point(927, 82);
             this.txt_lastupdateDate.Name = "txt_lastupdateDate";
             this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -702,6 +706,7 @@
             // 
             // 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);
@@ -721,6 +726,7 @@
             // 
             // txt_createDate
             // 
+            this.txt_createDate.Enabled = false;
             this.txt_createDate.Location = new System.Drawing.Point(927, 14);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -740,6 +746,7 @@
             // 
             // txt_createBy
             // 
+            this.txt_createBy.Enabled = false;
             this.txt_createBy.Location = new System.Drawing.Point(638, 14);
             this.txt_createBy.Name = "txt_createBy";
             this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -773,6 +780,7 @@
             // 
             // txt_description
             // 
+            this.txt_description.Enabled = false;
             this.txt_description.Location = new System.Drawing.Point(118, 48);
             this.txt_description.Name = "txt_description";
             this.txt_description.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -806,6 +814,7 @@
             // 
             // txt_depotName
             // 
+            this.txt_depotName.Enabled = false;
             this.txt_depotName.Location = new System.Drawing.Point(382, 14);
             this.txt_depotName.Name = "txt_depotName";
             this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -839,6 +848,7 @@
             // 
             // txt_depotCode
             // 
+            this.txt_depotCode.Enabled = false;
             this.txt_depotCode.Location = new System.Drawing.Point(118, 14);
             this.txt_depotCode.Name = "txt_depotCode";
             this.txt_depotCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -905,7 +915,10 @@
             this.gv_isWy,
             this.gv_isNg,
             this.gv_zuid,
-            this.gv_isFkc});
+            this.gv_isFkc,
+            this.gridColumn4,
+            this.gridColumn3,
+            this.gridColumn2});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -934,6 +947,40 @@
             this.gv_id.Visible = true;
             this.gv_id.VisibleIndex = 1;
             this.gv_id.Width = 94;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "瀹℃牳鐘舵��";
+            this.gridColumn4.FieldName = "checkStatus";
+            this.gridColumn4.MinWidth = 50;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.OptionsColumn.AllowEdit = false;
+            this.gridColumn4.UnboundDataType = typeof(bool);
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 12;
+            this.gridColumn4.Width = 94;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "瀹℃牳浜�";
+            this.gridColumn3.FieldName = "checkBy";
+            this.gridColumn3.MinWidth = 100;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.OptionsColumn.AllowEdit = false;
+            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;
             // 
             // xtraTabControl1
             // 
@@ -1117,7 +1164,6 @@
         private DevExpress.XtraEditors.LabelControl labelControl11;
   private DevExpress.XtraTab.XtraTabControl tabMx;
  private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionNamet;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1zuid;
  private DevExpress.XtraGrid.Columns.GridColumn gvMx1kbQty;
  private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateDate;
  private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateBy;
@@ -1203,5 +1249,8 @@
         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;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
index b33636c..e6335f6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
@@ -24,11 +24,9 @@
         public Frm_MesDepot()
         {
             InitializeComponent();
-            toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
             toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
             toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
             toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
-            toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
             toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
             toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
@@ -137,47 +135,6 @@
         }
 
         /// <summary>
-        ///     鍒犻櫎浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
-        {
-            string rowGuid = "", rowName = "";
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_depotCode, gridView1);
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
-                return;
-            var lst = new List<dynamic>();
-            lst.Add(rowGuid);
-            var _obj = lst;
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("",
-                    _webServiceName + "DeleteModel",
-                    JsonConvert.SerializeObject(_obj));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
-                    getPageList(1, UtilityHelper.GetPageSize());
-                }
-
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        /// <summary>
         ///     鍒锋柊浜嬩欢
         /// </summary>
         /// <param name="sender"></param>
@@ -209,20 +166,7 @@
             getModel(rowGuid, true, 1);
         }
 
-        /// <summary>
-        ///     鏂板浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
-        {
-            UtilityHelper.JumpToTab(xtraTabControl1, 1);
-            lbGuid.Text = "";
-            var gridViews = new List<GridView>();
-            gridViews.Add(gvMx1);
-            UtilityHelper.CleanValueByControl(panel1.Controls, true, gridViews);
-            UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
-        }
+
 
         /// <summary>
         ///     淇濆瓨浜嬩欢
@@ -245,7 +189,6 @@
                 txt_depotName.Focus();
                 return;
             }
-
             gvMx1.CloseEditor();
             gvMx1.UpdateCurrentRow();
             var lst = new List<MesDepotSections>();
@@ -255,9 +198,13 @@
                 if (row != null)
                     lst.Add(new MesDepotSections
                     {
-                        Guid = null,
+                        Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
                         DepotSectionCode = row["depotSectionCode"].ToString(),
-                        DepotSectionName = row["DepotSectionName"].ToString()
+                        DepotSectionName = row["DepotSectionName"].ToString(),
+                        Description = row["Description"].ToString(),
+                        KbQty =Gs.DevApp.ToolBox.UtilityHelper.ToInt(row["KbQty"].ToString()),
+                        DepotSectionNamet = row["depotSectionNamet"].ToString(),
+                        CompletenessFlag = Gs.DevApp.ToolBox.UtilityHelper.ToInt(row["completenessFlag"].ToString()),
                     });
             }
 
@@ -383,6 +330,8 @@
         private void repositoryItemButtonEdit1_ButtonClick(object sender,
             ButtonPressedEventArgs e)
         {
+            gvMx1.CloseEditor();
+            gvMx1.UpdateCurrentRow();
             var rowhandle = gvMx1.FocusedRowHandle;
             if (rowhandle < 0)
                 return;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs
index 3bc46fb..9f6db39 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs
@@ -1,105 +1,109 @@
-锘縰sing System;
-
+锘�
+using System;
+using System.Collections.Generic;
 namespace MES.Service.Modes
 {
+    /// <summary>
+    /// </summary>
+ 
     public class MesDepotSections
     {
         /// <summary>
         ///     榛樿鍊�: (newid())
         /// </summary>
-
+       
         public Guid? Guid { get; set; }
 
         /// <summary>
         /// </summary>
-
+     
         public Guid? DepotGuid { get; set; }
 
         /// <summary>
         ///     ID(SEQ_INV_ID)锛圗RPID锛�
         /// </summary>
-
+   
         public int DepotSectionId { get; set; }
 
         /// <summary>
         ///     璐т綅缂栫爜
         /// </summary>
-
+      
         public string DepotSectionCode { get; set; }
 
         /// <summary>
         ///     璐т綅鍚嶇О
         /// </summary>
-
+      
         public string DepotSectionName { get; set; }
 
         /// <summary>
         ///     鍙備笌榻愬鏍¢獙(0:鍚�,1:鏄�)
         /// </summary>
-
+     
         public int? CompletenessFlag { get; set; }
 
         /// <summary>
         ///     澶囨敞
         /// </summary>
-
+      
         public string Description { get; set; }
 
         /// <summary>
         ///     鍒涘缓浜�
         /// </summary>
-
+      
         public string CreateBy { get; set; }
 
         /// <summary>
         ///     鍒涘缓鏃堕棿
         /// </summary>
-
+     
         public DateTime? CreateDate { get; set; }
 
         /// <summary>
         ///     鏈�鍚庢洿鏂颁汉
         /// </summary>
-
+      
         public string LastupdateBy { get; set; }
 
         /// <summary>
         ///     鏈�鍚庢洿鏂版椂闂�
         /// </summary>
-
+      
         public DateTime? LastupdateDate { get; set; }
 
         /// <summary>
         /// </summary>
-
+       
         public string Company { get; set; }
 
         /// <summary>
         /// </summary>
-
+      
         public string Factory { get; set; }
 
         /// <summary>
         ///     鍗℃澘鏁�
         /// </summary>
-
+       
         public int? KbQty { get; set; }
 
         /// <summary>
         ///     浠撲綅缁処D
         /// </summary>
-
+      
         public int? Zuid { get; set; }
 
         /// <summary>
         ///     浠撲綅鍏ㄥ悕
         /// </summary>
-
+     
         public string DepotSectionNamet { get; set; }
 
         /// <summary>
         /// </summary>
-
+     
         public int? Erpid { get; set; }
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepots.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepots.cs
index 5606db5..3823d0a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepots.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepots.cs
@@ -1,6 +1,6 @@
-锘縰sing System;
+锘�
+using System;
 using System.Collections.Generic;
-
 namespace MES.Service.Modes
 {
     /// <summary>
@@ -10,13 +10,11 @@
         /// <summary>
         ///     榛樿鍊�: (newid())
         /// </summary>
-
         public Guid? Guid { get; set; }
 
         /// <summary>
         ///     ID(SEQ_INV_ID)
         /// </summary>
-
         public int DepotId { get; set; }
 
         /// <summary>
@@ -78,7 +76,7 @@
         ///     榛樿鍊�: ((0))
         /// </summary>
 
-        public int? Type1 { get; set; }
+        public int Type1 { get; set; }
 
         /// <summary>
         ///     鎴愬搧浣跨敤
@@ -103,7 +101,7 @@
         ///     鐪嬫澘鍥炬爣鏍峰紡
         /// </summary>
 
-        public int? IconType { get; set; }
+        public int IconType { get; set; }
 
         /// <summary>
         ///     鏄惁濮斿浠撳簱
@@ -157,18 +155,6 @@
         public string MaterialProperti { get; set; }
 
         /// <summary>
-        ///     鍒涘缓缁勭粐
-        /// </summary>
-
-        public int? CreateOrg { get; set; }
-
-        /// <summary>
-        ///     浣跨敤缁勭粐
-        /// </summary>
-
-        public int? UseOrg { get; set; }
-
-        /// <summary>
         ///     鑷畾涔夊瓧娈�3
         /// </summary>
 
@@ -186,7 +172,6 @@
 
         public string Remark5 { get; set; }
 
-
         /// <summary>
         /// </summary>
 
@@ -198,10 +183,23 @@
         public string CheckBy { get; set; }
 
         /// <summary>
+        ///     榛樿鍊�: ((0))
         /// </summary>
 
         public bool? CheckStatus { get; set; }
 
+        /// <summary>
+        ///     鍒涘缓缁勭粐
+        /// </summary>
+
+        public string Fumbrella { get; set; }
+
+        /// <summary>
+        ///     浣跨敤缁勭粐
+        /// </summary>
+
+        public string FSubsidiary { get; set; }
+
 
         public List<MesDepotSections> list { get; set; }
     }
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 6f3ead3..5b03238 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -788,6 +788,17 @@
             return Guid.Parse(str);
         }
 
+        public static int ToInt(string str) {
+            try
+            {
+                return int.Parse(str);
+            }
+            catch (Exception)
+            {
+
+                return 0;
+            }
+        }
         /// <summary>
         /// 璇诲彇grid鐨勫綋鍓嶈
         /// </summary>
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index ba0b8a3..b2d40cb 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -822,11 +822,6 @@
         public event EventHandler btnBoHuiClick;
 
         /// <summary>
-        /// 鎵撳嵃
-        /// </summary>
-        public event EventHandler btnPrintClick;
-
-        /// <summary>
         /// 璁剧疆鎶ヨ〃
         /// </summary>
         public event EventHandler btnDesignClick;

--
Gitblit v1.9.3