修复肤质

schangxiang@126.com

2024-09-13 927deebbdd29dbf135695dd76a2521abc360592b

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/2_QualityInfoCompleteManager.cs

@@ -5,6 +5,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web.UI.WebControls;

namespace iWare_SCADA_BusinessLogical.BLL.Important
{
@@ -67,9 +68,11 @@
                            }
                            else
                            {
                                loginfo2.Remarks = $"|工件{logMiddle.WorkPieceID} 质量检测完成工序{logMiddle.MonitoringPoint} 没有获取到工件信息不做更新";
                                Log4NetHelper.WriteErrorLog(type, $"工件{logMiddle.WorkPieceID} 质量检测完成工序{logMiddle.MonitoringPoint} 没有获取到工件信息不做更新");
                                return;
                                loginfo2.Remarks = $"|工件{logMiddle.WorkPieceID} 质量检测完成工序{logMiddle.MonitoringPoint} 没有获取到工件信息,此时需要新增数据";
                                Log4NetHelper.WriteErrorLog(type, $"工件{logMiddle.WorkPieceID} 质量检测完成工序{logMiddle.MonitoringPoint} 没有获取到工件信息,此时需要新增数据");

                                //新增数据 【Editby shaocx,2024-09-07】
                                WorkPieceInfoHelper.CreateWorkPieceInfoForNoData(logMiddle, ref pieceInfo, ref isAddWorkPieceInfo);
                            }
                        }
                        if (logMiddle.MonitoringPoint.Equals("OP1002") || logMiddle.MonitoringPoint.Equals("OP1003") || logMiddle.MonitoringPoint.Contains("OP2002"))
@@ -301,6 +304,7 @@

                            process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                            process.CreatedUserName = WorkPieceInfoManager.ResetUpdatedUserName(logMiddle);
                            process.JiaJuGongWei = logMiddle.JiaJuGongWei;
                            process.DataCapturePointCname = logMiddle.DataCapturePointCname;
                            process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            process.UpdatedUserName = WorkPieceInfoManager.ResetUpdatedUserName(logMiddle);
@@ -423,6 +427,16 @@
                        {
                            db.QualityDataInfo.Add(WorkPieceInfoManager.GetAddQualityDataInfo(qualityData));
                        }

                        //更新表WorkPieceProcess
                        var pro_70 = db.WorkPieceProcess.Where(o => o.WorkPieceID == logMiddle.WorkPieceID && o.WorkingProcedureCurrent == "OP70"
                            ).OrderByDescending(o => o.StartTime).FirstOrDefault();

                        if (pro_70 != null)
                        {
                            pro_70.Update70Flag = 2;
                        }

                        db.SaveChanges();//保存数据
                    }
                    else