From 518d86b9bd8b219d658541470b2234aed4d84cbc Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 22 九月 2023 17:30:07 +0800
Subject: [PATCH] (关于下推 批量下推选到子工艺路线 添加三张报表 乔一) 乔一 生产入库报表，目前性能很低，需要优化速度； 工序流转卡列表，生产订单列表，物料列表，点击 刷新按钮时，不要 清空过滤条件，按原来的过滤条件来 过滤。 生产订单列表里， 下推流转卡时，可以多选， 点击 下推后，根据选择的行数， 工序出站汇报单批量汇报模块里，增加工序过滤功能； 增加 合格数量，报废品数量 排缸条码回车
---
WebTM/App_Data/MssqlReportData.cs | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index dedab5b..2970159 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -18,9 +18,15 @@
//public const string SqlConnStr = "Data Source=10.0.2.9;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch娴嬭瘯
- //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
- public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳
-
+ public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
+ //public const string SqlConnStr = "Data Source=192.168.0.245;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//甯呭▉
+ //public const string SqlConnStr = "Data Source=192.168.1.251;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔斾竴
+ //public const string SqlConnStr = "Data Source=192.168.16.53;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//榫欏北姹介厤
+ //public const string SqlConnStr = @"Data Source=192.168.0.193\SWE2014;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳鍦板潃
+ //public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//闆呯惇璇烘祴璇�
+ //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鍑礉濂堢壒
+ //public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鐟炵惇
+
//public string sServer;
//public string sDataBase;
//public string sUser;
@@ -81,6 +87,8 @@
ReportConn.Open();
ReportDataAdapter.Fill(ReportDataSet);
ReportConn.Close();
+ LogService.Write("SqlConnStr:"+ SqlConnStr);
+ LogService.Write("ReportDataSet:" + ReportDataSet.Tables[0].Rows.Count);
if (IsJSON)
JSONReportData.GenDataSet(DataPage, ReportDataSet, DataType);
@@ -126,6 +134,7 @@
{
public static void GenOneRecordset(System.Web.UI.Page DataPage, string QuerySQL)
{
+ LogService.Write("鎵撳嵃sql:" + QuerySQL);
SqlReportData.DoGenDetailData(DataPage, QuerySQL, ReportDataBase.DefaultDataType, false);
}
@@ -171,6 +180,15 @@
QueryList.Add(new ReportQueryItem(ParameterQuerySQL, "Master"));
GenMultiRecordset(DataPage, QueryList);
}
+ public static void GenEntireData1(System.Web.UI.Page DataPage, System.Collections.Generic.List<ReportQueryItem> SqlList)
+ {
+ ArrayList QueryList = new ArrayList();
+ for (int i = 0; i < SqlList.Count; i++)
+ {
+ QueryList.Add(new ReportQueryItem(SqlList[i].QuerySQL, SqlList[i].RecordsetName));
+ }
+ GenMultiRecordset(DataPage, QueryList);
+ }
public static void GenEntireData(System.Web.UI.Page DataPage, string RecordsetQuerySQL, string ParameterQuerySQL)
{
GenEntireData(DataPage, RecordsetQuerySQL, ParameterQuerySQL, ReportDataBase.DefaultDataType);
--
Gitblit v1.9.1