增加 MyRemarks 备注

schangxiang@126.com

2024-09-03 a635f1bbbaf5ebacde78f9d1bcb9b34bc2359902

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs

@@ -263,6 +263,7 @@
                            new_process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            new_process.OperationType = OperationType.生产.ToString();
                            new_process.Remarks = "";
                            new_process.MyRemarks = "读码上线时，如果找不到就新建";
                            if (loginfo.WorkingProcedure.Equals("OP05"))
                            {
                                new_process.EndTime = new_process.StartTime;
@@ -691,8 +692,8 @@

                                    if (qualityData.OP30QualityStateCH3 == ((int)QualityState.NG).ToString())
                                    {
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30涨断工位力矩大;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30涨断工位力矩大.ToString();
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30涨断工位力矩超差;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30涨断工位力矩超差.ToString();
                                        //赋值不合格原因
                                        SetQualityNoOk_WorkPieceInfo(logMiddle, ref pieceInfo);
                                    }
@@ -705,8 +706,8 @@

                                    if (qualityData.OP30QualityStateCH4 == ((int)QualityState.NG).ToString())
                                    {
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30预拧紧工位力矩大;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30预拧紧工位力矩大.ToString();
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30预拧紧工位力矩超差;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30预拧紧工位力矩超差.ToString();
                                        //赋值不合格原因
                                        SetQualityNoOk_WorkPieceInfo(logMiddle, ref pieceInfo);
                                    }
@@ -719,8 +720,8 @@

                                    if (qualityData.OP30QualityStateCH5 == ((int)QualityState.NG).ToString())
                                    {
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30终拧紧工位力矩大;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30终拧紧工位力矩大.ToString();
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30终拧紧工位力矩超差;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30终拧紧工位力矩超差.ToString();
                                        //赋值不合格原因
                                        SetQualityNoOk_WorkPieceInfo(logMiddle, ref pieceInfo);
                                    }
@@ -733,8 +734,8 @@

                                    if (qualityData.OP30QualityStateCH6 == ((int)QualityState.NG).ToString())
                                    {
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30压衬套工位力矩大;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30压衬套工位力矩大.ToString();
                                        logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30压衬套工位力矩超差;
                                        logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30压衬套工位力矩超差.ToString();
                                        //赋值不合格原因
                                        SetQualityNoOk_WorkPieceInfo(logMiddle, ref pieceInfo);
                                    }
@@ -808,6 +809,7 @@
                            process.OperationType = OperationType.生产.ToString();
                            process.QualityDataInfoID = qualityData.Id;
                            process.Remarks = "";
                            process.MyRemarks = "质量检测完成时，如果找不到就新建";
                            db.WorkPieceProcess.Add(process);
                        }
                        else
@@ -1043,14 +1045,37 @@
                            }
                        }
                        //更新上一工序的结束时间
                        var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && o.WorkingProcedureCurrent == loginfo.WorkingProcedure && o.OperationType == OperationType.生产.ToString()).OrderByDescending(o => o.StartTime).FirstOrDefault();
                        var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID
                        && o.WorkingProcedureCurrent == loginfo.WorkingProcedure && o.OperationType == OperationType.生产.ToString()).OrderByDescending(o => o.StartTime).FirstOrDefault();
                        if (pro != null && pro.WorkPieceID.Length > 0)
                        {
                            pro.EndTime = DateTimeHelper.GetDateTime();
                            pro.Remarks = (pro.Remarks ?? "") + "NOOK结束";
                            pro.Remarks = "NOOK结束";
                            pro.UpdatedUserName = loginfo.MonitoringPoint;
                            pro.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
                            pro.UpdatedTime = DateTimeHelper.GetDateTime();
                        }
                        else
                        {//如果找不到就新建 【Editby shaocx,2024-09-03】
                            WorkPieceProcess add_process = new WorkPieceProcess();
                            add_process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(cur_db_info);
                            QualityStateHelper.ResetQualityNoOkForNewProcess(ref add_process);
                            add_process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                            add_process.StartTime = DateTimeHelper.GetDateTime().AddSeconds(-SystemBussinessHelper.MoNiTimeForWorkingProcedure(loginfo.WorkingProcedure));
                            add_process.EndTime = DateTimeHelper.GetDateTime();
                            //不再默认赋值为合格 【Editby shaocx,2024-08-16】
                            add_process.QualityState = WorkPieceInfoManager.GetQualityStateValue(loginfo.QualityState);

                            add_process.CreatedUserName = loginfo.MonitoringPoint;
                            add_process.DataCapturePointCname = loginfo.DataCapturePointCname;
                            add_process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            add_process.UpdatedUserName = loginfo.MonitoringPoint;
                            add_process.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
                            add_process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            add_process.OperationType = OperationType.生产.ToString();
                            add_process.Remarks = "NOOK结束";
                            add_process.MyRemarks = "NOOK结束时，如果找不到就新建";
                            db.WorkPieceProcess.Add(add_process);
                        }

                        QualityStateHelper.SetQualityStateForNoOk(ref cur_db_info, ref pro, ref qualityData);
