schangxiang@126.com
2024-06-09 d5f80f2bae790fd13c159ff59568766b22495e30
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -146,7 +146,8 @@
                    item.UpdatedTime= DateTime.Now;
                }
            }catch(Exception ex)
            }
            catch (Exception ex)
            {
               loginfo.Remarks = (loginfo.Remarks ?? "") + $"{loginfo.WorkPieceID ?? "空"}刀具寿命更新数据异常{ex.Message}";
@@ -693,6 +694,11 @@
                            pro.QualityState = info.QualityState.HasValue ? info.QualityState.Value : 9;
                            //TODO:判断如果是60工序,那么就要更新pro表的创建人为loginfo.MonitoringPoint 【Editby shaocx,2024-06-05】
                            if (loginfo.WorkingProcedure == "OP60")
                            {
                                pro.CreatedUserName = loginfo.MonitoringPoint;
                            }
                        }
                        if (loginfo.QualityType!=null&& loginfo.QualityType.Equals(QualityType.SPC.ToString()))
@@ -705,7 +711,7 @@
                                //时间段结束时间:抽检工件质量结果出现后的时间
                                //抽检工件工序扫描枪外入口处的第一个工件 也把质量状态置为疑似
                                //(每一工序SPC抽检是设置的固定的,比如200抽4,状态置为疑似时若工件还在设备内,会继续生产完毕后排出)
                                //目前这块逻辑放到了 WebAPI中了
                            }
@@ -845,7 +851,8 @@
            {
                WorkPieceLog loginfo2 = new WorkPieceLog();
                loginfo2 = EntityPropHelper.Mapper<WorkPieceLog, WorkPieceLogMiddle>(loginfo);
                try {
                try
                {
                    if ((loginfo.WorkPieceID != null && loginfo.WorkPieceID.Trim('\0').Length == 22) 
                        //|| !((loginfo.WorkingProcedure.Equals("OP10") || loginfo.WorkingProcedure.Equals("OP40")) && loginfo.Remarks.Length > 0)
                        )
@@ -1144,7 +1151,8 @@
            using (DbModel db = new DbModel())
            {
                bool isAddAlert = false;
                try {
                try
                {
                    var equipmentlist = db.EquipmentBaseInfo.Where(o=>o.IsDeleted==false).ToList();
                    var alertlist = db.v_get_equipment_alert.Where(o => o.IsDeleted == false).ToList();
@@ -1262,7 +1270,8 @@
                            {
                                db.v_get_equipment_alert.Add(alert);
                            }
                        }catch(Exception ex)
                        }
                        catch (Exception ex)
                        {
                            Log4NetHelper.WriteErrorLog(type, $" {item.EquipmentName}设备计算告警时异常:");