From 8a9ca879c839467051db1e5d3e7986537ac5afce Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 06 9月 2024 13:54:55 +0800
Subject: [PATCH] 测量岛数据展示
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 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 95bd42e..aae2e7b 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,7 @@
using File = System.IO.File;
using Spire.Additions.Xps.Schema;
using log4net;
+using static Org.BouncyCastle.Math.EC.ECCurve;
namespace iWare_SCADA_BusinessLogical
{
@@ -55,8 +56,10 @@
public override void DataCaptureStart()
{
- if (SystemValue.isStartedModel)
+ if (SystemValue.isStartedImitateModel)
{
+ //妯℃嫙浠ｇ爜娉ㄩ噴
+ /*
var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
@@ -90,6 +93,7 @@
//鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+ //*/
return;
}
@@ -210,8 +214,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;
@@ -245,6 +250,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();
@@ -256,7 +271,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绉掑墠鏄彟涓�涓枃浠跺す
@@ -330,12 +347,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"))
@@ -486,7 +503,8 @@
SystemValue.OP20_Side_Value = sideValue;
}
logMiddle.MonitoringPoint += SystemValue.OP20_Side_Value;
- logMiddle.CreatedUserName = logMiddle.MonitoringPoint;
+ //logMiddle.CreatedUserName = logMiddle.MonitoringPoint;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref logMiddle, logMiddle.MonitoringPoint, DataCapturePointCname);
Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}涓嬬嚎瀹屾垚锛屾槸鎸囧畾鐨勫伐浠秢logMiddle.WorkPieceID},宸ヤ綅{gongweiStr}锛屾牎楠岄�氳繃锛岃鍙朞p60_Place_Flag:true");
@@ -610,9 +628,7 @@
Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}娴嬮噺瀹屾垚璇诲彇鏂囦欢鏁版嵁鏃跺紓甯�,閬垮厤宸ュ簭瀹屾垚寮傚父锛�", ex);
}
- //鏍规嵁璐ㄩ噺鏁版嵁鍒ゆ柇鏄惁鍚堟牸/涓嶅悎鏍� 銆怑ditby shaocx,2024-06-25銆�
- WorkPieceInfoManager.SetLogMiddleForQuality(ref logMiddle);
-
+
//鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
WorkPieceInfoManager.QualityInfoComplete(logMiddle, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
threadStatusMonitor.Threadstatue = 1;
--
Gitblit v1.9.3