From cc50730523fb08599949109a59ad64983f7415eb Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 18 四月 2025 09:38:39 +0800
Subject: [PATCH] 采购退货
---
DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs | 67 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
index a35b756..3e7f0be 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
@@ -1,73 +1,69 @@
-锘�
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Data;
-using Newtonsoft.Json.Linq;
using System.IO;
namespace Gs.DevApp.DevFrm.Rpt
{
- public partial class RptPreview : DevExpress.XtraEditors.XtraForm
+ public partial class RptPreview : XtraForm
{
- private string _rptParameter;
- public RptPreview(string rptParameter)
+ private readonly string _rptParameter;
+ private readonly string _rptGuid;
+ public RptPreview(string strGuid, string rptParameter)
{
_rptParameter = rptParameter;
+ _rptGuid = strGuid;
InitializeComponent();
- this.Text = _rptParameter + "鎶ヨ〃鏌ョ湅锛�";
+ Text = _rptParameter + "鎶ヨ〃鏌ョ湅锛�";
getRptData();
}
/// <summary>
- /// 璇诲彇鎶ヨ〃鏁版嵁
+ /// 璇诲彇鎶ヨ〃鏁版嵁
/// </summary>
private void getRptData()
{
var _obj = new
{
- rptParameter = this._rptParameter,
+ rptParameter = _rptParameter,
+ guid = _rptGuid,
+ isDesign = 0
};
try
{
- string strJson = UtilityHelper.HttpPost("", "Report/GetRptData", JsonConvert.SerializeObject(_obj));
- JObject _job = JObject.Parse(strJson);
- string rtnCode = _job["rtnCode"].ToString();
+ var strJson = UtilityHelper.HttpPost("", "Report/GetRptData",
+ JsonConvert.SerializeObject(_obj));
+ var _job = JObject.Parse(strJson);
+ var rtnCode = _job["rtnCode"].ToString();
if (int.Parse(rtnCode) > 0)
{
//妯℃澘
- FastReport.Report report = new FastReport.Report();
- byte[] buffer = (byte[])_job["rtnData"]["reportTemplateData"];
- using (MemoryStream Stream = new MemoryStream(buffer))
+ var report = new FastReport.Report();
+ var buffer = (byte[])_job["rtnData"]["reportTemplateData"];
+ using (var Stream = new MemoryStream(buffer))
{
report.Load(Stream);
}
//涓昏〃
- JArray array = new JArray();
- foreach (var a in _job["rtnData"]["zb"])
- {
- array.Add(a);
- }
- DataTable _zb = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ var array = new JArray();
+ foreach (var a in _job["rtnData"]["zb"]) array.Add(a);
+ var _zb = JsonConvert.DeserializeObject<DataTable>(array.ToString());
_zb.TableName = "zb";
//鏄庣粏琛�1
- JArray array1 = new JArray();
- foreach (var a in _job["rtnData"]["mx1"])
- {
- array1.Add(a);
- }
- DataTable _mx1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+ var array1 = new JArray();
+ foreach (var a in _job["rtnData"]["mx1"]) array1.Add(a);
+ var _mx1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
_mx1.TableName = "mx1";
//鏄庣粏琛�2
- JArray array2 = new JArray();
- foreach (var a in _job["rtnData"]["mx2"])
- {
- array1.Add(a);
- }
- DataTable _mx2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+ var array2 = new JArray();
+ foreach (var a in _job["rtnData"]["mx2"]) array2.Add(a);
+ var _mx2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
_mx2.TableName = "mx2";
//鍔犲埌鏁版嵁闆嗕腑
- DataSet ds = new DataSet();
+ var ds = new DataSet();
ds.Tables.Add(_zb);
ds.Tables.Add(_mx1);
ds.Tables.Add(_mx2);
@@ -78,12 +74,13 @@
}
else
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _job["rtnMsg"].ToString());
+ MsgHelper.Warning("鎻愮ず锛�" + _job["rtnMsg"]);
+ this.Close();
}
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
}
--
Gitblit v1.9.3