From 9f5f4cf65c0dc2f63777c3a1e55fbc058a8f3233 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 29 八月 2025 16:52:00 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs |   48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index d961773..b1cbc5c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -29,6 +29,8 @@
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+            toolBarMenu1.btnShouHouChkClick += ToolBarMenu1_btnShouHouChkClick;
+            toolBarMenu1.btnShouHouFchkClick += ToolBarMenu1_btnShouHouFchkClick;
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
@@ -418,7 +420,11 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain1.DataSource = null;
+            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+            _sbSqlWhere.Append(" and a.FAPPORGID in");
+            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
             PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
@@ -529,7 +535,27 @@
         {
             _toolCk(0);
         }
+        /// <summary>
+        /// 鍞悗瀹℃牳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnShouHouChkClick(object sender, EventArgs e)
+        {
+            _toolCk(20);
+        }
 
+        /// <summary>
+        /// 鍞悗鍙嶅鏍�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnShouHouFchkClick(object sender, EventArgs e)
+        {
+            _toolCk(21);
+        }
         /// <summary>
         /// 宸ュ叿鏉′簨浠�
         /// </summary>
@@ -544,6 +570,12 @@
                     break;
                 case 0:
                     strMsg = "鍙嶅鏍�";
+                    break;
+                case 20:
+                    strMsg = "鍞悗瀹℃牳";
+                    break;
+                case 21:
+                    strMsg = "鍞悗鍙嶅鏍�";
                     break;
             }
             ;
@@ -574,10 +606,18 @@
                     if (xtraTabControl1.SelectedTabPageIndex == 1)
                     {
                         getModel(lbGuid.Text.Trim());
+                        int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                        gridView1.FocusedRowHandle = rowHandle;
+                        if (_inFieldValue <= 1) 
+                        UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
                     }
-                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
-                    gridView1.FocusedRowHandle = rowHandle;
-                    UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
+                    else
+                    {
+                        //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+                        getPageList(this.pageBar1.CurrentPage);
+                        int rowHandle = gridView1.LocateByValue("guid", rowGuid);
+                        gridView1.FocusedRowHandle = rowHandle;
+                    }
                 }
                 else
                     MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());

--
Gitblit v1.9.3