From 9872d678fc6703101d02f68b88b7519a0b6bc82c Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 05 十一月 2024 14:15:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
index 7c4b7a5..677d751 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -15,10 +15,17 @@
new List<FilterEntity>();
private readonly string _webServiceName = "MesRohInDataManager/";
-
- public SelectCgMx()
+ private string suppCode = "";
+ private string strWhere = "";
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鍙�
+ /// </summary>
+ /// <param name="supp_no"></param>
+ public SelectCgMx(string _suppCode, string _strWhere)
{
InitializeComponent();
+ this.suppCode = _suppCode;
+ this.strWhere = _strWhere;
pageBar1.PagerEvent += PageBar1_PagerEvent;
getPageList(1, UtilityHelper.GetPageSize());
gridView1.IndicatorWidth = 50;
@@ -40,7 +47,6 @@
list.Add(_guid);
}
}
-
UpdateParent?.Invoke(this,
new UpdateParentEventArgs { StringList = list });
Close();
@@ -69,10 +75,11 @@
private void getPageList(int curPage, int pageSize)
{
var _sbSqlWhere = new StringBuilder();
+ _sbSqlWhere.Append(strWhere);
foreach (var itm in _filterList)
_sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
itm.fileValue + "'");
- var pgq = new PageQueryModel(curPage, pageSize, "BILL_NO", "asc",
+ var pgq = new PageQueryModel(curPage, pageSize, "B.BILL_NO", "asc",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
--
Gitblit v1.9.3