From 76281d909e76379c640c068b04119a4d227c1242 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 16 一月 2025 16:37:07 +0800
Subject: [PATCH] 细节

---
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs                 |   51 +++++++---
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs        |   18 +-
 DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs                              |    1 
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs      |   14 +-
 DevApp/Gs.DevApp/App.config                                       |    4 
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs                 |    1 
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs          |    3 
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs                 |    1 
 DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs                      |    2 
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs        |  129 +++++++++++++------------
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs               |    3 
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs        |    4 
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs |   19 ++-
 13 files changed, 138 insertions(+), 112 deletions(-)

diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index a645fe4..48985a7 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
 		</assemblyBinding>
 	</runtime>
     <appSettings>
-		 <add key="WebApiUrl" value="http://localhost:5263/" />
-		<!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> 
+		 <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+		<add key="WebApiUrl" value="http://192.168.1.145:81/" /> 
         <add key="LogPath" value="logs" />
         <add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
         <add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
index 40d7a8c..cae804e 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
@@ -331,7 +331,7 @@
             this.gv_custName.AppearanceCell.Options.UseFont = true;
             this.gv_custName.Caption = "瀹㈡埛鍚嶇О ";
             this.gv_custName.FieldName = "custName";
-            this.gv_custName.MinWidth = 200;
+            this.gv_custName.MinWidth = 50;
             this.gv_custName.Name = "gv_custName";
             this.gv_custName.OptionsColumn.AllowEdit = false;
             this.gv_custName.Tag = "query_a.cust_name";
@@ -444,7 +444,7 @@
             // 
             this.gv_org.Caption = "浣跨敤缁勭粐";
             this.gv_org.FieldName = "fSubsidiary";
-            this.gv_org.MinWidth = 250;
+            this.gv_org.MinWidth = 50;
             this.gv_org.Name = "gv_org";
             this.gv_org.Tag = "org.fnamber";
             this.gv_org.Visible = true;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
index cb4ead1..758c7e1 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
@@ -119,6 +119,7 @@
                     {
                         gcMain.DataSource = dt;
                         gcMain.ForceInitialize();
+                        gridView1.BestFitColumns();
                     }
                     else
                         UtilityHelper.SetDefaultTable(gcMain, gridView1);
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
index f95ff2a..c355a45 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -97,7 +97,7 @@
             this.gv_parentId.AppearanceCell.Options.UseFont = true;
             this.gv_parentId.Caption = "涓婄骇閮ㄩ棬";
             this.gv_parentId.FieldName = "fParentID";
-            this.gv_parentId.MinWidth = 150;
+            this.gv_parentId.MinWidth = 50;
             this.gv_parentId.Name = "gv_parentId";
             this.gv_parentId.OptionsColumn.AllowEdit = false;
             this.gv_parentId.OptionsFilter.ImmediateUpdateAutoFilter = false;
@@ -165,7 +165,7 @@
             this.gv_factory.AppearanceCell.Options.UseFont = true;
             this.gv_factory.Caption = "浣跨敤缁勭粐";
             this.gv_factory.FieldName = "fSubsidiary";
-            this.gv_factory.MinWidth = 250;
+            this.gv_factory.MinWidth = 50;
             this.gv_factory.Name = "gv_factory";
             this.gv_factory.OptionsColumn.AllowEdit = false;
             this.gv_factory.OptionsFilter.AllowFilterModeChanging = DevExpress.Utils.DefaultBoolean.False;
@@ -287,7 +287,7 @@
             this.gv_depextr2.AppearanceCell.Options.UseFont = true;
             this.gv_depextr2.Caption = "閮ㄩ棬鍒嗙粍";
             this.gv_depextr2.FieldName = "depextr2";
-            this.gv_depextr2.MinWidth = 100;
+            this.gv_depextr2.MinWidth = 50;
             this.gv_depextr2.Name = "gv_depextr2";
             this.gv_depextr2.OptionsColumn.AllowEdit = false;
             this.gv_depextr2.OptionsFilter.ImmediateUpdateAutoFilter = false;
@@ -321,7 +321,7 @@
             this.gv_depextr1.AppearanceCell.Options.UseFont = true;
             this.gv_depextr1.Caption = "閮ㄩ棬灞炴��";
             this.gv_depextr1.FieldName = "depextr1";
