diff --git a/Analysis/CenterControl.cs b/Analysis/CenterControl.cs index 3a1671f..36ae855 100644 --- a/Analysis/CenterControl.cs +++ b/Analysis/CenterControl.cs @@ -584,6 +584,7 @@ namespace NSAnalysis ConfigDfn.strMeasureTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); double dNormalValue = 0.0d; + bool bToleranceValid = false; dt = tmdal.SelectOneToleranceByCondition("EH3", aryLineContent[0], aryLineContent[1]); if (dt.Rows.Count == 1) { @@ -594,14 +595,19 @@ namespace NSAnalysis dStrictTUpper = CalculateStrictUpperTolerance(dLowerValue, dUpperValue); dExcepitonTLower = CalculateExceptionLowerTolerance(dLowerValue, dUpperValue); dExceptionTUpper = CalculateExceptionUpperTolerance(dLowerValue, dUpperValue); + bToleranceValid = true; } else { + // 修复：公差未配置时显式重置异常公差，避免上一轮循环遗留值 + // 同时不再用0作为默认公差（否则后续 dMeasureValue>=0||<=0 几乎恒真，会把所有实测值误判为ng3并清空） dStrictTLower = 0; dStrictTUpper = 0; dLowerValue = 0; dUpperValue = 0; - MyBase.TraceWriteLine("EH3 " + aryLineContent[0] + " " + aryLineContent[1] + " 查询数据获取公差带失败！数据库中数量不唯一，请检查公差带配置！"); + dExcepitonTLower = 0; + dExceptionTUpper = 0; + MyBase.TraceWriteLine("EH3 " + aryLineContent[0] + " " + aryLineContent[1] + " 查询数据获取公差带失败！数据库中数量不唯一，请检查公差带配置！原始测量值将保留并写入数据库，结果标记为noTol。"); } if (aryLineContent[2].ToLower().Contains("inv")) @@ -609,6 +615,12 @@ namespace NSAnalysis aryLineContent[2] = ""; aryLineContent[4] = "ng2"; } + else if (!bToleranceValid) + { + // 修复：公差缺失时保留原始测量值，标记为noTol，避免数据系统性丢失 + MyBase.TraceWriteLine("EH3 " + aryLineContent[0] + " " + aryLineContent[1] + " 公差未配置，保留原始测量值=" + aryLineContent[2] + "，结果标记为noTol。"); + aryLineContent[4] = "noTol"; + } else { dMeasureValue = double.Parse(aryLineContent[2]); @@ -622,8 +634,10 @@ namespace NSAnalysis } else if (dMeasureValue >= dExceptionTUpper || dMeasureValue <= dExcepitonTLower) { + // 修复：原先此处 aryLineContent[2] = "" 会把超差的实测值清空， + // 导致客户CSV报告与XML汇总测出率系统性偏低，现仅打标ng3，保留原始测量值。 aryLineContent[4] = "ng3"; - aryLineContent[2] = ""; + MyBase.TraceWriteLine("EH3 " + aryLineContent[0] + " " + aryLineContent[1] + " 实测值=" + dMeasureValue.ToString("F2") + " 超出异常公差区间[" + dExcepitonTLower.ToString("F2") + "," + dExceptionTUpper.ToString("F2") + "]，结果ng3，原值保留。"); } else { @@ -646,9 +660,10 @@ namespace NSAnalysis } else { + // ng3 / noTol 等异常分支：原先此处 aryLineContent[2] = "" 也会清空实测值， + // 现保留原始值用于追溯，仅清空结果列。 RejectedCount++; aryLineContent[4] = ""; - aryLineContent[2] = ""; } Invoke((MethodInvoker)(() => { @@ -678,6 +693,21 @@ namespace NSAnalysis }//End While sr.Close(); fs.Close(); + // 数据完整性校验日志：统计本次解析后多少测点保留了原始测量值（修复Bug前ng3/noTol会被清空） + int iEH3TotalRows = dtCSVContent.Rows.Count; + int iEH3WithValue = 0; + int iEH3EmptyValue = 0; + int iEH3NoTolCount = 0; + int iEH3Ng3Count = 0; + foreach (DataRow drCheck in dtCSVContent.Rows) + { + string sVal = drCheck["MeasureValue"]?.ToString() ?? ""; + string sRes = (drCheck["MeasureItemResult"]?.ToString() ?? "").ToLower(); + if (string.IsNullOrEmpty(sVal)) iEH3EmptyValue++; else iEH3WithValue++; + if (sRes.Contains("notol")) iEH3NoTolCount++; + if (sRes.Contains("ng3")) iEH3Ng3Count++; + } + MyBase.TraceWriteLine($"[EH3完整性] 车号={strCarID} 测点总数={iEH3TotalRows} 有值={iEH3WithValue} 空值={iEH3EmptyValue} ng3={iEH3Ng3Count} noTol={iEH3NoTolCount}"); tmdal.InsertTMeasureDatabyDataTable(dtCSVContent); MyBase.TraceWriteLine("解析EH3数据完成，并将所有测量数据插入到数据库完毕。"); MyBase.TraceWriteLine("解析NextSense EH3 CSV 报告完毕！检测项数=" + dtRowCount.ToString()); @@ -1035,6 +1065,7 @@ namespace NSAnalysis ConfigDfn.strMeasureTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); double dNormalValue = 0.0d; + bool bToleranceValid = false; dt = tmdal.SelectOneToleranceByCondition("EHY", aryLineContent[0], aryLineContent[1]); if (dt.Rows.Count == 1) { @@ -1045,14 +1076,19 @@ namespace NSAnalysis dStrictTUpper = CalculateStrictUpperTolerance(dLowerValue, dUpperValue); dExcepitonTLower = CalculateExceptionLowerTolerance(dLowerValue, dUpperValue); dExceptionTUpper = CalculateExceptionUpperTolerance(dLowerValue, dUpperValue); + bToleranceValid = true; } else { + // 修复：公差未配置时显式重置异常公差，避免上一轮循环遗留值 + // 同时不再用0作为默认公差（否则后续 dMeasureValue>=0||<=0 几乎恒真，会把所有实测值误判为ng3并清空） dStrictTLower = 0; dStrictTUpper = 0; dLowerValue = 0; dUpperValue = 0; - MyBase.TraceWriteLine("EHY " + aryLineContent[0] + " " + aryLineContent[1] + " 查询数据获取公差带失败！数据库中数量不唯一或不存在，请检查公差带配置！"); + dExcepitonTLower = 0; + dExceptionTUpper = 0; + MyBase.TraceWriteLine("EHY " + aryLineContent[0] + " " + aryLineContent[1] + " 查询数据获取公差带失败！数据库中数量不唯一或不存在，请检查公差带配置！原始测量值将保留并写入数据库，结果标记为noTol。"); } if (aryLineContent[2].ToLower().Contains("inv")) @@ -1060,6 +1096,12 @@ namespace NSAnalysis aryLineContent[2] = ""; aryLineContent[4] = "ng2"; } + else if (!bToleranceValid) + { + // 修复：公差缺失时保留原始测量值，标记为noTol，避免数据系统性丢失 + MyBase.TraceWriteLine("EHY " + aryLineContent[0] + " " + aryLineContent[1] + " 公差未配置，保留原始测量值=" + aryLineContent[2] + "，结果标记为noTol。"); + aryLineContent[4] = "noTol"; + } else { dMeasureValue = double.Parse(aryLineContent[2]); @@ -1073,8 +1115,10 @@ namespace NSAnalysis } else if (dMeasureValue >= dExceptionTUpper || dMeasureValue <= dExcepitonTLower) { + // 修复：原先此处 aryLineContent[2] = "" 会把超差的实测值清空， + // 导致客户CSV报告与XML汇总测出率系统性偏低，现仅打标ng3，保留原始测量值。 aryLineContent[4] = "ng3"; - aryLineContent[2] = ""; + MyBase.TraceWriteLine("EHY " + aryLineContent[0] + " " + aryLineContent[1] + " 实测值=" + dMeasureValue.ToString("F2") + " 超出异常公差区间[" + dExcepitonTLower.ToString("F2") + "," + dExceptionTUpper.ToString("F2") + "]，结果ng3，原值保留。"); } else { @@ -1097,9 +1141,10 @@ namespace NSAnalysis } else { + // ng3 / noTol 等异常分支：原先此处 aryLineContent[2] = "" 也会清空实测值， + // 现保留原始值用于追溯，仅清空结果列。 RejectedCount++; aryLineContent[4] = ""; - aryLineContent[2] = ""; } Invoke((MethodInvoker)(() => { @@ -1130,6 +1175,21 @@ namespace NSAnalysis }//End While sr.Close(); fs.Close(); + // 数据完整性校验日志：统计本次解析后多少测点保留了原始测量值（修复Bug前ng3/noTol会被清空） + int iEHYTotalRows = dtCSVContent.Rows.Count; + int iEHYWithValue = 0; + int iEHYEmptyValue = 0; + int iEHYNoTolCount = 0; + int iEHYNg3Count = 0; + foreach (DataRow drCheck in dtCSVContent.Rows) + { + string sVal = drCheck["MeasureValue"]?.ToString() ?? ""; + string sRes = (drCheck["MeasureItemResult"]?.ToString() ?? "").ToLower(); + if (string.IsNullOrEmpty(sVal)) iEHYEmptyValue++; else iEHYWithValue++; + if (sRes.Contains("notol")) iEHYNoTolCount++; + if (sRes.Contains("ng3")) iEHYNg3Count++; + } + MyBase.TraceWriteLine($"[EHY完整性] 车号={strCarID} 测点总数={iEHYTotalRows} 有值={iEHYWithValue} 空值={iEHYEmptyValue} ng3={iEHYNg3Count} noTol={iEHYNoTolCount}"); tmdal.InsertTMeasureDatabyDataTable(dtCSVContent); MyBase.TraceWriteLine("解析EHY数据完成，并将所有测量数据插入到数据库完毕。"); MyBase.TraceWriteLine("解析NextSense EHY CSV 报告完毕！检查数量=" + dtRowCount.ToString()); @@ -1477,6 +1537,7 @@ namespace NSAnalysis ConfigDfn.strMeasureTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); double dNormalValue = 0.0d; + bool bToleranceValid = false; dt = tmdal.SelectOneToleranceByCondition("EHV", aryLineContent[0], aryLineContent[1]); if (dt.Rows.Count == 1) { @@ -1487,14 +1548,19 @@ namespace NSAnalysis dStrictTUpper = CalculateStrictUpperTolerance(dLowerValue, dUpperValue); dExcepitonTLower = CalculateExceptionLowerTolerance(dLowerValue, dUpperValue); dExceptionTUpper = CalculateExceptionUpperTolerance(dLowerValue, dUpperValue); + bToleranceValid = true; } else { + // 修复：公差未配置时显式重置异常公差，避免上一轮循环遗留值 + // 同时不再用0作为默认公差（否则后续 dMeasureValue>=0||<=0 几乎恒真，会把所有实测值误判为ng3并清空） dStrictTLower = 0; dStrictTUpper = 0; dLowerValue = 0; dUpperValue = 0; - MyBase.TraceWriteLine("EHV " + aryLineContent[0] + " " + aryLineContent[1] + " 查询数据获取公差带失败！数据库中数量不唯一或不存在，请检查公差带配置！"); + dExcepitonTLower = 0; + dExceptionTUpper = 0; + MyBase.TraceWriteLine("EHV " + aryLineContent[0] + " " + aryLineContent[1] + " 查询数据获取公差带失败！数据库中数量不唯一或不存在，请检查公差带配置！原始测量值将保留并写入数据库，结果标记为noTol。"); } if (aryLineContent[2].ToLower().Contains("inv")) @@ -1502,6 +1568,12 @@ namespace NSAnalysis aryLineContent[2] = ""; aryLineContent[4] = "ng2"; } + else if (!bToleranceValid) + { + // 修复：公差缺失时保留原始测量值，标记为noTol，避免数据系统性丢失 + MyBase.TraceWriteLine("EHV " + aryLineContent[0] + " " + aryLineContent[1] + " 公差未配置，保留原始测量值=" + aryLineContent[2] + "，结果标记为noTol。"); + aryLineContent[4] = "noTol"; + } else { dMeasureValue = double.Parse(aryLineContent[2]); @@ -1515,8 +1587,10 @@ namespace NSAnalysis } else if (dMeasureValue >= dExceptionTUpper || dMeasureValue <= dExcepitonTLower) { + // 修复：原先此处 aryLineContent[2] = "" 会把超差的实测值清空， + // 导致客户CSV报告与XML汇总测出率系统性偏低，现仅打标ng3，保留原始测量值。 aryLineContent[4] = "ng3"; - aryLineContent[2] = ""; + MyBase.TraceWriteLine("EHV " + aryLineContent[0] + " " + aryLineContent[1] + " 实测值=" + dMeasureValue.ToString("F2") + " 超出异常公差区间[" + dExcepitonTLower.ToString("F2") + "," + dExceptionTUpper.ToString("F2") + "]，结果ng3，原值保留。"); } else { @@ -1538,9 +1612,10 @@ namespace NSAnalysis } else { + // ng3 / noTol 等异常分支：原先此处 aryLineContent[2] = "" 也会清空实测值， + // 现保留原始值用于追溯，仅清空结果列。 RejectedCount++; aryLineContent[4] = ""; - aryLineContent[2] = ""; } Invoke((MethodInvoker)(() => { @@ -1570,6 +1645,21 @@ namespace NSAnalysis }//End While sr.Close(); fs.Close(); + // 数据完整性校验日志：统计本次解析后多少测点保留了原始测量值（修复Bug前ng3/noTol会被清空） + int iEHVTotalRows = dtCSVContent.Rows.Count; + int iEHVWithValue = 0; + int iEHVEmptyValue = 0; + int iEHVNoTolCount = 0; + int iEHVNg3Count = 0; + foreach (DataRow drCheck in dtCSVContent.Rows) + { + string sVal = drCheck["MeasureValue"]?.ToString() ?? ""; + string sRes = (drCheck["MeasureItemResult"]?.ToString() ?? "").ToLower(); + if (string.IsNullOrEmpty(sVal)) iEHVEmptyValue++; else iEHVWithValue++; + if (sRes.Contains("notol")) iEHVNoTolCount++; + if (sRes.Contains("ng3")) iEHVNg3Count++; + } + MyBase.TraceWriteLine($"[EHV完整性] 车号={strCarID} 测点总数={iEHVTotalRows} 有值={iEHVWithValue} 空值={iEHVEmptyValue} ng3={iEHVNg3Count} noTol={iEHVNoTolCount}"); tmdal.InsertTMeasureDatabyDataTable(dtCSVContent); MyBase.TraceWriteLine("解析EHV数据完成，并将所有测量数据插入到数据库完毕。"); MyBase.TraceWriteLine("解析NextSense EHV CSV 报告完毕！检测项数=" + dtRowCount.ToString()); @@ -2081,6 +2171,8 @@ namespace NSAnalysis sb.Append(","); sb.Append("Measured_Value"); sb.AppendLine(); + int iReportTotal = 0; + int iReportEmpty = 0; foreach (DataRow row in dtCSVContent.Rows) { sb.Append(row.ItemArray[2]); @@ -2089,7 +2181,10 @@ namespace NSAnalysis sb.Append(","); sb.Append(row.ItemArray[7]); sb.AppendLine(); + iReportTotal++; + if (string.IsNullOrEmpty(row.ItemArray[7]?.ToString())) iReportEmpty++; } + MyBase.TraceWriteLine($"[GenUserReportCSV] 客户报告测量行总数={iReportTotal} 其中Measured_Value为空的行数={iReportEmpty} (空值率={(iReportTotal == 0 ? 0 : iReportEmpty * 100.0 / iReportTotal):F1}%)"); if (dtAllRangeDate.Rows.Count > 0) { foreach (DataRow row in dtAllRangeDate.Rows) diff --git a/Analysis/bin/x64/Debug/DAL.dll b/Analysis/bin/x64/Debug/DAL.dll index 56794e6..a8996d1 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 971dacf..de2eaf1 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/NSAnalysis.exe b/Analysis/bin/x64/Debug/NSAnalysis.exe index 2ea9cfe..26fedea 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 83ca0be..2687624 100644 Binary files a/Analysis/bin/x64/Debug/NSAnalysis.pdb and b/Analysis/bin/x64/Debug/NSAnalysis.pdb differ diff --git a/Analysis/bin/x64/Debug/PLCModule.dll b/Analysis/bin/x64/Debug/PLCModule.dll index 82957ba..8057c84 100644 Binary files a/Analysis/bin/x64/Debug/PLCModule.dll and b/Analysis/bin/x64/Debug/PLCModule.dll differ diff --git a/Analysis/bin/x64/Debug/PLCModule.pdb b/Analysis/bin/x64/Debug/PLCModule.pdb index e44537a..23da38d 100644 Binary files a/Analysis/bin/x64/Debug/PLCModule.pdb and b/Analysis/bin/x64/Debug/PLCModule.pdb differ diff --git a/Analysis/bin/x64/Debug/UserControlClass.dll b/Analysis/bin/x64/Debug/UserControlClass.dll index bba4fb1..f6f0972 100644 Binary files a/Analysis/bin/x64/Debug/UserControlClass.dll and b/Analysis/bin/x64/Debug/UserControlClass.dll differ diff --git a/Analysis/bin/x64/Debug/UserControlClass.pdb b/Analysis/bin/x64/Debug/UserControlClass.pdb index 952bb57..8680b56 100644 Binary files a/Analysis/bin/x64/Debug/UserControlClass.pdb and b/Analysis/bin/x64/Debug/UserControlClass.pdb differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.AboutSoftwareInfo.resources b/Analysis/obj/x64/Debug/NSAnalysis.AboutSoftwareInfo.resources deleted file mode 100644 index 01289fe..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.AboutSoftwareInfo.resources and /dev/null differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.CenterControl.resources b/Analysis/obj/x64/Debug/NSAnalysis.CenterControl.resources deleted file mode 100644 index 7984eda..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.CenterControl.resources and /dev/null differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.FAddRange.resources b/Analysis/obj/x64/Debug/NSAnalysis.FAddRange.resources deleted file mode 100644 index 01289fe..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.FAddRange.resources and /dev/null differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.FAddTolerance.resources b/Analysis/obj/x64/Debug/NSAnalysis.FAddTolerance.resources deleted file mode 100644 index 01289fe..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.FAddTolerance.resources and /dev/null differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.FEH3LeftCarData.resources b/Analysis/obj/x64/Debug/NSAnalysis.FEH3LeftCarData.resources deleted file mode 100644 index 84f1b06..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.FEH3LeftCarData.resources and /dev/null differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.FEH3RightCarData.resources b/Analysis/obj/x64/Debug/NSAnalysis.FEH3RightCarData.resources deleted file mode 100644 index 83f857f..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.FEH3RightCarData.resources and /dev/null differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.FEHYLeftCarData.resources b/Analysis/obj/x64/Debug/NSAnalysis.FEHYLeftCarData.resources deleted file mode 100644 index 0f28b3f..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.FEHYLeftCarData.resources and /dev/null differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.FEHYRightCarData.resources b/Analysis/obj/x64/Debug/NSAnalysis.FEHYRightCarData.resources deleted file mode 100644 index e82d0b5..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.FEHYRightCarData.resources and /dev/null differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.FEditRange.resources b/Analysis/obj/x64/Debug/NSAnalysis.FEditRange.resources deleted file mode 100644 index 01289fe..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.FEditRange.resources and /dev/null differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.FEditTolerance.resources b/Analysis/obj/x64/Debug/NSAnalysis.FEditTolerance.resources deleted file mode 100644 index 01289fe..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.FEditTolerance.resources and /dev/null differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.FRangeSetup.resources b/Analysis/obj/x64/Debug/NSAnalysis.FRangeSetup.resources deleted file mode 100644 index a245e63..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.FRangeSetup.resources and /dev/null differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.FSoftwareSetup.resources b/Analysis/obj/x64/Debug/NSAnalysis.FSoftwareSetup.resources deleted file mode 100644 index 01289fe..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.FSoftwareSetup.resources and /dev/null differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.FToleranceSetup.resources b/Analysis/obj/x64/Debug/NSAnalysis.FToleranceSetup.resources deleted file mode 100644 index a245e63..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.FToleranceSetup.resources and /dev/null differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.Properties.Resources.resources b/Analysis/obj/x64/Debug/NSAnalysis.Properties.Resources.resources deleted file mode 100644 index 8a4a425..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.Properties.Resources.resources and /dev/null differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.TestPageView.resources b/Analysis/obj/x64/Debug/NSAnalysis.TestPageView.resources deleted file mode 100644 index a0b4dc3..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.TestPageView.resources and /dev/null differ diff --git a/Analysis/obj/x64/Debug/NSAnalysis.ZSFDEMO.resources b/Analysis/obj/x64/Debug/NSAnalysis.ZSFDEMO.resources deleted file mode 100644 index c2afc2b..0000000 Binary files a/Analysis/obj/x64/Debug/NSAnalysis.ZSFDEMO.resources and /dev/null differ diff --git a/DAL/bin/Debug/DAL.dll b/DAL/bin/Debug/DAL.dll index 56794e6..a8996d1 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 971dacf..de2eaf1 100644 Binary files a/DAL/bin/Debug/DAL.pdb and b/DAL/bin/Debug/DAL.pdb differ diff --git a/DAL/bin/Debug/PLCModule.dll b/DAL/bin/Debug/PLCModule.dll index 82957ba..8057c84 100644 Binary files a/DAL/bin/Debug/PLCModule.dll and b/DAL/bin/Debug/PLCModule.dll differ diff --git a/DAL/bin/Debug/PLCModule.pdb b/DAL/bin/Debug/PLCModule.pdb index e44537a..23da38d 100644 Binary files a/DAL/bin/Debug/PLCModule.pdb and b/DAL/bin/Debug/PLCModule.pdb differ diff --git a/PLCModule/PLCModule/bin/Debug/PLCModule.dll b/PLCModule/PLCModule/bin/Debug/PLCModule.dll index 82957ba..8057c84 100644 Binary files a/PLCModule/PLCModule/bin/Debug/PLCModule.dll and b/PLCModule/PLCModule/bin/Debug/PLCModule.dll differ diff --git a/PLCModule/PLCModule/bin/Debug/PLCModule.pdb b/PLCModule/PLCModule/bin/Debug/PLCModule.pdb index e44537a..23da38d 100644 Binary files a/PLCModule/PLCModule/bin/Debug/PLCModule.pdb and b/PLCModule/PLCModule/bin/Debug/PLCModule.pdb differ diff --git a/PLCModule/PLCModule/obj/x86/Debug/4.PLCModule.csproj.CoreCompileInputs.cache b/PLCModule/PLCModule/obj/x86/Debug/4.PLCModule.csproj.CoreCompileInputs.cache deleted file mode 100644 index e09a074..0000000 --- a/PLCModule/PLCModule/obj/x86/Debug/4.PLCModule.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -0f1deae82d6b17efb06488922c2ee6df6dc7b1a3ab40d7d519c6074e9861c58c diff --git a/PLCModule/PLCModule/obj/x86/Debug/4.PLCModule.csproj.FileListAbsolute.txt b/PLCModule/PLCModule/obj/x86/Debug/4.PLCModule.csproj.FileListAbsolute.txt deleted file mode 100644 index d6973ac..0000000 --- a/PLCModule/PLCModule/obj/x86/Debug/4.PLCModule.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,76 +0,0 @@ -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\bin\Debug\PLCModule.dll.config -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\bin\Debug\PLCModule.dll -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\bin\Debug\PLCModule.pdb -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.dll -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.UI.dll -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\bin\Debug\TelerikCommon.dll -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.xml -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.UI.xml -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\obj\x86\Debug\4.PLCModule.csproj.AssemblyReference.cache -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\obj\x86\Debug\PLCModule.FormModbus.resources -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\obj\x86\Debug\PLCModule.FormDebugSiemensS7.resources -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\obj\x86\Debug\PLCModule.PlcAddrSetup.resources -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\obj\x86\Debug\PLCModule.Properties.Resources.resources -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\obj\x86\Debug\4.PLCModule.csproj.GenerateResource.cache -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\obj\x86\Debug\PLCModule.dll.licenses -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\obj\x86\Debug\4.PLCModule.csproj.CoreCompileInputs.cache -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\obj\x86\Debug\4.PLCMod.738FDF59.Up2Date -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\obj\x86\Debug\PLCModule.dll -E:\1AHexagonProjects\2024\安徽大众C15-Nextsense\VWAnalysis\PLCModule\PLCModule\obj\x86\Debug\PLCModule.pdb -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\bin\Debug\PLCModule.dll.config -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\bin\Debug\PLCModule.dll -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\bin\Debug\PLCModule.pdb -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.dll -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.UI.dll -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\bin\Debug\TelerikCommon.dll -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.xml -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.UI.xml -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\obj\x86\Debug\4.PLCModule.csproj.AssemblyReference.cache -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.FormModbus.resources -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.FormDebugSiemensS7.resources -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.PlcAddrSetup.resources -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.Properties.Resources.resources -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\obj\x86\Debug\4.PLCModule.csproj.GenerateResource.cache -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.dll.licenses -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\obj\x86\Debug\4.PLCModule.csproj.CoreCompileInputs.cache -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\obj\x86\Debug\4.PLCMod.738FDF59.Up2Date -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.dll -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.pdb -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\bin\Debug\PLCModule.dll.config -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\bin\Debug\PLCModule.dll -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\bin\Debug\PLCModule.pdb -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.dll -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.UI.dll -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\bin\Debug\TelerikCommon.dll -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.xml -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.UI.xml -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\obj\x86\Debug\4.PLCModule.csproj.AssemblyReference.cache -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.FormModbus.resources -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.FormDebugSiemensS7.resources -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.PlcAddrSetup.resources -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.Properties.Resources.resources -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\obj\x86\Debug\4.PLCModule.csproj.GenerateResource.cache -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.dll.licenses -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\obj\x86\Debug\4.PLCModule.csproj.CoreCompileInputs.cache -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\obj\x86\Debug\4.PLCMod.738FDF59.Up2Date -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.dll -E:\1AHexagonProjects\2024\CheryFinalAssemblyLine\奇瑞间隙面差总装代码资料-正轩\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.pdb -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\bin\Debug\PLCModule.dll.config -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\bin\Debug\PLCModule.dll -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\bin\Debug\PLCModule.pdb -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.dll -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.UI.dll -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\bin\Debug\TelerikCommon.dll -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.xml -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\bin\Debug\Telerik.WinControls.UI.xml -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\obj\x86\Debug\4.PLCModule.csproj.AssemblyReference.cache -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.FormModbus.resources -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.FormDebugSiemensS7.resources -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.PlcAddrSetup.resources -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.Properties.Resources.resources -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\obj\x86\Debug\4.PLCModule.csproj.GenerateResource.cache -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.dll.licenses -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\obj\x86\Debug\4.PLCModule.csproj.CoreCompileInputs.cache -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\obj\x86\Debug\4.PLCMod.738FDF59.Up2Date -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.dll -D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\PLCModule\PLCModule\obj\x86\Debug\PLCModule.pdb diff --git a/PLCModule/PLCModule/obj/x86/Debug/4.PLCModule.csproj.GenerateResource.cache b/PLCModule/PLCModule/obj/x86/Debug/4.PLCModule.csproj.GenerateResource.cache deleted file mode 100644 index 70090f6..0000000 Binary files a/PLCModule/PLCModule/obj/x86/Debug/4.PLCModule.csproj.GenerateResource.cache and /dev/null differ diff --git a/UserControlClass/bin/Debug/UserControlClass.dll b/UserControlClass/bin/Debug/UserControlClass.dll index bba4fb1..f6f0972 100644 Binary files a/UserControlClass/bin/Debug/UserControlClass.dll and b/UserControlClass/bin/Debug/UserControlClass.dll differ diff --git a/UserControlClass/bin/Debug/UserControlClass.pdb b/UserControlClass/bin/Debug/UserControlClass.pdb index 952bb57..8680b56 100644 Binary files a/UserControlClass/bin/Debug/UserControlClass.pdb and b/UserControlClass/bin/Debug/UserControlClass.pdb differ