From 8136ad35e604b921abae37c5c2f309350272bc12 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 21 二月 2024 17:28:10 +0800
Subject: [PATCH] 1.物料列表、计量单位列表、客户列表、供应商列表、订单等级列表、工艺参数列表、工艺参数单位列表、工艺参数对应表列表、物料分类列表、包装方式列表、故障类别列表、汇率列表、交货地点列表、仓库列表、结算方式列表、器具状态列表、设备状态列表、工位列表、职员列表、部门列表、地区列表、客户分类列表、供应商分类列表、检验项目列表、检验项目分类列表、工序工价资料维护列表、委外工序工价资料维护、核算方式列表、核算方式组列表、工资类型列表、工种列表、维修项目维护、维修检验项目维护、保养项目维护、工序列表、生产班组列表、不良原因列表、故障原因列表、工作中心列表、岗位列表、不良后果列表、不良类型列表、岗位技能列表、报废原因列表、处理方案列表。点击行变色选中 2.项目需求及问题清单， 单据列表 3.工作任务下推增加一个下推赋值根据源单类型进行判断
---
WebTM/App_Data/MssqlReportData.cs | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index a19eb5d..71758f7 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -18,7 +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=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
+ 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.250;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;
@@ -80,6 +88,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);
@@ -125,6 +135,7 @@
{
public static void GenOneRecordset(System.Web.UI.Page DataPage, string QuerySQL)
{
+ LogService.Write("鎵撳嵃sql:" + QuerySQL);
SqlReportData.DoGenDetailData(DataPage, QuerySQL, ReportDataBase.DefaultDataType, false);
}
@@ -170,6 +181,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