From b5834262308402ea928355987b34d1a9a0011374 Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期一, 08 九月 2025 23:43:13 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs index 292d710..17e6df0 100644 --- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs @@ -10,7 +10,6 @@ using System.Threading.Tasks; using System.Windows.Forms; - namespace Gs.DevApp.DevFrm.Work { public partial class Frm_WorkTechnique : DevExpress.XtraEditors.XtraForm @@ -42,7 +41,6 @@ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) => { - }); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; @@ -172,7 +170,12 @@ private void getPageList(int curPage) { gcMain1.DataSource = null; - gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + gcMain1.DataSource = null; + System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); + _sbSqlWhere.Append(" and a.FSubsidiary in"); + _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere()); + _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); + var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.item_no asc", "", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); @@ -374,7 +377,6 @@ return; } getModel(rowGuid); - } /// <summary> @@ -465,7 +467,7 @@ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝璇ユ搷浣滃皢浼氬奖鍝嶅埌銆怐:寰呭紑宸ャ�戜笖銆愭湭閫氱煡澶囨枡銆戠殑宸ュ崟锛岀‘瀹�" + strMsg + "鍚楋紵")) return; var _obj = new { -- Gitblit v1.9.3