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 |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
index 24f7db5..677d751 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -15,14 +15,17 @@
             new List<FilterEntity>();
 
         private readonly string _webServiceName = "MesRohInDataManager/";
-
+        private string suppCode = "";
+        private string strWhere = "";
         /// <summary>
         /// 渚涘簲鍟嗙紪鍙�
         /// </summary>
         /// <param name="supp_no"></param>
-        public SelectCgMx(string supp_no)
+        public SelectCgMx(string _suppCode, string _strWhere)
         {
             InitializeComponent();
+            this.suppCode = _suppCode;
+            this.strWhere = _strWhere;
             pageBar1.PagerEvent += PageBar1_PagerEvent;
             getPageList(1, UtilityHelper.GetPageSize());
             gridView1.IndicatorWidth = 50;
@@ -72,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