1

schangxiang@126.com

2024-08-31 b6eea38032902e76b708c3555ee152e1ee137409

 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
{
@@ -57,6 +58,8 @@
        {
            if (SystemValue.isStartedImitateModel)
            {
                //模拟代码注释
                /*
                var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
                WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
                wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
@@ -90,6 +93,7 @@
                //更新WorkPieceInfo表以及插入WorkPieceLog表和WorkPieceInfoLog表
                WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));

                //*/

                return;
            }
@@ -245,6 +249,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();
@@ -610,9 +624,7 @@
                                    Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}测量完成读取文件数据时异常,避免工序完成异常：", ex);
                                }

                                //根据质量数据判断是否合格/不合格 【Editby shaocx,2024-06-25】
                                WorkPieceInfoManager.SetLogMiddleForQuality(ref logMiddle);
                              

                                //更新WorkPieceInfo表以及插入WorkPieceLog表和WorkPieceInfoLog表
                                WorkPieceInfoManager.QualityInfoComplete(logMiddle, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
                                threadStatusMonitor.Threadstatue = 1;