From 45300161f0d4abc873999a58069dcaa390adb56d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 23 8月 2024 13:05:07 +0800
Subject: [PATCH] 2
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 7 ++++---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemHelper.cs | 10 ++++++++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs | 18 +++++++++++-------
3 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
index 04403fd..f33d548 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -833,19 +833,20 @@
qualityData.QualityReceiveTime = DateTime.Now;
//鐗规畩澶勭悊OP70鐨勮川閲忔暟鎹�
- if (!string.IsNullOrEmpty(logMiddle.QualityOP70To1) && !string.IsNullOrEmpty(qualityData.QualityOP70To1))
+ if (string.IsNullOrEmpty(qualityData.QualityOP70To1) && !string.IsNullOrEmpty(SystemHelper.GetStrForQualityOP70(logMiddle.QualityOP70To1)))
{
qualityData.QualityOP70To1 = logMiddle.QualityOP70To1;
}
- if (!string.IsNullOrEmpty(logMiddle.QualityOP70To2) && !string.IsNullOrEmpty(qualityData.QualityOP70To2))
+ if (string.IsNullOrEmpty(qualityData.QualityOP70To2) && !string.IsNullOrEmpty(SystemHelper.GetStrForQualityOP70(logMiddle.QualityOP70To2)))
{
qualityData.QualityOP70To2 = logMiddle.QualityOP70To2;
}
- if (!string.IsNullOrEmpty(logMiddle.QualityOP70To3) && !string.IsNullOrEmpty(qualityData.QualityOP70To3))
+ if (string.IsNullOrEmpty(qualityData.QualityOP70To3) && !string.IsNullOrEmpty(SystemHelper.GetStrForQualityOP70(logMiddle.QualityOP70To3)))
{
qualityData.QualityOP70To3 = logMiddle.QualityOP70To3;
}
+
db.QualityDataInfoLog.Add(GetAddQualityDataInfoLog(qualityData));//鎻掑叆鏃ュ織
if (isAdd)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemHelper.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemHelper.cs
index 8b4eccb..90297a7 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemHelper.cs
@@ -13,6 +13,16 @@
/// </summary>
public class SystemHelper
{
+
+ public static string GetStrForQualityOP70(string str)
+ {
+ if (string.IsNullOrEmpty(str) || str == "0")
+ {
+ return "";
+ }
+ return str;
+ }
+
/// <summary>
/// 瀛楃涓茶浆鎹ecimal绫诲瀷
/// </summary>
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
index f16f14c..76e4829 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
@@ -1857,14 +1857,18 @@
{
switch (config.DataCapturePointCode)
{
- case "OP3002CH3":
- //case "OP3002CH4":
- //case "OP3002CH5":
- //case "OP3002CH6":
- DataCaptureHandler_02 dc02 = new DataCaptureHandler_02();
- dc02._dataCaptureConfig = config;
- _dataCaptureHandler.Add(dc02);
+ case "OP7009"://娓呮礂鏈鸿幏鍙栭噰闆嗘暟鎹�
+ DataCaptureHandler_OP7009.Instance._dataCaptureConfig = config;
+ _dataCaptureHandler.Add(DataCaptureHandler_OP7009.Instance);
break;
+ //case "OP3002CH3":
+ // //case "OP3002CH4":
+ // //case "OP3002CH5":
+ // //case "OP3002CH6":
+ // DataCaptureHandler_02 dc02 = new DataCaptureHandler_02();
+ // dc02._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(dc02);
+ // break;
//case "OP2002A":
// //case "OP2002B":
// //case "OP2002C":
--
Gitblit v1.9.3