From bd8936f8feb44c0d3e95a0d19685f2ab018670bf Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 04 9月 2024 11:50:53 +0800
Subject: [PATCH] 不正常的码写入数据库
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs | 21 +++++++++++++++++++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs | 4 ++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs | 17 +++++++++++------
3 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
index c1f4a6f..ea0b238 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
@@ -134,12 +134,10 @@
//string hostname = Environment.MachineName;
object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (value_01.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- WorkPieceLog wplog = new WorkPieceLog();
+ WorkPieceLog wplog = null;
+ if (value.ToString().ToUpper().Equals("TRUE"))
+ {
+ wplog = new WorkPieceLog();
wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
wplog.WorkingProcedure = WorkingProcedure;
wplog.EquipmentID = _dataCaptureConfig.EquipmentID; ;
@@ -176,6 +174,13 @@
MonitorHelper.MonitorTestForOP3501(_dataCaptureConfig, value, colConfig, wplog);
//鐩戞帶涓婄嚎
MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog.WorkPieceID);
+ }
+
+ if (value_01.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+ {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+ //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+ //涓氬姟浠ｇ爜
+ threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
//鐗规畩澶勭悊OP50 銆怑ditby shaocx,2024-08-16銆�
string sideValue = GetSideForOP50(plcService, wplog);
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
index dcaed5a..8c7be60 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
@@ -1,5 +1,6 @@
锘�
using iWare_SCADA_Model;
+using log4net;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -69,6 +70,26 @@
Log4NetHelper.WriteInfoLog(_LogType, str);
+ //涓嶆甯哥殑鐮佸啓鍏ユ暟鎹簱
+ var isRight = SystemBussinessHelper.ValidateIsRightWorkPieceID(workPieceID);
+ if (isRight == false)
+ {
+ WorkPieceLog workPieceLog = new WorkPieceLog()
+ {
+ Id = Yitter.IdGenerator.YitIdHelper.NextId(),
+ WorkPieceID = workPieceID,
+ WorkingProcedure = _dataCaptureConfig.WorkingProcedure,
+ CreatedTime = DateTime.Now,
+ CreatedUserName = _dataCaptureConfig.DataCapturePointCode,
+ MyRemarks = "璇荤爜鍊煎紓甯�",
+ Remarks = "璇荤爜鍊煎紓甯�"
+ };
+ using (DbModel db = new DbModel())
+ {
+ db.WorkPieceLog.Add(workPieceLog);
+ db.SaveChanges();
+ }
+ }
}
catch (Exception ex)
{
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs
index 3c63552..8756aca 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs
@@ -117,6 +117,10 @@
[StringLength(255)]
public string Remarks { get; set; }
+
+ [StringLength(255)]
+ public string MyRemarks { get; set; }
+
public DateTimeOffset? CreatedTime { get; set; }
public DateTimeOffset? UpdatedTime { get; set; }
--
Gitblit v1.9.3