@@ -1168,6 +1193,7 @@
                        process.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
                        process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                        process.Remarks = "工件SPC抽检推出";
                        process.MyRemarks = "SPC时，插入追溯表";
                        db.WorkPieceProcess.Add(process);


@@ -1246,63 +1272,65 @@
                    {

                        bool isAddWorkPieceInfo = false;
                        WorkPieceInfo info = new WorkPieceInfo();
                        info = db.WorkPieceInfo.Where(o => o.WorkPieceID == logMiddle.WorkPieceID).FirstOrDefault();
                        if (info == null || info.WorkPieceID.Length < 1)
                        WorkPieceInfo db_info = new WorkPieceInfo();
                        db_info = db.WorkPieceInfo.Where(o => o.WorkPieceID == logMiddle.WorkPieceID).FirstOrDefault();
                        if (db_info == null || db_info.WorkPieceID.Length < 1)
                        {//没有工件信息，不做更新  （为了测试先先新增）
                            Log4NetHelper.WriteErrorLog(type, $"工件{logMiddle.WorkPieceID} 工件推出工序{logMiddle.WorkingProcedure} 没有获取到工件信息不做更新");
                            //db.WorkPieceLog.Add(GetAddWorkPieceLog(loginfo));//插入工件采集日志表
                            //db.SaveChanges();

                            loginfo2 = CommonManager.Instance.GetWorkPieceID(logMiddle, type);
                            info = EntityPropHelper.Mapper<WorkPieceInfo, WorkPieceLog>(logMiddle);
                            db_info = EntityPropHelper.Mapper<WorkPieceInfo, WorkPieceLog>(logMiddle);
                            //EntityPropHelper<WorkPieceLog, WorkPieceInfo>.CopyProp(loginfo, info, loginfo.GetWorkPieceInfoDict());
                            if (!logMiddle.WorkingProcedure.Equals("OP05"))
                            {//当工件二维码第一次出现的工序不是OP05，则设置为可疑状态
                                info.QualityState = (int)QualityState.Suspected;
                                info.QualityErrorInfo = $"工件二维码第一次出现的工序{logMiddle.MonitoringPoint}不是OP05,数据缺失,请确认情况并做相应处理！";
                                info.Remarks = $"工件二维码第一次出现的工序{logMiddle.MonitoringPoint}不是OP05,数据缺失,请确认情况并做相应处理！";
                                db_info.QualityState = (int)QualityState.Suspected;
                                db_info.QualityErrorInfo = $"工件二维码第一次出现的工序{logMiddle.MonitoringPoint}不是OP05,数据缺失,请确认情况并做相应处理！";
                                db_info.Remarks = $"工件二维码第一次出现的工序{logMiddle.MonitoringPoint}不是OP05,数据缺失,请确认情况并做相应处理！";
                            }
                            else
                            {
                                info.QualityState = (int)QualityState.OK;//此处需要注意，判断所有工序质量，然后再赋值 //默认合格，OP05默认是合格
                                info.Remarks = "OP05新增工件信息";
                                db_info.QualityState = (int)QualityState.OK;//此处需要注意，判断所有工序质量，然后再赋值 //默认合格，OP05默认是合格
                                db_info.Remarks = "OP05新增工件信息";
                            }
                            info.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime();//WorkPieceInitOnlineTime
                            info.WorkingProcedurePlan = ConfigHelper.GetConfigString("WorkingProcedureAllStr") ?? "OP05OP10OP20OP30OP35OP40OP50OP60OP70OP80";
                            info.CreatedUserName = logMiddle.MonitoringPoint;
                            SystemBussinessHelper.SetWorkPieceInfoMiddleForCreatedUserName(ref info, logMiddle.DataCapturePointCname);
                            info.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            info.WorkingProcedureCurrent = logMiddle.WorkingProcedure;
                            info.WorkingProcedureEndTime = null;
                            info = ParseQRCode(info);
                            db_info.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime();//WorkPieceInitOnlineTime
                            db_info.WorkingProcedurePlan = ConfigHelper.GetConfigString("WorkingProcedureAllStr") ?? "OP05OP10OP20OP30OP35OP40OP50OP60OP70OP80";
                            db_info.CreatedUserName = logMiddle.MonitoringPoint;
                            SystemBussinessHelper.SetWorkPieceInfoMiddleForCreatedUserName(ref db_info, logMiddle.DataCapturePointCname);
                            db_info.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            db_info.WorkingProcedureCurrent = logMiddle.WorkingProcedure;
                            db_info.WorkingProcedureEndTime = null;
                            db_info = ParseQRCode(db_info);
                            isAddWorkPieceInfo = true;
                        }
                        if (logMiddle.WorkingProcedure.Equals("OP10"))
                        {
                            //var WorkingProcedure = (loginfo.MonitoringPoint.Equals("OP1002") ? "OP10" : "OP40");
                            loginfo2.WorkingProcedure = info.WorkingProcedureCurrent;//解决OP10，OP40同一个的问题
                            logMiddle.WorkingProcedure = info.WorkingProcedureCurrent; //解决OP10，OP40同一个的问题
                            loginfo2.WorkingProcedure = db_info.WorkingProcedureCurrent;//解决OP10，OP40同一个的问题
                            logMiddle.WorkingProcedure = db_info.WorkingProcedureCurrent; //解决OP10，OP40同一个的问题
                        }
                        info.UpdatedUserName = logMiddle.MonitoringPoint;
                        SystemBussinessHelper.SetWorkPieceInfoMiddleForUpdateDataCapturePointCname(ref info, logMiddle.DataCapturePointCname);
                        info.UpdatedTime = DateTimeHelper.GetDateTime();
                        info.WorkingProcedureCompleted = info.WorkingProcedureCompleted + logMiddle.WorkingProcedure;//已完成工序
                        if (!(info.WorkingProcedureStartTime.HasValue && info.WorkingProcedureStartTime > DateTime.Parse("1900/01/01")))

                        db_info.WorkingProcedureCurrent = logMiddle.WorkingProcedure;//赋值最新工序 【Editby shaocx,2024-09-03】
                        db_info.UpdatedUserName = logMiddle.MonitoringPoint;
                        SystemBussinessHelper.SetWorkPieceInfoMiddleForUpdateDataCapturePointCname(ref db_info, logMiddle.DataCapturePointCname);
                        db_info.UpdatedTime = DateTimeHelper.GetDateTime();
                        db_info.WorkingProcedureCompleted = db_info.WorkingProcedureCompleted + logMiddle.WorkingProcedure;//已完成工序
                        if (!(db_info.WorkingProcedureStartTime.HasValue && db_info.WorkingProcedureStartTime > DateTime.Parse("1900/01/01")))
                        {//若一直没有工序开始时间，则赋值当前时间
                            info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();
                            db_info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();
                        }
                        info.WorkingProcedureEndTime = DateTimeHelper.GetDateTime();
                        info.WorkPieceCurrentPositionOrder = info.WorkingProcedurePlan.IndexOf(logMiddle.WorkingProcedure) / 2;
                        info.Remarks = $"{logMiddle.WorkingProcedure}工序完成";
                        db_info.WorkingProcedureEndTime = DateTimeHelper.GetDateTime();
                        db_info.WorkPieceCurrentPositionOrder = db_info.WorkingProcedurePlan.IndexOf(logMiddle.WorkingProcedure) / 2;
                        db_info.Remarks = $"{logMiddle.WorkingProcedure}工序完成";
                        long op80id = 0;
                        if (logMiddle.WorkingProcedure.Equals("OP80"))
                        {
                            info.WorkPieceState = (int)WorkPieceState.FinishedProducts;
                            info.WorkPieceLastOfflineTime = DateTimeHelper.GetDateTime();
                            info.WorkPieceCurrentPosition = "OP80";
                            info.CompleteTime = DateTimeHelper.GetDateTime();
                            info.OP80NewCode = logMiddle.OP80NewCode;
                            db_info.WorkPieceState = (int)WorkPieceState.FinishedProducts;
                            db_info.WorkPieceLastOfflineTime = DateTimeHelper.GetDateTime();
                            db_info.WorkPieceCurrentPosition = "OP80";
                            db_info.CompleteTime = DateTimeHelper.GetDateTime();
                            db_info.OP80NewCode = logMiddle.OP80NewCode;

                            //质检数据改为 获取文件后修改 【Editby shaocx,2024-06-15】
                            /*
@@ -1346,11 +1374,11 @@
                        else if (logMiddle.WorkingProcedure.Equals("OP30"))
                        {

                            info.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
                            logMiddle.QualityState = info.QualityState;
                            info.QualityStateUpdateUser = logMiddle.UpdatedUserName;
                            info.QualityStateUpdateTime = logMiddle.UpdatedTime.Value.LocalDateTime;
                            info.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString();
                            db_info.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
                            logMiddle.QualityState = db_info.QualityState;
                            db_info.QualityStateUpdateUser = logMiddle.UpdatedUserName;
                            db_info.QualityStateUpdateTime = logMiddle.UpdatedTime.Value.LocalDateTime;
                            db_info.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString();

                            var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == logMiddle.WorkPieceID).FirstOrDefault();
                            if (qualityData == null || qualityData.WorkPieceID.Length < 1 || qualityData.WorkingProcedure.Length < 1)
@@ -1358,81 +1386,84 @@
                                qualityData = EntityPropHelper.Mapper<QualityDataInfo, WorkPieceLog>(logMiddle);
                                db.QualityDataInfo.Add(GetAddQualityDataInfo(qualityData));
                            }
                            qualityData.QualityStateUpdateUser = info.UpdatedUserName;
                            qualityData.QualityReceiveTime = info.UpdatedTime.Value.LocalDateTime;
                            qualityData.QualityStateUpdateMode = info.QualityStateUpdateMode;
                            qualityData.QualityStateUpdateUser = db_info.UpdatedUserName;
                            qualityData.QualityReceiveTime = db_info.UpdatedTime.Value.LocalDateTime;
                            qualityData.QualityStateUpdateMode = db_info.QualityStateUpdateMode;
                            qualityData.OP30QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
                            qualityData.OP30QualityReceiveTime = DateTimeHelper.GetDateTime();
                            loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"质量：{logMiddle.QualityStateStr ?? "空"}";
                            if (!info.QualityState.Equals(((int)QualityState.OK).ToString()))
                            if (!db_info.QualityState.Equals(((int)QualityState.OK).ToString()))
                            {
                                info.QualityErrorInfo = $"{logMiddle.WorkingProcedure}工序质量采集数据不合格";
                                db_info.QualityErrorInfo = $"{logMiddle.WorkingProcedure}工序质量采集数据不合格";
                            }
                            else
                            {
                                info.QualityErrorInfo = "";
                                db_info.QualityErrorInfo = "";
                            }
                        }
                        else
                        {
                            //这里修复OP10、OP40 因为PLC先推 SPC推出、再推 产品下线问题，导致 产品下线更新数据时，把SPC数据覆盖的问题 【Editby shaocx,2024-08-27】
                            var isAlow = SystemBussinessHelper.IsAllowUpdateWorkPieceStateToWip(info, db, logMiddle);
                            var isAlow = SystemBussinessHelper.IsAllowUpdateWorkPieceStateToWip(db_info, db, logMiddle);
                            if (isAlow)
                            {
                                info.WorkPieceState = (int)WorkPieceState.WIP;
                                db_info.WorkPieceState = (int)WorkPieceState.WIP;
                            }


                            if (info.WorkingProcedurePlan.IndexOf(logMiddle.WorkingProcedure) + 4 <= info.WorkingProcedurePlan.Length)
                            if (db_info.WorkingProcedurePlan.IndexOf(logMiddle.WorkingProcedure) + 4 <= db_info.WorkingProcedurePlan.Length)
                            {
                                info.WorkPieceCurrentPosition = info.WorkingProcedurePlan.Substring(info.WorkingProcedurePlan.IndexOf(logMiddle.WorkingProcedure), 8);
                                db_info.WorkPieceCurrentPosition = db_info.WorkingProcedurePlan.Substring(db_info.WorkingProcedurePlan.IndexOf(logMiddle.WorkingProcedure), 8);
                            }
                        }

                        var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == logMiddle.WorkPieceID && o.WorkingProcedureCurrent == info.WorkingProcedureCurrent && o.OperationType == OperationType.生产.ToString()).OrderByDescending(o => o.StartTime).FirstOrDefault();
                        var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == logMiddle.WorkPieceID
                        && o.WorkingProcedureCurrent == db_info.WorkingProcedureCurrent
                        && o.OperationType == OperationType.生产.ToString()).OrderByDescending(o => o.StartTime).FirstOrDefault();
                        if (pro == null || pro.WorkPieceID.Length < 1)
                        {
                            WorkPieceProcess process = new WorkPieceProcess();
                            process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(info);
                            QualityStateHelper.ResetQualityNoOkForNewProcess(ref process);
                            process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                            process.StartTime = DateTimeHelper.GetDateTime();
                            process.EndTime = DateTimeHelper.GetDateTime();
                            WorkPieceProcess add_process = new WorkPieceProcess();
                            add_process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(db_info);
                            QualityStateHelper.ResetQualityNoOkForNewProcess(ref add_process);
                            add_process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                            add_process.StartTime = DateTimeHelper.GetDateTime().AddSeconds(-SystemBussinessHelper.MoNiTimeForWorkingProcedure(logMiddle.WorkingProcedure));
                            add_process.EndTime = DateTimeHelper.GetDateTime();
                            if (logMiddle.WorkingProcedure.Equals("OP80"))
                            {//OP80的质量数据是后来获取文件搞的
                             //质检数据，再考虑 另外两种状态  【Editby shaocx,2024-08-27】
                                QualityStateHelper.SetQualityStateForOP80(logMiddle, ref info, ref process);
                                QualityStateHelper.SetQualityStateForOP80(logMiddle, ref db_info, ref add_process);
                            }
                            else
                            {
                                //不再默认赋值为合格 【Editby shaocx,2024-08-16】
                                //process.QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value : (int)QualityState.OK;//默认合格，已处理
                                process.QualityState = WorkPieceInfoManager.GetQualityStateValue(logMiddle.QualityState);
                                add_process.QualityState = WorkPieceInfoManager.GetQualityStateValue(logMiddle.QualityState);
                            }
                            process.CreatedUserName = logMiddle.MonitoringPoint;
                            process.DataCapturePointCname = logMiddle.DataCapturePointCname;
                            process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            process.UpdatedUserName = logMiddle.MonitoringPoint;
                            process.UpdateDataCapturePointCname = logMiddle.DataCapturePointCname;
                            process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            process.OperationType = OperationType.生产.ToString();
                            process.Remarks = "";
                            add_process.CreatedUserName = logMiddle.MonitoringPoint;
                            add_process.DataCapturePointCname = logMiddle.DataCapturePointCname;
                            add_process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            add_process.UpdatedUserName = logMiddle.MonitoringPoint;
                            add_process.UpdateDataCapturePointCname = logMiddle.DataCapturePointCname;
                            add_process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            add_process.OperationType = OperationType.生产.ToString();
                            add_process.Remarks = "";
                            add_process.MyRemarks = "工序完成时，如果找不到就新建";
                            if (logMiddle.WorkingProcedure.Equals("OP80"))
                            {
                                process.GetQcDataFlag = logMiddle.GetQcDataFlag;//赋值标记 [Editby shaocx,2024-06-15]
                                add_process.GetQcDataFlag = logMiddle.GetQcDataFlag;//赋值标记 [Editby shaocx,2024-06-15]
                            }
                            if (op80id > 0)
                            {
                                process.QualityDataInfoID = op80id;
                                add_process.QualityDataInfoID = op80id;
                            }
                            db.WorkPieceProcess.Add(process);
                            db.WorkPieceProcess.Add(add_process);
                        }
                        else
                        {
                            if (logMiddle.WorkingProcedure.Equals("OP80"))
                            {//OP80的质量数据是后来获取文件搞的
                             //质检数据，再考虑 另外两种状态  【Editby shaocx,2024-08-27】
                                QualityStateHelper.SetQualityStateForOP80(logMiddle, ref info, ref pro);
                                QualityStateHelper.SetQualityStateForOP80(logMiddle, ref db_info, ref pro);
                            }
                            if (op80id > 0)
                            {
@@ -1454,9 +1485,9 @@

                        if (isAddWorkPieceInfo)
                        {
                            db.WorkPieceInfo.Add(info);
                            db.WorkPieceInfo.Add(db_info);
                        }
                        db.WorkPieceInfoLog.Add(GetAddWorkPieceInfoLog(info));
                        db.WorkPieceInfoLog.Add(GetAddWorkPieceInfoLog(db_info));
                    }
                    else
                    {
@@ -2434,10 +2465,10 @@
                //特殊逻辑：按照OP30的顺序判断
                if (logMiddle.QualityNoOk != null && qualityNoOk != null
                    && (
                      qualityNoOk == (int)QualityNoOkEnum.OP30压衬套工位力矩大
                      || qualityNoOk == (int)QualityNoOkEnum.OP30涨断工位力矩大
                      || qualityNoOk == (int)QualityNoOkEnum.OP30终拧紧工位力矩大
                      || qualityNoOk == (int)QualityNoOkEnum.OP30预拧紧工位力矩大
                      qualityNoOk == (int)QualityNoOkEnum.OP30压衬套工位力矩超差
                      || qualityNoOk == (int)QualityNoOkEnum.OP30涨断工位力矩超差
                      || qualityNoOk == (int)QualityNoOkEnum.OP30终拧紧工位力矩超差
                      || qualityNoOk == (int)QualityNoOkEnum.OP30预拧紧工位力矩超差
                    )
                    )
                {
@@ -2726,7 +2757,7 @@
            {//合格/不合格由 QualityStateStr值判断
                if (logMiddle.QualityState == (int)QualityState.NG)
                {
                    qualityNoOkEnum = QualityNoOkEnum.OP35滚压力不合格;
                    qualityNoOkEnum = QualityNoOkEnum.OP35滚压力超差;
                }
                else
                {