From 34e30e2261a057fc9f46f67a3d216e3d9a9e67be Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 03 六月 2025 17:17:21 +0800
Subject: [PATCH] 上线梳理

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
index aabf5f7..c786b01 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
@@ -35,14 +35,14 @@
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isCheck", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
-            });
+            }, tips);
             Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
             {
                 getModel(value);
             }, (value) =>
             {
                 getPageList(this.pageBar1.CurrentPage);
-            });
+            }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
             //閫夋嫨搴撳瓨缁勭粐锛堜粨搴撳拰渚涘簲鍟嗭級
@@ -69,7 +69,13 @@
                     this.txt_fCustId.Focus();
                     return;
                 }
-                var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fIsLink.SelectedIndex.ToString());
+                if (string.IsNullOrEmpty(this.txt_fStockId.GetId()))
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浠撳簱锛�");
+                    this.txt_fStockId.Focus();
+                    return;
+                }
+                var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fStockId.GetId(), txt_fIsLink.SelectedIndex.ToString());
                 //璧嬪�肩粰鏄庣粏琛�
                 frm.UpdateParent += (ss, ee) =>
                 {
@@ -144,7 +150,7 @@
             gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
             gridView1.ActiveFilter.Clear();
             gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-            var frm = new ShowFilter(gridView1.Columns, _filterList);
+            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
             frm.UpdateParent += Frm_UpdateParent;
             frm.ShowDialog();
         }
@@ -309,7 +315,7 @@
             var _ckId = txt_fStockId.GetId();
             var _khId = txt_fCustId.GetId();
             string _orgId = txt_fStockOrgId.GetId();
-            int _fIsLink= txt_fIsLink.SelectedIndex==0?1:0;
+            int _fIsLink = txt_fIsLink.SelectedIndex == 0 ? 1 : 0;
             if (string.IsNullOrEmpty(_orgId))
             {
                 MsgHelper.Warning("璇烽�夋嫨缁勭粐锛�");
@@ -347,8 +353,8 @@
             }; gvMx1.PostEditor();
             gvMx1.CloseEditor();
             gvMx1.UpdateCurrentRow();
-            
-          
+
+
             if (gvMx1.DataRowCount <= 0)
             {
                 MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
@@ -366,7 +372,7 @@
                         MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
                         return;
                     }
-                    if (string.IsNullOrEmpty(row["fStockStatusId"].ToString()) || row["fStockStatusId"].ToString()=="璇烽�夋嫨")
+                    if (string.IsNullOrEmpty(row["fStockStatusId"].ToString()) || row["fStockStatusId"].ToString() == "璇烽�夋嫨")
                     {
                         MsgHelper.ShowError("璇烽�夋嫨搴撳瓨鐘舵�侊紒");
                         return;
@@ -398,6 +404,7 @@
                     gvList.Add(gvMx1);
                     UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
                     toolBarMenu1.currentAction = "";
+                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                 }
             }
             catch (Exception ex)
@@ -413,7 +420,7 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
             PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "BILL_NO", "asc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
@@ -429,7 +436,7 @@
                     {
                         gcMain1.DataSource = dt;
                         gcMain1.ForceInitialize();
-                        gridView1.BestFitColumns();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                     }
                     else
                         UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -561,6 +568,7 @@
         private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
             gvMx1.CloseEditor();
+            gvMx1.PostEditor();
             gvMx1.UpdateCurrentRow();
             var rowhandle = gvMx1.FocusedRowHandle;
             if (rowhandle < 0)

--
Gitblit v1.9.3