-            this.gv_depextr1.MinWidth = 100;
+            this.gv_depextr1.MinWidth = 50;
             this.gv_depextr1.Name = "gv_depextr1";
             this.gv_depextr1.OptionsColumn.AllowEdit = false;
             this.gv_depextr1.OptionsFilter.ImmediateUpdateAutoFilter = false;
@@ -355,7 +355,7 @@
             this.gv_departmentname.AppearanceCell.Options.UseFont = true;
             this.gv_departmentname.Caption = "閮ㄩ棬鍚嶇О";
             this.gv_departmentname.FieldName = "departmentname";
-            this.gv_departmentname.MinWidth = 150;
+            this.gv_departmentname.MinWidth = 50;
             this.gv_departmentname.Name = "gv_departmentname";
             this.gv_departmentname.OptionsColumn.AllowEdit = false;
             this.gv_departmentname.OptionsFilter.ImmediateUpdateAutoFilter = false;
@@ -389,7 +389,7 @@
             this.gv_departmentcode.AppearanceCell.Options.UseFont = true;
             this.gv_departmentcode.Caption = "閮ㄩ棬缂栧彿";
             this.gv_departmentcode.FieldName = "departmentcode";
-            this.gv_departmentcode.MinWidth = 80;
+            this.gv_departmentcode.MinWidth = 50;
             this.gv_departmentcode.Name = "gv_departmentcode";
             this.gv_departmentcode.OptionsColumn.AllowEdit = false;
             this.gv_departmentcode.OptionsFilter.ImmediateUpdateAutoFilter = false;
@@ -491,7 +491,7 @@
             // 
             this.gridColumn1.Caption = "鍚屾鏃堕棿";
             this.gridColumn1.FieldName = "lastupdateDate";
-            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.MinWidth = 50;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Tag = "query_a.lastupdate_date";
             this.gridColumn1.Visible = true;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
index e78a44b..c4c7e2f 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
@@ -34,7 +34,6 @@
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
         }
