From 2b05362eba2f989b7857349cc9a3a1c12f8181b6 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 26 9月 2025 11:35:50 +0800
Subject: [PATCH] 222
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
index 9b0a460..b0e3aa5 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
@@ -20,6 +20,8 @@
using File = System.IO.File;
using Spire.Additions.Xps.Schema;
using log4net;
+using static Org.BouncyCastle.Math.EC.ECCurve;
+using iWare_SCADA_BusinessLogical.BLL.Important;
namespace iWare_SCADA_BusinessLogical
{
@@ -213,8 +215,9 @@
logMiddle.EquipmentID = _dataCaptureConfig.EquipmentID; ;
logMiddle.Remarks = WorkingProcedure;
logMiddle.MonitoringPoint = DataCapturePointCode;
+ //logMiddle.CreatedUserName = DataCapturePointCode;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref logMiddle, DataCapturePointCode, DataCapturePointCname);
logMiddle.CreatedTime = DateTimeHelper.GetDateTime();
- logMiddle.CreatedUserName = DataCapturePointCode;
logMiddle.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
logMiddle.UpdatedTime = DateTimeHelper.GetDateTime();
logMiddle.IsDeleted = false;
@@ -248,6 +251,16 @@
try
{
+ switch (DataCapturePointCode)
+ {
+ case "OP2002A":
+ case "OP2002B":
+ case "OP2002C":
+ //鐩戞帶涓婄嚎
+ MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, logMiddle.WorkPieceID);
+ break;
+ }
+
if (WorkingProcedure.Equals("OP30"))
{
var time = DateTimeHelper.GetDateTime();
@@ -259,7 +272,9 @@
//鑾峰彇鏂囦欢澶瑰悕绉�
List<string> directorylist = new List<string>();
string directory = time.ToString("yyyy-MM-dd_HH");
- string directoryOther = time.AddSeconds(-30).ToString("yyyy-MM-dd_HH");
+ //string directoryOther = time.AddSeconds(-30).ToString("yyyy-MM-dd_HH");
+ //鏀逛负璋冩暣30鍒嗛挓鍓嶇殑鏂囦欢澶� 銆怑ditby shaocx,2024-09-02銆�
+ string directoryOther = time.AddMinutes(-30).ToString("yyyy-MM-dd_HH");
directorylist.Add(directory);
if (!directory.Equals(directoryOther))
{//濡傛灉30绉掑墠鏄彟涓�涓枃浠跺す
@@ -333,12 +348,12 @@
if (logMiddle.OP35OK)
{
logMiddle.QualityStateStr = "OK";
- logMiddle.QualityState = (int)QualityState.OK;
+ logMiddle.QualityState = (int)QualityStateEnum.OK;
}
else
{
logMiddle.QualityStateStr = "NG";
- logMiddle.QualityState = (int)QualityState.NG;
+ logMiddle.QualityState = (int)QualityStateEnum.NG;
}
}
else if (WorkingProcedure.Equals("OP60"))
@@ -489,7 +504,9 @@
SystemValue.OP20_Side_Value = sideValue;
}
logMiddle.MonitoringPoint += SystemValue.OP20_Side_Value;
- logMiddle.CreatedUserName = logMiddle.MonitoringPoint;
+ logMiddle.JiaJuGongWei = SystemBussinessHelper.GetJiaJuGongWei(logMiddle.MonitoringPoint, logMiddle.WorkingProcedure);
+ //logMiddle.CreatedUserName = logMiddle.MonitoringPoint;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref logMiddle, logMiddle.MonitoringPoint, DataCapturePointCname);
Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}涓嬬嚎瀹屾垚锛屾槸鎸囧畾鐨勫伐浠秢logMiddle.WorkPieceID},宸ヤ綅{gongweiStr}锛屾牎楠岄�氳繃锛岃鍙朞p60_Place_Flag:true");
@@ -615,7 +632,7 @@
//鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.QualityInfoComplete(logMiddle, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+ QualityInfoCompleteManager.QualityInfoComplete(logMiddle, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
threadStatusMonitor.Threadstatue = 1;
--
Gitblit v1.9.3