liuying
2024-10-16 c7acb51c3ace14e509704f453adc58b9eb6613a8
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs
@@ -94,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)
                            {