-
         private   void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
             Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -108,7 +107,7 @@
         private   void getPageList(int curPage)
         {
             var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date",
+            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc,a.departmentcode",
             "asc", "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
             try
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
index 8d8221d..b8178b3 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -29,11 +29,11 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
             this.gvMx1lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1description = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -244,10 +244,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -256,55 +256,56 @@
             // 
             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(23, 85);
+            this.lb_isFkc.Location = new System.Drawing.Point(27, 85);
             this.lb_isFkc.Name = "lb_isFkc";
-            this.lb_isFkc.Size = new System.Drawing.Size(90, 21);
+            this.lb_isFkc.Size = new System.Drawing.Size(85, 21);
             this.lb_isFkc.TabIndex = 291;
-            this.lb_isFkc.Text = "鍏佽璐熷簱瀛� ";
+            this.lb_isFkc.Text = "鍏佽璐熷簱瀛�";
             // 
             // txt_isFkc
             // 
-            this.txt_isFkc.Enabled = false;
             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;
             this.txt_isFkc.Size = new System.Drawing.Size(150, 28);
             this.txt_isFkc.TabIndex = 291;
+            this.txt_isFkc.Tag = "readonly";
             // 
             // gv_isFkc
             // 
             this.gv_isFkc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_isFkc.AppearanceCell.Options.UseFont = true;
-            this.gv_isFkc.Caption = "鍏佽鍗虫椂搴撳瓨璐熷簱瀛�";
+            this.gv_isFkc.Caption = "鍏佽璐熷簱瀛�";
             this.gv_isFkc.FieldName = "isFkc";
-            this.gv_isFkc.MinWidth = 70;
+            this.gv_isFkc.MaxWidth = 60;
+            this.gv_isFkc.MinWidth = 60;
             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 = 7;
-            this.gv_isFkc.Width = 70;
+            this.gv_isFkc.Width = 60;
             // 
             // 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(571, 52);
+            this.lb_zuid.Location = new System.Drawing.Point(568, 52);
             this.lb_zuid.Name = "lb_zuid";
-            this.lb_zuid.Size = new System.Drawing.Size(39, 21);
+            this.lb_zuid.Size = new System.Drawing.Size(34, 21);
             this.lb_zuid.TabIndex = 285;
-            this.lb_zuid.Text = "鍒嗙粍 ";
+            this.lb_zuid.Text = "鍒嗙粍";
             // 
             // txt_zuid
             // 
-            this.txt_zuid.Enabled = false;
-            this.txt_zuid.Location = new System.Drawing.Point(617, 48);
+            this.txt_zuid.Location = new System.Drawing.Point(607, 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(119, 28);
             this.txt_zuid.TabIndex = 285;
+            this.txt_zuid.Tag = "readonly";
             // 
             // gv_zuid
             // 
@@ -324,7 +325,7 @@
             // 
             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(284, 88);
+            this.lb_isNg.Location = new System.Drawing.Point(283, 85);
             this.lb_isNg.Name = "lb_isNg";
             this.lb_isNg.Size = new System.Drawing.Size(107, 21);
             this.lb_isNg.TabIndex = 267;
@@ -332,27 +333,28 @@
             // 
             // txt_isNg
             // 
-            this.txt_isNg.Enabled = false;
-            this.txt_isNg.Location = new System.Drawing.Point(397, 84);
+            this.txt_isNg.Location = new System.Drawing.Point(394, 81);
             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(35, 28);
             this.txt_isNg.TabIndex = 267;
+            this.txt_isNg.Tag = "readonly";
             // 
             // gv_isNg
             // 
             this.gv_isNg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_isNg.AppearanceCell.Options.UseFont = true;
-            this.gv_isNg.Caption = "鏄惁涓嶈壇鍝佷粨";
+            this.gv_isNg.Caption = "涓嶈壇鍝佷粨";
             this.gv_isNg.FieldName = "isNg";
-            this.gv_isNg.MinWidth = 70;
+            this.gv_isNg.MaxWidth = 50;
+            this.gv_isNg.MinWidth = 50;
             this.gv_isNg.Name = "gv_isNg";
             this.gv_isNg.OptionsColumn.AllowEdit = false;
             this.gv_isNg.Tag = "query_a.is_ng";
             this.gv_isNg.Visible = true;
             this.gv_isNg.VisibleIndex = 5;
-            this.gv_isNg.Width = 70;
+            this.gv_isNg.Width = 50;
             // 
             // lb_depottype
             // 
@@ -360,19 +362,19 @@
             this.lb_depottype.Appearance.Options.UseFont = true;
             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.Size = new System.Drawing.Size(68, 21);
             this.lb_depottype.TabIndex = 231;
-            this.lb_depottype.Text = "浠撳簱绫诲瀷 ";
+            this.lb_depottype.Text = "浠撳簱绫诲瀷";
             // 
             // txt_depottype
             // 
-            this.txt_depottype.Enabled = false;
-            this.txt_depottype.Location = new System.Drawing.Point(361, 48);
+            this.txt_depottype.Location = new System.Drawing.Point(358, 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;
             this.txt_depottype.Size = new System.Drawing.Size(150, 28);
             this.txt_depottype.TabIndex = 231;
+            this.txt_depottype.Tag = "readonly";
             // 
             // gv_depottype
             // 
@@ -380,7 +382,7 @@
             this.gv_depottype.AppearanceCell.Options.UseFont = true;
             this.gv_depottype.Caption = "浠撳簱绫诲瀷";
             this.gv_depottype.FieldName = "depottype";
-            this.gv_depottype.MinWidth = 80;
+            this.gv_depottype.MinWidth = 50;
             this.gv_depottype.Name = "gv_depottype";
             this.gv_depottype.OptionsColumn.AllowEdit = false;
             this.gv_depottype.Tag = "query_a.depottype";
@@ -392,61 +394,61 @@
             // 
             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(756, 52);
+            this.lb_lastupdateDate.Location = new System.Drawing.Point(741, 52);
             this.lb_lastupdateDate.Name = "lb_lastupdateDate";
-            this.lb_lastupdateDate.Size = new System.Drawing.Size(107, 21);
+            this.lb_lastupdateDate.Size = new System.Drawing.Size(102, 21);
             this.lb_lastupdateDate.TabIndex = 228;
-            this.lb_lastupdateDate.Text = "鏈�鍚庢洿鏂版椂闂� ";
+            this.lb_lastupdateDate.Text = "鏈�鍚庢洿鏂版椂闂�";
             // 
             // txt_lastupdateDate
             // 
-            this.txt_lastupdateDate.Enabled = false;
-            this.txt_lastupdateDate.Location = new System.Drawing.Point(869, 48);
+            this.txt_lastupdateDate.Location = new System.Drawing.Point(847, 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(192, 28);
             this.txt_lastupdateDate.TabIndex = 228;
+            this.txt_lastupdateDate.Tag = "readonly";
             // 
             // 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(790, 18);
+            this.lb_createDate.Location = new System.Drawing.Point(775, 18);
             this.lb_createDate.Name = "lb_createDate";
-            this.lb_createDate.Size = new System.Drawing.Size(73, 21);
+            this.lb_createDate.Size = new System.Drawing.Size(68, 21);
             this.lb_createDate.TabIndex = 222;
-            this.lb_createDate.Text = "鍒涘缓鏃堕棿 ";
+            this.lb_createDate.Text = "鍒涘缓鏃堕棿";
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Enabled = false;
-            this.txt_createDate.Location = new System.Drawing.Point(869, 14);
+            this.txt_createDate.Location = new System.Drawing.Point(847, 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(192, 28);
             this.txt_createDate.TabIndex = 222;
+            this.txt_createDate.Tag = "readonly";
             // 
             // 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(520, 18);
+            this.lb_createBy.Location = new System.Drawing.Point(517, 18);
             this.lb_createBy.Name = "lb_createBy";
-            this.lb_createBy.Size = new System.Drawing.Size(90, 21);
+            this.lb_createBy.Size = new System.Drawing.Size(85, 21);
             this.lb_createBy.TabIndex = 219;
-            this.lb_createBy.Text = "浠撳簱璐熻矗浜� ";
+            this.lb_createBy.Text = "浠撳簱璐熻矗浜�";
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Enabled = false;
-            this.txt_createBy.Location = new System.Drawing.Point(617, 14);
+            this.txt_createBy.Location = new System.Drawing.Point(607, 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(119, 28);
             this.txt_createBy.TabIndex = 219;
+            this.txt_createBy.Tag = "readonly";
             // 
             // gv_createBy
             // 
@@ -466,21 +468,21 @@
             // 
             this.lb_description.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_description.Appearance.Options.UseFont = true;
-            this.lb_description.Location = new System.Drawing.Point(74, 52);
+            this.lb_description.Location = new System.Drawing.Point(78, 52);
             this.lb_description.Name = "lb_description";
-            this.lb_description.Size = new System.Drawing.Size(39, 21);
+            this.lb_description.Size = new System.Drawing.Size(34, 21);
             this.lb_description.TabIndex = 217;
-            this.lb_description.Text = "澶囨敞 ";
+            this.lb_description.Text = "澶囨敞";
             // 
             // 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);
             this.txt_description.Properties.Appearance.Options.UseFont = true;
             this.txt_description.Size = new System.Drawing.Size(150, 28);
             this.txt_description.TabIndex = 217;
+            this.txt_description.Tag = "readonly";
             // 
             // lb_depotName
             // 
@@ -488,19 +490,19 @@
             this.lb_depotName.Appearance.Options.UseFont = true;
             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.Size = new System.Drawing.Size(68, 21);
             this.lb_depotName.TabIndex = 216;
-            this.lb_depotName.Text = "浠撳簱鍚嶇О ";
+            this.lb_depotName.Text = "浠撳簱鍚嶇О";
             // 
             // txt_depotName
             // 
-            this.txt_depotName.Enabled = false;
-            this.txt_depotName.Location = new System.Drawing.Point(361, 14);
+            this.txt_depotName.Location = new System.Drawing.Point(358, 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;
             this.txt_depotName.Size = new System.Drawing.Size(150, 28);
             this.txt_depotName.TabIndex = 216;
+            this.txt_depotName.Tag = "readonly";
             // 
             // gv_depotName
             // 
@@ -508,7 +510,7 @@
             this.gv_depotName.AppearanceCell.Options.UseFont = true;
             this.gv_depotName.Caption = "浠撳簱鍚嶇О";
             this.gv_depotName.FieldName = "depotName";
-            this.gv_depotName.MinWidth = 150;
+            this.gv_depotName.MinWidth = 50;
             this.gv_depotName.Name = "gv_depotName";
             this.gv_depotName.OptionsColumn.AllowEdit = false;
             this.gv_depotName.Tag = "query_a.depot_name";
@@ -520,21 +522,21 @@
             // 
             this.lb_depotCode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_depotCode.Appearance.Options.UseFont = true;
-            this.lb_depotCode.Location = new System.Drawing.Point(40, 18);
+            this.lb_depotCode.Location = new System.Drawing.Point(44, 18);
             this.lb_depotCode.Name = "lb_depotCode";
-            this.lb_depotCode.Size = new System.Drawing.Size(73, 21);
+            this.lb_depotCode.Size = new System.Drawing.Size(68, 21);
             this.lb_depotCode.TabIndex = 213;
-            this.lb_depotCode.Text = "浠撳簱缂栫爜 ";
+            this.lb_depotCode.Text = "浠撳簱缂栫爜";
             // 
             // 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);
             this.txt_depotCode.Properties.Appearance.Options.UseFont = true;
             this.txt_depotCode.Size = new System.Drawing.Size(150, 28);
             this.txt_depotCode.TabIndex = 213;
+            this.txt_depotCode.Tag = "readonly";
             // 
             // gv_depotCode
             // 
@@ -542,7 +544,7 @@
             this.gv_depotCode.AppearanceCell.Options.UseFont = true;
             this.gv_depotCode.Caption = "浠撳簱缂栫爜";
             this.gv_depotCode.FieldName = "depotCode";
-            this.gv_depotCode.MinWidth = 100;
+            this.gv_depotCode.MinWidth = 50;
             this.gv_depotCode.Name = "gv_depotCode";
             this.gv_depotCode.OptionsColumn.AllowEdit = false;
             this.gv_depotCode.Tag = "query_a.depot_code";
@@ -610,7 +612,7 @@
             // 
             this.gridColumn1.Caption = "浣跨敤缁勭粐";
             this.gridColumn1.FieldName = "fSubsidiary";
-            this.gridColumn1.MinWidth = 250;
+            this.gridColumn1.MinWidth = 50;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.OptionsColumn.AllowEdit = false;
             this.gridColumn1.Tag = "org.FNumber";
@@ -622,12 +624,13 @@
             // 
             this.gridColumn2.Caption = "绂佺敤鐘舵��";
             this.gridColumn2.FieldName = "isNg";
+            this.gridColumn2.MaxWidth = 50;
             this.gridColumn2.MinWidth = 50;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Tag = "query_a.zuid";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 8;
-            this.gridColumn2.Width = 52;
+            this.gridColumn2.Width = 50;
             // 
             // gridColumn6
             // 
@@ -677,7 +680,7 @@
             // 
             this.gridColumn3.Caption = "鍚屾鏃堕棿";
             this.gridColumn3.FieldName = "lastupdateDate";
-            this.gridColumn3.MinWidth = 180;
+            this.gridColumn3.MinWidth = 50;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Tag = "query_a.lastupdate_date";
             this.gridColumn3.Visible = true;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
index 11d9860..e4e193a 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -28,8 +28,6 @@
             toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
             toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
             toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-            //toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
-            //toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
             {
@@ -199,17 +197,25 @@
             for (var i = 0; i < gvMx1.DataRowCount; i++)
             {
                 var row = gvMx1.GetDataRow(i);
-                if (row != null)
+                if (row != null) {
+                    if (string.IsNullOrEmpty(row["depotSectionCode"].ToString()))
+                    {
+                        MsgHelper.ShowError("缂栫爜涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["DepotSectionName"].ToString()))
+                    {
+                        MsgHelper.ShowError("鍚嶇О涓嶈兘涓虹┖锛�");
+                        return;
+                    }
                     lst.Add(new MesDepotSections
                     {
                         Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
                         DepotSectionCode = row["depotSectionCode"].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.ToBoole(row["completenessFlag"].ToString()),
                     });
+                }
             }
             var _obj = new MesDepots
             {
@@ -249,7 +255,7 @@
         private void getPageList(int curPage)
         {
             var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.depot_code", "asc",
+            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.depot_code", "asc",
                 "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
             try
@@ -257,14 +263,28 @@
                 var strReturn = UtilityHelper.HttpPost("",
                     _webServiceName + "GetListPage", json);
                 var dd = UtilityHelper.ReturnToTablePage(strReturn);
-                var dt = dd.rtnData.list;
-                gcMain.BindingContext = new BindingContext();
-                gcMain.DataSource = dt;
-                gcMain.ForceInitialize();
-                var dddd = dd.rtnData.pages; //鎬婚〉
-                pageBar1.TotalPages = dddd;
-                pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
-                pageBar1.CurrentPage = curPage; //褰撳墠椤�
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain.BindingContext = new BindingContext();
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain.DataSource = dt;
+                        gcMain.ForceInitialize();
+                        gridView1.BestFitColumns();
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
             }
             catch (Exception ex)
             {
@@ -311,6 +331,7 @@
                         gcMx1.BindingContext = new BindingContext();
                         gcMx1.DataSource = dt;
                         gcMx1.ForceInitialize();
+                        gvMx1.BestFitColumns();
                     }
                     else
                     {
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
index a5cbafb..79811b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
@@ -142,13 +142,13 @@
             // 
             // txt_lastupdateDate
             // 
-            this.txt_lastupdateDate.Enabled = false;
             this.txt_lastupdateDate.Location = new System.Drawing.Point(405, 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(164, 28);
             this.txt_lastupdateDate.TabIndex = 231;
+            this.txt_lastupdateDate.Tag = "readonly";
             // 
             // gv_lastupdateDate
             // 
@@ -176,13 +176,13 @@
             // 
             // txt_lastupdateBy
             // 
-            this.txt_lastupdateBy.Enabled = false;
             this.txt_lastupdateBy.Location = new System.Drawing.Point(405, 16);
             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.Size = new System.Drawing.Size(164, 28);
             this.txt_lastupdateBy.TabIndex = 228;
+            this.txt_lastupdateBy.Tag = "readonly";
             // 
             // gv_lastupdateBy
             // 
@@ -289,7 +289,7 @@
             this.gv_name.OptionsColumn.AllowEdit = false;
             this.gv_name.Tag = "query_a.name";
             this.gv_name.Visible = true;
-            this.gv_name.VisibleIndex = 2;
+            this.gv_name.VisibleIndex = 3;
             this.gv_name.Width = 100;
             // 
             // lb_lineNo
@@ -310,6 +310,7 @@
             this.txt_lineNo.Properties.Appearance.Options.UseFont = true;
             this.txt_lineNo.Size = new System.Drawing.Size(220, 28);
             this.txt_lineNo.TabIndex = 216;
+            this.txt_lineNo.Tag = "";
             // 
             // gv_lineNo
             // 
@@ -322,7 +323,7 @@
             this.gv_lineNo.OptionsColumn.AllowEdit = false;
             this.gv_lineNo.Tag = "query_a.line_no";
             this.gv_lineNo.Visible = true;
-            this.gv_lineNo.VisibleIndex = 1;
+            this.gv_lineNo.VisibleIndex = 2;
             this.gv_lineNo.Width = 82;
             // 
             // gv_org
@@ -385,9 +386,9 @@
             this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gv_org,
+            this.gridColumn1,
             this.gv_lineNo,
             this.gv_name,
-            this.gridColumn1,
             this.gv_remark,
             this.gv_createBy,
             this.gv_createDate,
@@ -410,7 +411,7 @@
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Tag = "query_a.departName";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 3;
+            this.gridColumn1.VisibleIndex = 1;
             this.gridColumn1.Width = 94;
             // 
             // xtraTabControl1
@@ -497,7 +498,7 @@
             "鎵嬪伐绾�",
             "鑷姩绾�"});
             this.txt_lineType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_lineType.Size = new System.Drawing.Size(150, 24);
+            this.txt_lineType.Size = new System.Drawing.Size(164, 24);
             this.txt_lineType.TabIndex = 245;
             // 
             // txt_dptId
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
index 0e2e597..c560b9c 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
@@ -247,7 +247,7 @@
         private void getPageList(int curPage)
         {
             var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date",
+            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,c.departmentcode asc,a.line_no",
             "asc", "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
             try
@@ -264,6 +264,7 @@
                     {
                         gcMain.DataSource = dt;
                         gcMain.ForceInitialize();
+                        gridView1.BestFitColumns();
                     }
                     else
                         UtilityHelper.SetDefaultTable(gcMain, gridView1);
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
index fad6bbd..5d65def 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -155,7 +155,7 @@
             this.gv_fstaffid.AppearanceCell.Options.UseFont = true;
             this.gv_fstaffid.Caption = "璐熻矗浜�";
             this.gv_fstaffid.FieldName = "fstaffid";
-            this.gv_fstaffid.MinWidth = 100;
+            this.gv_fstaffid.MinWidth = 50;
             this.gv_fstaffid.Name = "gv_fstaffid";
             this.gv_fstaffid.OptionsColumn.AllowEdit = false;
             this.gv_fstaffid.Tag = "query_a.fstaffid";
@@ -188,7 +188,7 @@
             this.gv_lxr.AppearanceCell.Options.UseFont = true;
             this.gv_lxr.Caption = "鑱旂郴浜�";
             this.gv_lxr.FieldName = "lxr";
-            this.gv_lxr.MinWidth = 70;
+            this.gv_lxr.MinWidth = 50;
             this.gv_lxr.Name = "gv_lxr";
             this.gv_lxr.OptionsColumn.AllowEdit = false;
             this.gv_lxr.Tag = "query_a.lxr";
@@ -221,7 +221,7 @@
             this.gv_remark.AppearanceCell.Options.UseFont = true;
             this.gv_remark.Caption = "澶囨敞";
             this.gv_remark.FieldName = "remark";
-            this.gv_remark.MinWidth = 100;
+            this.gv_remark.MinWidth = 50;
             this.gv_remark.Name = "gv_remark";
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.remark";
@@ -235,7 +235,7 @@
             this.gv_createDate.AppearanceCell.Options.UseFont = true;
             this.gv_createDate.Caption = "鍚屾鏃堕棿";
             this.gv_createDate.FieldName = "lastupdateDate";
-            this.gv_createDate.MinWidth = 180;
+            this.gv_createDate.MinWidth = 50;
             this.gv_createDate.Name = "gv_createDate";
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.create_date";
@@ -287,7 +287,7 @@
             this.gv_telf1.AppearanceCell.Options.UseFont = true;
             this.gv_telf1.Caption = "鐢佃瘽";
             this.gv_telf1.FieldName = "telf1";
-            this.gv_telf1.MinWidth = 100;
+            this.gv_telf1.MinWidth = 50;
             this.gv_telf1.Name = "gv_telf1";
             this.gv_telf1.OptionsColumn.AllowEdit = false;
             this.gv_telf1.Tag = "query_a.telf1";
@@ -368,7 +368,7 @@
             this.gv_suppName.AppearanceCell.Options.UseFont = true;
             this.gv_suppName.Caption = "渚涘簲鍟嗗悕绉�";
             this.gv_suppName.FieldName = "suppName";
-            this.gv_suppName.MinWidth = 220;
+            this.gv_suppName.MinWidth = 50;
             this.gv_suppName.Name = "gv_suppName";
             this.gv_suppName.OptionsColumn.AllowEdit = false;
             this.gv_suppName.Tag = "query_a.supp_name";
@@ -401,7 +401,7 @@
             this.gv_suppNo.AppearanceCell.Options.UseFont = true;
             this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
             this.gv_suppNo.FieldName = "suppNo";
-            this.gv_suppNo.MinWidth = 100;
+            this.gv_suppNo.MinWidth = 50;
             this.gv_suppNo.Name = "gv_suppNo";
             this.gv_suppNo.OptionsColumn.AllowEdit = false;
             this.gv_suppNo.Tag = "query_a.supp_no";
@@ -484,7 +484,7 @@
             // 
             this.gridColumn2.Caption = "浣跨敤缁勭粐ID鍚嶇О";
             this.gridColumn2.FieldName = "fSubsidiary";
-            this.gridColumn2.MinWidth = 250;
+            this.gridColumn2.MinWidth = 50;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.OptionsColumn.AllowEdit = false;
             this.gridColumn2.Tag = "org.FNumber";
@@ -496,7 +496,7 @@
             // 
             this.gridColumn1.Caption = "渚涘簲鍟嗙畝绉�";
             this.gridColumn1.FieldName = "suppSname";
-            this.gridColumn1.MinWidth = 100;
+            this.gridColumn1.MinWidth = 50;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.OptionsColumn.AllowEdit = false;
             this.gridColumn1.Tag = "a.supp_sname";
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
index e4c8da2..b8e9abe 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
@@ -125,6 +125,7 @@
                     {
                         gcMain.DataSource = dt;
                         gcMain.ForceInitialize();
+                        gridView1.BestFitColumns();
                     }
                     else
                         UtilityHelper.SetDefaultTable(gcMain, gridView1);
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
index 12cd36e..e9b3eb2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
@@ -236,7 +236,7 @@
         private  void getPageList(int curPage)
         {
             var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            _sbSqlWhere += " and c.GUID is not null";
+            _sbSqlWhere += " and c.GUID is not null  and b.guid is not null";
             var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "c.ACCOUNT",
             "asc", "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
index c47944b..ff48c77 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
@@ -28,7 +28,6 @@
             strType = _strType;
             txt_bl017.Text = _strType;
             // txt_bl017.Tag = "moren." + _strType;
-
         }
         protected override void OnCreateControl()
         {

--
Gitblit v1.9.3