diff --git a/Analysis/CenterControl.cs b/Analysis/CenterControl.cs index fb776a5..7da1f4e 100644 --- a/Analysis/CenterControl.cs +++ b/Analysis/CenterControl.cs @@ -243,7 +243,7 @@ namespace NSAnalysis strSaveReprotPath = ConfigDfn.strReportPath + @"\"; - testIotUpload(); + //testIotUpload(); } diff --git a/Analysis/Program.cs b/Analysis/Program.cs index 4d2a7cd..60be98a 100644 --- a/Analysis/Program.cs +++ b/Analysis/Program.cs @@ -91,7 +91,7 @@ namespace NSAnalysis gAuthorizationMode = FileIni.ReadInt(ConfigDfn.strConfigFile, "Chery", "AuthorizationMode", 1); #endregion 创建Log文件 - Application.Run(new CenterControl()); + //Application.Run(new CenterControl()); if (gAuthorizationMode == 1) { MyBase.TraceWriteLine("Log in using the CLMS authorization."); diff --git a/Analysis/bin/x64/Debug/DAL.dll b/Analysis/bin/x64/Debug/DAL.dll index 951c2ca..afd633c 100644 Binary files a/Analysis/bin/x64/Debug/DAL.dll and b/Analysis/bin/x64/Debug/DAL.dll differ diff --git a/Analysis/bin/x64/Debug/DAL.pdb b/Analysis/bin/x64/Debug/DAL.pdb index 1d8c7ee..1eb3788 100644 Binary files a/Analysis/bin/x64/Debug/DAL.pdb and b/Analysis/bin/x64/Debug/DAL.pdb differ diff --git a/Analysis/bin/x64/Debug/Debug.txt b/Analysis/bin/x64/Debug/Debug.txt index a914d8f..31836fb 100644 --- a/Analysis/bin/x64/Debug/Debug.txt +++ b/Analysis/bin/x64/Debug/Debug.txt @@ -1,25 +1,24 @@ -2025-08-27 23:23:46.910----软件Program Main函数开始执行-- -2025-08-27 23:23:46.912--加载配置文件——>开始 -2025-08-27 23:23:46.923--数据库连接 SqlServerName:127.0.0.1 -2025-08-27 23:23:46.924--数据库连接 SqlUserName:sa -2025-08-27 23:23:46.925--数据库连接 SqlPassword:Hexagon123 -2025-08-27 23:23:46.926--数据库连接 SqlDbName:NextSenseStandardDB -2025-08-27 23:23:46.927--加载配置文件——>完成 -2025-08-27 23:23:48.235--数据库连接 SqlServerName:127.0.0.1 -2025-08-27 23:23:48.236--数据库连接 SqlUserName:sa -2025-08-27 23:23:48.236--数据库连接 SqlPassword:Hexagon123 -2025-08-27 23:23:48.236--数据库连接 SqlDbName:NextSenseStandardDB -2025-08-27 23:23:48.239--数据库连接字符串:Data Source=127.0.0.1;initial Catalog=NextSenseStandardDB;User ID=sa;password=Hexagon123; -2025-08-27 23:23:48.713-- 进入显示车身模式!显示车身界面。 -2025-08-27 23:23:49.324--启动PLC写线程! -2025-08-27 23:23:49.326-- 进入解析CSV文件模式,开始解析扫码CSV文件! -2025-08-27 23:23:49.326--连接PLC.... -2025-08-27 23:23:49.328--软件首次启动, Nextsense EH3 CSV读取路径存在;不清空,读取NextSense生成 CSV报告路径下的所有文件,路径为:D:\cherytestEH3 -2025-08-27 23:23:49.329--软件首次启动, Nextsense EHY CSV读取路径存在;不清空,读取NextSense生成 CSV报告路径下的所有文件,路径为:D:\cherytestEHY -2025-08-27 23:23:51.392--PLC S7连接失败。 -2025-08-27 23:23:55.657--Update To IOT Data Content: {"serno":"20250827232354966","requestData":[{"vin":"LNNBDDEF4SDF49707","model":"EHY","equipmentNo":"NS002","equipmentName":"Hexagon","calibrationResult":"NG","detectionTime":"","targetRate":"97.00%","rate":"","GapList":[{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD01L","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD02L","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD03L","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD04L","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD05L","actualValue":"","controlLine":"0.0/0.5","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD06L","actualValue":"","controlLine":"0.0/1.0","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD01R","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD02R","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD03R","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD04R","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD06R","actualValue":"","controlLine":"0.0/0.7","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD07","actualValue":"","controlLine":"0.0/1.0","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD08","actualValue":"","controlLine":"0.0/1.0","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD09","actualValue":"","controlLine":"0.0/1.0","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD10","actualValue":"","controlLine":"0.0/1.0","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD11","actualValue":"","controlLine":"0.0/1.0","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD12","actualValue":"","controlLine":"0.0/1.0","measurementResult":"NG"},{"vin":"LNNBDDEF4SDF49707","gfNo":"G","pointNumber":"FD13","actualValue":"","controlLine":"0.0/1.2","measurementResult":"NG"}]}]} -2025-08-27 23:24:11.551--EHY数据上传IOT完成,结果返回为:Error: System.Net.WebException: 操作超时 - 在 System.Net.HttpWebRequest.GetRequestStream(TransportContext& context) - 在 System.Net.HttpWebRequest.GetRequestStream() - 在 NSAnalysis.CenterControl.PostJsonToIOT(String url, String jsonData, Nullable`1 timeout) 位置 D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\Analysis\CenterControl.cs:行号 1623 -2025-08-27 23:24:14.271--EHY数据上传IOT失败! +2025-08-28 00:01:33.190----软件Program Main函数开始执行-- +2025-08-28 00:01:33.191--加载配置文件——>开始 +2025-08-28 00:01:33.206--数据库连接 SqlServerName:127.0.0.1 +2025-08-28 00:01:33.207--数据库连接 SqlUserName:sa +2025-08-28 00:01:33.207--数据库连接 SqlPassword:Hexagon123 +2025-08-28 00:01:33.207--数据库连接 SqlDbName:NextSenseStandardDB +2025-08-28 00:01:33.210--加载配置文件——>完成 +2025-08-28 00:01:34.614--数据库连接 SqlServerName:127.0.0.1 +2025-08-28 00:01:34.615--数据库连接 SqlUserName:sa +2025-08-28 00:01:34.616--数据库连接 SqlPassword:Hexagon123 +2025-08-28 00:01:34.617--数据库连接 SqlDbName:NextSenseStandardDB +2025-08-28 00:01:34.618--数据库连接字符串:Data Source=127.0.0.1;initial Catalog=NextSenseStandardDB;User ID=sa;password=Hexagon123; +2025-08-28 00:01:35.112-- 进入显示车身模式!显示车身界面。 +2025-08-28 00:01:35.624--启动PLC写线程! +2025-08-28 00:01:35.627-- 进入解析CSV文件模式,开始解析扫码CSV文件! +2025-08-28 00:01:35.650--连接PLC.... +2025-08-28 00:01:35.652--软件首次启动, Nextsense EH3 CSV读取路径存在;不清空,读取NextSense生成 CSV报告路径下的所有文件,路径为:D:\cherytestEH3 +2025-08-28 00:01:35.653--软件首次启动, Nextsense EHY CSV读取路径存在;不清空,读取NextSense生成 CSV报告路径下的所有文件,路径为:D:\cherytestEHY +2025-08-28 00:01:37.708--PLC S7连接失败。 +2025-08-28 00:01:40.645--连接PLC失败 +2025-08-28 00:01:41.053--Right EH3 UI Refresh tmrRefreshData (strVIN.Length==21):CarType:EHY ;VIN: LNNBBDEC8RDA23997 +2025-08-28 00:01:41.063--Right EHY UI Refresh tmrRefreshData (strVIN.Length==21):CarType:EHY ;VIN: LNNBBDEC8RDA23997 +2025-08-28 00:01:50.246--显示右侧EHY车身数据界面。 +2025-08-28 00:02:31.399---------------海克斯康面隙分析软件程序关闭--------------------- diff --git a/Analysis/bin/x64/Debug/NSAnalysis.exe b/Analysis/bin/x64/Debug/NSAnalysis.exe index 8aa33a0..314bd97 100644 Binary files a/Analysis/bin/x64/Debug/NSAnalysis.exe and b/Analysis/bin/x64/Debug/NSAnalysis.exe differ diff --git a/Analysis/bin/x64/Debug/NSAnalysis.pdb b/Analysis/bin/x64/Debug/NSAnalysis.pdb index fcb36a0..b410c1d 100644 Binary files a/Analysis/bin/x64/Debug/NSAnalysis.pdb and b/Analysis/bin/x64/Debug/NSAnalysis.pdb differ diff --git a/DAL/TMeasureMSSQLDAL.cs b/DAL/TMeasureMSSQLDAL.cs index a7b08b0..423f595 100644 --- a/DAL/TMeasureMSSQLDAL.cs +++ b/DAL/TMeasureMSSQLDAL.cs @@ -74,7 +74,7 @@ namespace DAL string strSql = "select CarType from TMeasureResult where CarID = '" + strVIN + "'"; DataTable dt = SQLHelper.ExecuteQuery(strSql, CommandType.Text); - if (dt.Rows.Count == 1) + if (dt.Rows.Count >= 1) { return dt.Rows[0][0].ToString(); } @@ -260,7 +260,7 @@ namespace DAL DataTable dt = new DataTable(); string strSql = "select CarVIN from TTempSaveVIN where CarVIN like '%" + strCSVVIN + "'"; dt = SQLHelper.ExecuteQuery(strSql, CommandType.Text); - if (dt.Rows.Count == 1) + if (dt.Rows.Count >= 1) return dt.Rows[0][0].ToString(); else { @@ -268,12 +268,12 @@ namespace DAL } } - public int CheckMRVINExistOrNotByVIN(string strVIN) - { + public int CheckMRVINExistOrNotByVIN(string strVIN) // 25.08.27 数据分析到右两次过点记录,导致数据中存在两条相同VIN的记录,这里将 只有一条修改为 >= + { DataTable dt = new DataTable(); string strSql = "select CarID from TMeasureResult where CarID = '" + strVIN + "'"; dt = SQLHelper.ExecuteQuery(strSql, CommandType.Text); - if (dt.Rows.Count == 1) + if (dt.Rows.Count >= 1) return 1; else { diff --git a/DAL/bin/Debug/DAL.dll b/DAL/bin/Debug/DAL.dll index 951c2ca..afd633c 100644 Binary files a/DAL/bin/Debug/DAL.dll and b/DAL/bin/Debug/DAL.dll differ diff --git a/DAL/bin/Debug/DAL.pdb b/DAL/bin/Debug/DAL.pdb index 1d8c7ee..1eb3788 100644 Binary files a/DAL/bin/Debug/DAL.pdb and b/DAL/bin/Debug/DAL.pdb differ