From b7d9f2e23cbda587d814c7d07c1664c053c83dcb Mon Sep 17 00:00:00 2001 From: cdk <2441919651@qq.com> Date: 星期二, 12 八月 2025 13:58:07 +0800 Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient --- DevApp/Gs.DevApp/UserControl/UcLookCk.cs | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs index f410fb1..96bda08 100644 --- a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs +++ b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs @@ -35,12 +35,14 @@ /// </summary> /// <param name="orgId"></param> /// <param name="_dftVale"></param> - public void getSuppler(string orgId, string _dftVale = "") + public void getSuppler(string orgId, string _dftVale = "", string strWhere = "") { lookSearchSupplier.EditValue = null; string _keyWhere = ""; if (!string.IsNullOrEmpty(orgId)) - _keyWhere = " and a.FSubsidiary ='" + orgId + "'"; + _keyWhere = (_keyWhere + " and a.FSubsidiary ='" + orgId + "'"); + if (!string.IsNullOrEmpty(strWhere)) + _keyWhere = (_keyWhere + strWhere); var pgq = new PageQueryModel(1, 999999, "org.FNumber asc ,a.depot_code", "asc", "", " and is_ng='A'" + _keyWhere); var json = JsonConvert.SerializeObject(pgq); -- Gitblit v1.9.3