From 976c9c8d28c66e5677e878aad33811817df638b0 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期四, 26 六月 2025 17:53:24 +0800
Subject: [PATCH] 报工台出站单扫描流转卡默认带出本到进站数量 设备OEE报表里，增加 查看运行日志 按钮 SPC检验单分析模块： 增加 生产资源、工序 智云MES测试记录20250603的文档进行软件完善 PDA设备点检记录单 首件检验单、巡检单、工序检验单、工艺参数点检表 表头判定为 不合格或NG的 根据不同类型 自动跳出安灯呼叫的界面
---
WebTM/App_Data/MssqlReportData.cs | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index a19eb5d..78b093a 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -18,7 +18,21 @@
//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=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YSJ娴嬭瘯
+ //public const string SqlConnStr = "Data Source=10.11.18.195;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;"; //鏂帿灏�
+ //public const string SqlConnStr = "Data Source=30.10.7.6;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;"; //鏂帿灏�
+ //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=10.10.1.1;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 const string SqlConnStr = "Data Source=192.168.2.10;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔濊彵鐢垫満
+ //public const string SqlConnStr = "Data Source=192.168.1.8;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//娣诲悍绉戞妧
+ //public const string SqlConnStr = "Data Source=192.168.6.5;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鑸滄垚
//public string sServer;
//public string sDataBase;
@@ -80,6 +94,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 +141,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 +187,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