一汽连杆项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
schangxiang@126.com
2024-09-05 09a12e1094e90fe83c5578de64b56e9237c60507 
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs


@@ -214,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;


@@ -270,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分钟前的文件夹 【Editby shaocx,2024-09-02】


                                        string directoryOther = time.AddMinutes(-30).ToString("yyyy-MM-dd_HH");


                                        directorylist.Add(directory);


                                        if (!directory.Equals(directoryOther))


                                        {//如果30秒前是另一个文件夹


@@ -344,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"))


@@ -500,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}，校验通过，读取Op60_Place_Flag:true");