一汽连杆项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liuying
2024-10-16 c7acb51c3ace14e509704f453adc58b9eb6613a8 
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs


@@ -1,4 +1,5 @@


using iWare_SCADA_BusinessLogical.BLL;


using iWare_SCADA_BusinessLogical.BLL.Important;


using iWare_SCADA_BusinessLogical.Utils;


using iWare_SCADA_Model;


using log4net;


@@ -93,9 +94,17 @@


                            using (DbModel db = new DbModel())


                            {


                                var dateTime = DateTime.Now;


                                noFinishWorkPieceProcessList = db.WorkPieceProcess.Where(x => x.CreatedTime >= findTime


                                  && x.WorkingProcedureCurrent == WorkingProcedure


                                  && x.EndTime == ooDateTime).ToList();


                                noFinishWorkPieceProcessList = db.WorkPieceProcess.Where(x =>


                                x.WorkingProcedureCurrent == WorkingProcedure


                               && (




                            (x.CreatedTime >= findTime


                                  && x.EndTime == ooDateTime)


                                  || x.Update70Flag == 1




                                  )




                                  ).ToList();


                            }


                            if (noFinishWorkPieceProcessList?.Count <= 0)


                            {


@@ -110,8 +119,9 @@


                            wplog.EquipmentID = _dataCaptureConfig.EquipmentID;


                            wplog.Remarks = WorkingProcedure;


                            wplog.MonitoringPoint = DataCapturePointCode;


                            //wplog.CreatedUserName = DataCapturePointCode;


                            SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);


                            wplog.CreatedTime = DateTimeHelper.GetDateTime();


                            wplog.CreatedUserName = DataCapturePointCode;


                            wplog.UpdatedTime = DateTimeHelper.GetDateTime();


                            wplog.UpdatedUserName = Environment.MachineName + "自动" + Thread.CurrentThread.ManagedThreadId.ToString();


                            wplog.OnlineTime = DateTimeHelper.GetDateTime();


@@ -158,7 +168,7 @@


                                foreach (var item in noFinishWorkPieceProcessList)


                                {


                                    wplog.WorkPieceID = item.WorkPieceID;


                                    WorkPieceInfoManager.QualityInfoCompleteForOP70(wplog, LogType.OP7009);


                                    QualityInfoCompleteManager.QualityInfoCompleteForOP70(wplog, LogType.OP7009);


                                    // threadStatusMonitor.Threadstatue = 1;


                                }


                            }