if (!loginfo.WorkingProcedure.Equals("OP05")) {//OP05 不...

schangxiang@126.com

2024-09-11 716ba664ed10d0d3db50284d7570b2e0d8407d7b

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs

@@ -21,6 +21,7 @@
using Spire.Additions.Xps.Schema;
using log4net;
using static Org.BouncyCastle.Math.EC.ECCurve;
using iWare_SCADA_BusinessLogical.BLL.Important;

namespace iWare_SCADA_BusinessLogical
{
@@ -271,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分钟前的文件夹 【Editby shaocx,2024-09-02】
                                        string directoryOther = time.AddMinutes(-30).ToString("yyyy-MM-dd_HH");
                                        directorylist.Add(directory);
                                        if (!directory.Equals(directoryOther))
                                        {//如果30秒前是另一个文件夹
@@ -345,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"))
@@ -501,6 +504,7 @@
                                            SystemValue.OP20_Side_Value = sideValue;
                                        }
                                        logMiddle.MonitoringPoint += SystemValue.OP20_Side_Value;
                                        //logMiddle.JiaJuGongWei
                                        //logMiddle.CreatedUserName = logMiddle.MonitoringPoint;
                                        SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref logMiddle, logMiddle.MonitoringPoint, DataCapturePointCname);

@@ -628,7 +632,7 @@


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