From 2057778ce796422f1dab4ec011ca66eb1faf66cf Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 13 七月 2025 10:00:15 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
index 5b7a885..3e7f0be 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
@@ -1,12 +1,10 @@
-锘縰sing System;
-using System.Data;
-using System.IO;
-using DevExpress.Utils.VisualEffects;
-using DevExpress.XtraEditors;
-using FastReport;
+锘縰sing DevExpress.XtraEditors;
 using Gs.DevApp.ToolBox;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System;
+using System.Data;
+using System.IO;
 
 namespace Gs.DevApp.DevFrm.Rpt
 {
@@ -43,7 +41,7 @@
                 if (int.Parse(rtnCode) > 0)
                 {
                     //妯℃澘
-                    var report = new Report();
+                    var report = new FastReport.Report();
                     var buffer = (byte[])_job["rtnData"]["reportTemplateData"];
                     using (var Stream = new MemoryStream(buffer))
                     {
@@ -52,17 +50,17 @@
                     //涓昏〃
                     var array = new JArray();
                     foreach (var a in _job["rtnData"]["zb"]) array.Add(a);
-                    var _zb =JsonConvert.DeserializeObject<DataTable>(array.ToString());
+                    var _zb = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                     _zb.TableName = "zb";
                     //鏄庣粏琛�1
                     var array1 = new JArray();
                     foreach (var a in _job["rtnData"]["mx1"]) array1.Add(a);
-                    var _mx1 =JsonConvert.DeserializeObject<DataTable>( array1.ToString());
+                    var _mx1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
                     _mx1.TableName = "mx1";
                     //鏄庣粏琛�2
                     var array2 = new JArray();
-                    foreach (var a in _job["rtnData"]["mx2"]) array1.Add(a);
-                    var _mx2 =JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+                    foreach (var a in _job["rtnData"]["mx2"]) array2.Add(a);
+                    var _mx2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
                     _mx2.TableName = "mx2";
                     //鍔犲埌鏁版嵁闆嗕腑
                     var ds = new DataSet();

--
Gitblit v1.9.3