From b0046e84b9f95ce07dbbd117758da848ede67546 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 28 七月 2025 08:14:05 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index fe5d918..b7858e0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -14,7 +14,7 @@
 {
     public partial class Frm_SalesDeliver : DevExpress.XtraEditors.XtraForm
     {
-        string _webServiceName = "SalesDeliverManager/";
+        string _webServiceName = "SalesDeliverManager/"; 
         List<FilterEntity> _filterList = new List<FilterEntity>();
         public Frm_SalesDeliver()
         {
@@ -34,14 +34,14 @@
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (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;
             //璁剧疆閿�鍞崟
@@ -67,6 +67,7 @@
                     var rtn = UtilityHelper.ReturnToTablePage(strReturn);
                     var dt = rtn.rtnData.list;
                     this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+                    repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
                 }
                 catch (Exception ex)
                 {
@@ -76,7 +77,7 @@
         }
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
-            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
             Task.Delay(100);
             getPageList(1);
         }
@@ -99,7 +100,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();
         }
@@ -209,7 +210,7 @@
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
             if (xtraTabControl1.SelectedTabPageIndex == 1)
             {
-                getModel(lbGuid.Text.Trim());
+                getModel(rowGuid);
             }
             else
             {
@@ -265,6 +266,7 @@
                 list = new List<dynamic>(),
             };
             gvMx1.CloseEditor();
+            gvMx1.PostEditor();
             gvMx1.UpdateCurrentRow();
             if (gvMx1.DataRowCount <= 0)
             {
@@ -281,6 +283,11 @@
                     if (string.IsNullOrEmpty(_msl))
                     {
                         MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["YjfhDate"].ToString()))
+                    {
+                        MsgHelper.ShowError("棰勮鍙戣揣鏃堕棿涓嶈兘涓虹┖锛�");
                         return;
                     }
                     _obj.list.Add(new
@@ -307,6 +314,7 @@
                     gvList.Add(gvMx1);
                     UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
                     toolBarMenu1.currentAction = "";
+                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                 }
             }
             catch (Exception ex)
@@ -334,7 +342,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, "create_date", "asc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
@@ -350,7 +358,7 @@
                     {
                         gcMain1.DataSource = dt;
                         gcMain1.ForceInitialize();
-                        gridView1.BestFitColumns();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                     }
                     else
                         UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -408,6 +416,7 @@
                         gcMx1.DataSource = dt;
                         gcMx1.ForceInitialize();
                         gvMx1.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                     }
                     else
                     {
@@ -524,6 +533,7 @@
             gvMx1.SetFocusedRowCellValue("gyOrg", SelectedDataRow["gyOrg"].ToString());
             gvMx1.SetFocusedRowCellValue("kcOrg", SelectedDataRow["kcOrg"].ToString());
             gvMx1.CloseEditor();
+            gvMx1.PostEditor();
             gvMx1.UpdateCurrentRow();
         }
 

--
Gitblit v1.9.3