一汽连杆项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
schangxiang@126.com
2024-09-06 05f2a20bb792169bf7b8a101af8718b96449f55a 
 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"))


@@ -628,7 +631,7 @@






                                //更新WorkPieceInfo表以及插入WorkPieceLog表和WorkPieceInfoLog表


                                WorkPieceInfoManager.QualityInfoComplete(logMiddle, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));


                                QualityInfoCompleteManager.QualityInfoComplete(logMiddle, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));


                                threadStatusMonitor.Threadstatue = 1;