2

schangxiang@126.com

2024-06-16 bddf8b335ae61804576f160e98fd21e7c7bd5da8

2

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs

@@ -1097,7 +1097,13 @@
                            process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                            process.StartTime = DateTimeHelper.GetDateTime();
                            process.EndTime = DateTimeHelper.GetDateTime();
                            if (loginfo.WorkingProcedure.Equals("OP80"))
                            {//OP80的质量数据是后来获取文件搞的
                            }
                            else
                            {
                            process.QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value : (int)QualityState.OK;
                            }
                            process.CreatedUserName = loginfo.MonitoringPoint;
                            process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            process.UpdatedUserName = loginfo.MonitoringPoint;

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs

@@ -141,10 +141,11 @@

                    bool isGetQcSuccess = false;

                    foreach (var file in files)
                    {//取倒序匹配的文件名为工件号的文件
                        if (file.Name.Contains(pieceProcess.WorkPieceID))
                    var findFiles = files.Where(x => x.Name.Contains(pieceProcess.WorkPieceID)).OrderByDescending(x => x.LastWriteTime).ToList();
                    if (findFiles != null && findFiles.Count > 0)
                        {
                        var file = findFiles.First();

                            Log4NetHelper.WriteErrorLog(logType, $"OP80下线完成读取到文件{file.Name}，是指定的工件{pieceProcess.WorkPieceID}");

                            WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
@@ -172,7 +173,7 @@
                                rowSecond = datatable[1].Split(',').ToList();
                                if (rowSecond.Count < 11)
                                {
                                    continue;
                                return;
                                }
                                //日期和时间    批号/标识号    嵌套号/主轴号    操作符    文本    测量机    过程参数    测量系统    过程参数值    序列号    零件识别号    1
                                OP80Info oP80Info = new OP80Info();
@@ -345,27 +346,25 @@
                            pieceProcess.GetQcDataCount = (pieceProcess.GetQcDataCount ?? 0) + 1;
                            pieceProcess.GetQcDataFlag_Remark = "找到文件";
                            pieceProcess.GetQcDataFlag = 1;
                        pieceProcess.QualityState = info.QualityState.HasValue ? info.QualityState.Value : (int)QualityState.OK;

                            db.WorkPieceLog.Add(WorkPieceInfoManager.GetAddWorkPieceLog(loginfo2));//插入工件采集日志表

                            db.QualityDataInfoLog.Add(WorkPieceInfoManager.GetAddQualityDataInfoLog(qualityData));//插入质量日志

                            //转移文件
                            var toPath = file.FullName.Replace("CA4GC20TD", "CA4GC20TD_COPY");
                            File.Move(file.FullName, toPath);//移动
                        foreach (var item in findFiles)
                        {
                            var toPath = item.FullName.Replace("CA4GC20TD", "CA4GC20TD_COPY");
                            File.Move(item.FullName, toPath);//移动
                        }

                            db.SaveChanges();

                            isGetQcSuccess = true;
                            Log4NetHelper.WriteInfoLog(logType, $"OP80下线完成读取文件，成功处理了指定工件{info.WorkPieceID}的文件");
                    }

                            break;
                        }
                        else
                        {

                        }
                    }
                    if (isGetQcSuccess == false)
                    {
                        pieceProcess.GetQcDataCount = (pieceProcess.GetQcDataCount ?? 0) + 1;