From 5286b614c84f8f82f81772cdb32c2dc5a0d26e0f Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 28 十一月 2025 16:59:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WorkM/流转卡管理/Sc_ProcessExchangeBillList.cs |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillList.cs"
index f57b907..0facf55 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillList.cs"
@@ -491,6 +491,8 @@
                 //
                 Sub_SetReport(oFrm.sOpenTmp);
                 Report.Print(true);
+                // 寮规鍏抽棴鍚庢墽琛屾煡璇�
+                Sub_FastQuery();
             }
         }
 
@@ -507,6 +509,8 @@
                 //
                 Sub_SetReport(oFrm.sOpenTmp);
                 Report.PrintPreview(true);
+                // 寮规鍏抽棴鍚庢墽琛屾煡璇�
+                Sub_FastQuery();
             }
         }
 
@@ -516,6 +520,17 @@
             //
             Report = new GridppReport();
             Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf");  //here .
+            if (sOpenTmp=="宸ュ簭娴佽浆鍗″皬鏍囩")
+            {
+                ClsCN SubCn = new ClsCN();
+                DataSet DSet;
+                string sSql = "";
+                Int64 lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
+                sSql = "Select top 1 * from " + ViewName + " Where 1=1 and  hmainid =" + lngBillKey+ " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + " order by 鍗曟嵁鍙� desc,hsubid  ";
+                DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
+                //缁戝畾
+                grdMain.DataSource = DSet.Tables[0].DefaultView;
+            }
             Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
         }
 

--
Gitblit v1.9.1