DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -456,9 +456,9 @@ /// <summary> /// 质量检测完成 /// </summary> /// <param name="loginfo"></param> /// <param name="logMiddle"></param> /// <param name="type"></param> public static void QualityInfoComplete(WorkPieceLogMiddle loginfo, LogType type) public static void QualityInfoComplete(WorkPieceLogMiddle logMiddle, LogType type) { //此处同时插入了WorkPieceLog，WorkPieceInfoLog表，并新增或修改WorkPieceInfo表 //插入质量相关表QualityDataInfo @@ -468,79 +468,79 @@ bool isAddWorkPieceInfo = false; WorkPieceLog loginfo2 = new WorkPieceLog(); loginfo2 = EntityPropHelper.Mapper<WorkPieceLog, WorkPieceLogMiddle>(loginfo); loginfo2 = EntityPropHelper.Mapper<WorkPieceLog, WorkPieceLogMiddle>(logMiddle); try { if (loginfo.WorkPieceID.Length == 22) if (logMiddle.WorkPieceID.Length == 22) {//获取到的工件号异常 WorkPieceInfo info = new WorkPieceInfo(); info = db.WorkPieceInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault(); if (info == null || info.WorkPieceID.Length < 1) WorkPieceInfo pieceInfo = new WorkPieceInfo(); pieceInfo = db.WorkPieceInfo.Where(o => o.WorkPieceID == logMiddle.WorkPieceID).FirstOrDefault(); if (pieceInfo == null || pieceInfo.WorkPieceID.Length < 1) {//没有工件信息，不做更新 if (loginfo.MonitoringPoint.Equals("OP1002") || loginfo.MonitoringPoint.Equals("OP1003") || loginfo.MonitoringPoint.Contains("OP2002")) if (logMiddle.MonitoringPoint.Equals("OP1002") || logMiddle.MonitoringPoint.Equals("OP1003") || logMiddle.MonitoringPoint.Contains("OP2002")) {//OP10 没有上线扫码枪，约定用测量完成信号当上线标记 info = EntityPropHelper.Mapper<WorkPieceInfo, WorkPieceLogMiddle>(loginfo); pieceInfo = EntityPropHelper.Mapper<WorkPieceInfo, WorkPieceLogMiddle>(logMiddle); //EntityPropHelper<WorkPieceLog, WorkPieceInfo>.CopyProp(loginfo, info, loginfo.GetWorkPieceInfoDict()); if (!loginfo.WorkingProcedure.Equals("OP05")) if (!logMiddle.WorkingProcedure.Equals("OP05")) {//当工件二维码第一次出现的工序不是OP05，则设置为可疑状态 info.QualityState = (int)QualityState.Suspected; info.QualityErrorInfo = $"工件二维码第一次出现的工序{loginfo.MonitoringPoint}不是OP05,数据缺失,请确认情况并做相应处理！"; info.Remarks = $"工件二维码第一次出现的工序{loginfo.WorkingProcedure}不是OP05,数据缺失,请确认情况并做相应处理！"; pieceInfo.QualityState = (int)QualityState.Suspected; pieceInfo.QualityErrorInfo = $"工件二维码第一次出现的工序{logMiddle.MonitoringPoint}不是OP05,数据缺失,请确认情况并做相应处理！"; pieceInfo.Remarks = $"工件二维码第一次出现的工序{logMiddle.WorkingProcedure}不是OP05,数据缺失,请确认情况并做相应处理！"; } else { info.QualityState = (int)QualityState.OK;//此处需要注意，判断所有工序质量，然后再赋值 info.Remarks = "OP05新增工件信息"; pieceInfo.QualityState = (int)QualityState.OK;//此处需要注意，判断所有工序质量，然后再赋值 pieceInfo.Remarks = "OP05新增工件信息"; } info.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime(); info.WorkingProcedurePlan = ConfigHelper.GetConfigString("WorkingProcedureAllStr") ?? "OP05OP10OP20OP30OP35OP40OP50OP60OP70OP80"; info.CreatedUserName = loginfo.MonitoringPoint; info.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local); info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();// info.WorkingProcedureEndTime = null; info = ParseQRCode(info); pieceInfo.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime(); pieceInfo.WorkingProcedurePlan = ConfigHelper.GetConfigString("WorkingProcedureAllStr") ?? "OP05OP10OP20OP30OP35OP40OP50OP60OP70OP80"; pieceInfo.CreatedUserName = logMiddle.MonitoringPoint; pieceInfo.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local); pieceInfo.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();// pieceInfo.WorkingProcedureEndTime = null; pieceInfo = ParseQRCode(pieceInfo); isAddWorkPieceInfo = true; } else { loginfo2.Remarks = loginfo2.Remarks ?? "" + $"|工件{loginfo.WorkPieceID} 质量检测完成工序{loginfo.MonitoringPoint} 没有获取到工件信息不做更新"; Log4NetHelper.WriteErrorLog(type, $"工件{loginfo.WorkPieceID} 质量检测完成工序{loginfo.MonitoringPoint} 没有获取到工件信息不做更新"); loginfo2.Remarks = loginfo2.Remarks ?? "" + $"|工件{logMiddle.WorkPieceID} 质量检测完成工序{logMiddle.MonitoringPoint} 没有获取到工件信息不做更新"; Log4NetHelper.WriteErrorLog(type, $"工件{logMiddle.WorkPieceID} 质量检测完成工序{logMiddle.MonitoringPoint} 没有获取到工件信息不做更新"); return; } } if (loginfo.MonitoringPoint.Equals("OP1002") || loginfo.MonitoringPoint.Equals("OP1003") || loginfo.MonitoringPoint.Contains("OP2002")) if (logMiddle.MonitoringPoint.Equals("OP1002") || logMiddle.MonitoringPoint.Equals("OP1003") || logMiddle.MonitoringPoint.Contains("OP2002")) {// OP10 没有上线扫码枪，约定用测量完成信号当上线标记，所以上线需要修改的字段放这里 if (loginfo.WorkingProcedure.Equals("OP10")) if (logMiddle.WorkingProcedure.Equals("OP10")) { var WorkingProcedure = (loginfo.MonitoringPoint.Equals("OP1002") ? "OP10" : "OP40"); var WorkingProcedure = (logMiddle.MonitoringPoint.Equals("OP1002") ? "OP10" : "OP40"); loginfo2.WorkingProcedure = WorkingProcedure;//解决OP10，OP40同一个的问题 loginfo.WorkingProcedure = WorkingProcedure;//解决OP10，OP40同一个的问题 logMiddle.WorkingProcedure = WorkingProcedure;//解决OP10，OP40同一个的问题 } info.WorkPieceCurrentPosition = loginfo.WorkingProcedure; info.WorkPieceCurrentPositionOrder = info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2; info.WorkingProcedureCurrent = loginfo.WorkingProcedure; info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime(); pieceInfo.WorkPieceCurrentPosition = logMiddle.WorkingProcedure; pieceInfo.WorkPieceCurrentPositionOrder = pieceInfo.WorkingProcedurePlan.IndexOf(logMiddle.WorkingProcedure) / 2; pieceInfo.WorkingProcedureCurrent = logMiddle.WorkingProcedure; pieceInfo.WorkingProcedureStartTime = DateTimeHelper.GetDateTime(); #region 更新设备实时表 bool isAddEquipmentCurrentMonitor = false; EquipmentCurrentMonitor equinfo = new EquipmentCurrentMonitor(); equinfo = db.EquipmentCurrentMonitor.Where(o => o.EquipmentID == loginfo.EquipmentID).FirstOrDefault(); equinfo = db.EquipmentCurrentMonitor.Where(o => o.EquipmentID == logMiddle.EquipmentID).FirstOrDefault(); if (equinfo == null || equinfo.Id < 1) {//没有工件信息，不做更新 Log4NetHelper.WriteErrorLog(type, $"设备{loginfo.EquipmentID} 告警监控{loginfo.WorkingProcedure} 没有获取到设备监控信息，现新增"); equinfo = EntityPropHelper.Mapper<EquipmentCurrentMonitor, WorkPieceLog>(loginfo); Log4NetHelper.WriteErrorLog(type, $"设备{logMiddle.EquipmentID} 告警监控{logMiddle.WorkingProcedure} 没有获取到设备监控信息，现新增"); equinfo = EntityPropHelper.Mapper<EquipmentCurrentMonitor, WorkPieceLog>(logMiddle); equinfo.OnlineTime = DateTime.Now; isAddEquipmentCurrentMonitor = true; } else {//更新工件 equinfo.WorkPieceID = loginfo.WorkPieceID; equinfo.UpdatedUserName = loginfo.MonitoringPoint; equinfo.WorkPieceID = logMiddle.WorkPieceID; equinfo.UpdatedUserName = logMiddle.MonitoringPoint; equinfo.UpdatedTime = DateTime.Now; equinfo.OnlineTime = DateTime.Now; } @@ -552,90 +552,93 @@ #endregion //UpdateKnifeToolLift(db, loginfo);//更新刀具寿命信息 } info.WorkPieceState = (int)WorkPieceState.WIP;//推出后和SPC抽检后 质量录入时状态修改回在制品 info.EquipmentID = loginfo.EquipmentID; info.QualityStateUpdateUser = loginfo.UpdatedUserName; info.QualityStateUpdateTime = loginfo.UpdatedTime.Value.LocalDateTime; info.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString(); info.Remarks = info.Remarks ?? "" + $"{loginfo.WorkingProcedure}质量检测完成修改"; info.UpdatedUserName = loginfo.MonitoringPoint; info.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local); if (!(info.WorkingProcedureStartTime.HasValue && info.WorkingProcedureStartTime > DateTime.Parse("1900/01/01"))) pieceInfo.WorkPieceState = (int)WorkPieceState.WIP;//推出后和SPC抽检后 质量录入时状态修改回在制品 pieceInfo.EquipmentID = logMiddle.EquipmentID; pieceInfo.QualityStateUpdateUser = logMiddle.UpdatedUserName; pieceInfo.QualityStateUpdateTime = logMiddle.UpdatedTime.Value.LocalDateTime; pieceInfo.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString(); pieceInfo.Remarks = pieceInfo.Remarks ?? "" + $"{logMiddle.WorkingProcedure}质量检测完成修改"; pieceInfo.UpdatedUserName = logMiddle.MonitoringPoint; pieceInfo.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local); if (!(pieceInfo.WorkingProcedureStartTime.HasValue && pieceInfo.WorkingProcedureStartTime > DateTime.Parse("1900/01/01"))) {//工序开始时间没有则赋值 info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime(); pieceInfo.WorkingProcedureStartTime = DateTimeHelper.GetDateTime(); } info.QualityState = (int)((loginfo.QualityStateStr.Equals("OK") || loginfo.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG); pieceInfo.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG); //赋值不合格原因 SetQualityNoOk_WorkPieceInfo(logMiddle, ref pieceInfo); if (!info.QualityState.Equals(((int)QualityState.OK).ToString())) if (!pieceInfo.QualityState.Equals(((int)QualityState.OK).ToString())) { info.QualityErrorInfo = $"{loginfo.WorkingProcedure}工序质量采集数据不合格{info.QualityState}"; pieceInfo.QualityErrorInfo = $"{logMiddle.WorkingProcedure}工序质量采集数据不合格{pieceInfo.QualityState}"; } else { info.QualityErrorInfo = ""; pieceInfo.QualityErrorInfo = ""; } loginfo.QualityState = info.QualityState; logMiddle.QualityState = pieceInfo.QualityState; if (isAddWorkPieceInfo) { db.WorkPieceInfo.Add(info); db.WorkPieceInfo.Add(pieceInfo); } #region 根据标准值更新最新质量数据（OP10/OP40/OP20/OP60） var qcofig = db.EquipmentQualityConfig.Where(o => o.WorkingProcedure.Equals(loginfo.WorkingProcedure) && o.ParamType != 1 && o.IsDeleted == false).ToList(); var qcofig = db.EquipmentQualityConfig.Where(o => o.WorkingProcedure.Equals(logMiddle.WorkingProcedure) && o.ParamType != 1 && o.IsDeleted == false).ToList(); if (qcofig.Count > 0) { QualityDataHand(loginfo, qcofig); QualityDataHand(logMiddle, qcofig); } #endregion var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault(); var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == logMiddle.WorkPieceID).FirstOrDefault(); if (qualityData == null || qualityData.WorkPieceID.Length < 1 || qualityData.WorkingProcedure.Length < 1) {//插入QualityDataInfo表 qualityData = EntityPropHelper.Mapper<QualityDataInfo, WorkPieceLog>(loginfo); qualityData = EntityPropHelper.Mapper<QualityDataInfo, WorkPieceLog>(logMiddle); db.QualityDataInfo.Add(GetAddQualityDataInfo(qualityData)); } //修改QualityDataInfo表 //重复收到质量信息，会覆盖之前的 EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(loginfo, qualityData, GetQualityDataInfoUpdate(loginfo.WorkingProcedure, loginfo.MonitoringPoint));//指定修改字段 EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(logMiddle, qualityData, GetQualityDataInfoUpdate(logMiddle, logMiddle.WorkingProcedure, logMiddle.MonitoringPoint));//指定修改字段 qualityData.QualityStateUpdateUser = info.UpdatedUserName; qualityData.QualityReceiveTime = info.UpdatedTime.Value.LocalDateTime; qualityData.QualityStateUpdateMode = info.QualityStateUpdateMode; if (loginfo.WorkingProcedure.Equals("OP10")) qualityData.QualityStateUpdateUser = pieceInfo.UpdatedUserName; qualityData.QualityReceiveTime = pieceInfo.UpdatedTime.Value.LocalDateTime; qualityData.QualityStateUpdateMode = pieceInfo.QualityStateUpdateMode; if (logMiddle.WorkingProcedure.Equals("OP10")) { qualityData.OP10QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3"; qualityData.OP10QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3"; qualityData.OP10QualityReceiveTime = DateTimeHelper.GetDateTime(); } else if (loginfo.WorkingProcedure.Equals("OP20")) else if (logMiddle.WorkingProcedure.Equals("OP20")) { //Log4NetHelper.WriteErrorLog(type, $" {loginfo.WorkingProcedure}质量信息【{loginfo.QualityStateStr ?? "空"}】" + // $"【{(loginfo.QualityState.HasValue? loginfo.QualityState.Value:999)}】【{(info.QualityState.HasValue ? info.QualityState.Value : 888)}】 读取工件码数据[{loginfo.WorkPieceID ?? "空"}]"); qualityData.OP20QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3"; qualityData.OP20QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3"; qualityData.OP20QualityReceiveTime = DateTimeHelper.GetDateTime(); qualityData.OP20QualityFilePath = loginfo.OP20QualityFilePath; qualityData.OP20QualityFilePath = logMiddle.OP20QualityFilePath; } else if (loginfo.WorkingProcedure.Equals("OP30")) else if (logMiddle.WorkingProcedure.Equals("OP30")) { switch (loginfo.MonitoringPoint) switch (logMiddle.MonitoringPoint) { case "OP3002CH3": qualityData.OP30QualityFilePathCH3 = loginfo.OP30QualityFilePathCH3; qualityData.OP30QualityStateCH3 = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3"; qualityData.OP30QualityFilePathCH3 = logMiddle.OP30QualityFilePathCH3; qualityData.OP30QualityStateCH3 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3"; qualityData.OP30QualityReceiveTimeCH3 = DateTimeHelper.GetDateTime(); break; case "OP3002CH4": qualityData.OP30QualityFilePathCH4 = loginfo.OP30QualityFilePathCH4; qualityData.OP30QualityStateCH4 = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3"; qualityData.OP30QualityFilePathCH4 = logMiddle.OP30QualityFilePathCH4; qualityData.OP30QualityStateCH4 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3"; qualityData.OP30QualityReceiveTimeCH4 = DateTimeHelper.GetDateTime(); break; case "OP3002CH5": qualityData.OP30QualityFilePathCH5 = loginfo.OP30QualityFilePathCH5; qualityData.OP30QualityStateCH5 = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3"; qualityData.OP30QualityFilePathCH5 = logMiddle.OP30QualityFilePathCH5; qualityData.OP30QualityStateCH5 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3"; qualityData.OP30QualityReceiveTimeCH5 = DateTimeHelper.GetDateTime(); break; case "OP3002CH6": qualityData.OP30QualityFilePathCH6 = loginfo.OP30QualityFilePathCH6; qualityData.OP30QualityStateCH6 = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3"; qualityData.OP30QualityFilePathCH6 = logMiddle.OP30QualityFilePathCH6; qualityData.OP30QualityStateCH6 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3"; qualityData.OP30QualityReceiveTimeCH6 = DateTimeHelper.GetDateTime(); break; default: @@ -644,42 +647,46 @@ //qualityData.OP30QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3"; //qualityData.OP30QualityReceiveTime = DateTimeHelper.GetDateTime(); } else if (loginfo.WorkingProcedure.Equals("OP35")) else if (logMiddle.WorkingProcedure.Equals("OP35")) { qualityData.OP35QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3"; qualityData.OP35QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3"; qualityData.OP35QualityReceiveTime = DateTimeHelper.GetDateTime(); } else if (loginfo.WorkingProcedure.Equals("OP40")) else if (logMiddle.WorkingProcedure.Equals("OP40")) { qualityData.OP40QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3"; qualityData.OP40QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3"; qualityData.OP40QualityReceiveTime = DateTimeHelper.GetDateTime(); } else if (loginfo.WorkingProcedure.Equals("OP60")) else if (logMiddle.WorkingProcedure.Equals("OP60")) { qualityData.OP60QualityFilePath = loginfo.OP60QualityFilePath; qualityData.OP60QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3"; qualityData.OP60QualityFilePath = logMiddle.OP60QualityFilePath; qualityData.OP60QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3"; qualityData.OP60QualityReceiveTime = DateTimeHelper.GetDateTime(); } else if (loginfo.WorkingProcedure.Equals("OP80")) else if (logMiddle.WorkingProcedure.Equals("OP80")) { qualityData.OP80QualityFilePath = loginfo.OP80QualityFilePath; qualityData.OP80QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3"; qualityData.OP80QualityFilePath = logMiddle.OP80QualityFilePath; qualityData.OP80QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3"; qualityData.OP80QualityReceiveTime = DateTimeHelper.GetDateTime(); } var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && o.WorkingProcedureCurrent == info.WorkingProcedureCurrent && o.OperationType == OperationType.生产.ToString()).OrderByDescending(o => o.StartTime).FirstOrDefault(); if (pro == null || pro.WorkPieceID.Length < 1 || loginfo.MonitoringPoint.Equals("OP1002") || loginfo.MonitoringPoint.Equals("OP1003") || loginfo.MonitoringPoint.Contains("OP2002")) var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == logMiddle.WorkPieceID && o.WorkingProcedureCurrent == pieceInfo.WorkingProcedureCurrent && o.OperationType == OperationType.生产.ToString()).OrderByDescending(o => o.StartTime).FirstOrDefault(); if (pro == null || pro.WorkPieceID.Length < 1 || logMiddle.MonitoringPoint.Equals("OP1002") || logMiddle.MonitoringPoint.Equals("OP1003") || logMiddle.MonitoringPoint.Contains("OP2002")) {// OP10 没有上线扫码枪，约定用测量完成信号当上线标记，所以上线需要修改的字段放这里 //上线是每次都插入 WorkPieceProcess process = new WorkPieceProcess(); process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(info); process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(pieceInfo); process.StartTime = DateTimeHelper.GetDateTime(); process.QualityState = info.QualityState.HasValue ? info.QualityState.Value : (int)QualityState.OK; process.QualityState = pieceInfo.QualityState.HasValue ? pieceInfo.QualityState.Value : (int)QualityState.OK; //记录质量不合格原因 【Editby shaocx,2024-06-26】 //赋值不合格原因 SetQualityNoOk_WorkPieceProcess(logMiddle, ref process); process.Id = Yitter.IdGenerator.YitIdHelper.NextId(); process.CreatedUserName = loginfo.MonitoringPoint; process.CreatedUserName = logMiddle.MonitoringPoint; process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local); process.UpdatedUserName = loginfo.MonitoringPoint; process.UpdatedUserName = logMiddle.MonitoringPoint; process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local); process.OperationType = OperationType.生产.ToString(); process.QualityDataInfoID = qualityData.Id; @@ -689,21 +696,23 @@ else {//其他的都只是修改 pro.QualityDataInfoID = qualityData.Id; pro.UpdatedUserName = loginfo.MonitoringPoint; pro.UpdatedUserName = logMiddle.MonitoringPoint; pro.UpdatedTime = DateTimeHelper.GetDateTime(); pro.QualityState = info.QualityState.HasValue ? info.QualityState.Value : 9; pro.QualityState = pieceInfo.QualityState.HasValue ? pieceInfo.QualityState.Value : 9; //赋值不合格原因 SetQualityNoOk_WorkPieceProcess(logMiddle, ref pro); //TODO:判断如果是60工序，那么就要更新pro表的创建人为loginfo.MonitoringPoint 【Editby shaocx,2024-06-05】 if (loginfo.WorkingProcedure == "OP60") if (logMiddle.WorkingProcedure == "OP60") { pro.CreatedUserName = loginfo.MonitoringPoint; pro.CreatedUserName = logMiddle.MonitoringPoint; } } if (loginfo.QualityType != null && loginfo.QualityType.Equals(QualityType.SPC.ToString())) if (logMiddle.QualityType != null && logMiddle.QualityType.Equals(QualityType.SPC.ToString())) {//SPC反馈， if (loginfo.QualityState != (int)QualityState.OK) if (logMiddle.QualityState != (int)QualityState.OK) { //当某到工序检测到不合格工件时，从该工件加工完成时刻前指定时间起至报检不合格时间止，系统将该工件的最后加工工序在该时间段内加工的所有工件、正在加工的工件、该工序入口处的第一个工件全部标记为疑似状态，由人工复检工件并修改状态，并支持批量变更。 //答复：在线测量不需要走这个流程，只有SPC抽检才需要，需要把这时间段的工件全部置为疑似，哪怕是已完成工件 @@ -716,24 +725,24 @@ } } db.WorkPieceInfoLog.Add(GetAddWorkPieceInfoLog(info)); db.WorkPieceInfoLog.Add(GetAddWorkPieceInfoLog(pieceInfo)); db.QualityDataInfoLog.Add(GetAddQualityDataInfoLog(qualityData));//插入日志 } else { loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"质量检测完成读取二维码{loginfo.WorkPieceID ?? "空"}异常"; Log4NetHelper.WriteErrorLog(type, $" {loginfo.WorkingProcedure}工序监控读码标记 读取工件码数据[{loginfo.WorkPieceID ?? "空"}]时异常："); loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"质量检测完成读取二维码{logMiddle.WorkPieceID ?? "空"}异常"; Log4NetHelper.WriteErrorLog(type, $" {logMiddle.WorkingProcedure}工序监控读码标记 读取工件码数据[{logMiddle.WorkPieceID ?? "空"}]时异常："); } } catch (Exception ex) { loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"质量检测完成{loginfo.WorkPieceID ?? "空"}更新数据异常{ex.Message}++{ex.StackTrace}"; Log4NetHelper.WriteErrorLog(type, $" {loginfo.WorkingProcedure}工序监控读码标记 读取工件码数据[{loginfo.WorkPieceID ?? "空"}]时异常："); loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"质量检测完成{logMiddle.WorkPieceID ?? "空"}更新数据异常{ex.Message}++{ex.StackTrace}"; Log4NetHelper.WriteErrorLog(type, $" {logMiddle.WorkingProcedure}工序监控读码标记 读取工件码数据[{logMiddle.WorkPieceID ?? "空"}]时异常："); } finally { loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"质量：{loginfo.QualityStateStr ?? "空"}"; loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"质量：{logMiddle.QualityStateStr ?? "空"}"; db.WorkPieceLog.Add(GetAddWorkPieceLog(loginfo2));//插入工件采集日志表 db.SaveChanges(); } @@ -941,37 +950,43 @@ /// <summary> /// 工序完成 /// </summary> /// <param name="loginfo"></param> /// <param name="logMiddle"></param> /// <param name="type"></param> public static void WorkingProcedureComplete(WorkPieceLogMiddle loginfo, LogType type) public static void WorkingProcedureComplete(WorkPieceLogMiddle logMiddle, LogType type) { using (DbModel db = new DbModel()) { if (logMiddle.WorkingProcedure.Equals("OP70")) { logMiddle.QualityState = (int)QualityState.OK; //如果是OP70，则默认是合格 【Editby shaocx,2024-06-25】 } WorkPieceLog loginfo2 = new WorkPieceLog(); loginfo2 = EntityPropHelper.Mapper<WorkPieceLog, WorkPieceLogMiddle>(loginfo); loginfo2 = EntityPropHelper.Mapper<WorkPieceLog, WorkPieceLogMiddle>(logMiddle); try { if (loginfo.WorkPieceID != null && loginfo.WorkPieceID.Trim('\0').Length == 22) if (logMiddle.WorkPieceID != null && logMiddle.WorkPieceID.Trim('\0').Length == 22) { bool isAddWorkPieceInfo = false; WorkPieceInfo info = new WorkPieceInfo(); info = db.WorkPieceInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault(); info = db.WorkPieceInfo.Where(o => o.WorkPieceID == logMiddle.WorkPieceID).FirstOrDefault(); if (info == null || info.WorkPieceID.Length < 1) {//没有工件信息，不做更新 （为了测试先先新增） Log4NetHelper.WriteErrorLog(type, $"工件{loginfo.WorkPieceID} 工件推出工序{loginfo.WorkingProcedure} 没有获取到工件信息不做更新"); Log4NetHelper.WriteErrorLog(type, $"工件{logMiddle.WorkPieceID} 工件推出工序{logMiddle.WorkingProcedure} 没有获取到工件信息不做更新"); //db.WorkPieceLog.Add(GetAddWorkPieceLog(loginfo));//插入工件采集日志表 //db.SaveChanges(); loginfo2 = CommonManager.Instance.GetWorkPieceID(loginfo, type); info = EntityPropHelper.Mapper<WorkPieceInfo, WorkPieceLog>(loginfo); loginfo2 = CommonManager.Instance.GetWorkPieceID(logMiddle, type); info = EntityPropHelper.Mapper<WorkPieceInfo, WorkPieceLog>(logMiddle); //EntityPropHelper<WorkPieceLog, WorkPieceInfo>.CopyProp(loginfo, info, loginfo.GetWorkPieceInfoDict()); if (!loginfo.WorkingProcedure.Equals("OP05")) if (!logMiddle.WorkingProcedure.Equals("OP05")) {//当工件二维码第一次出现的工序不是OP05，则设置为可疑状态 info.QualityState = (int)QualityState.Suspected; info.QualityErrorInfo = $"工件二维码第一次出现的工序{loginfo.MonitoringPoint}不是OP05,数据缺失,请确认情况并做相应处理！"; info.Remarks = $"工件二维码第一次出现的工序{loginfo.MonitoringPoint}不是OP05,数据缺失,请确认情况并做相应处理！"; info.QualityErrorInfo = $"工件二维码第一次出现的工序{logMiddle.MonitoringPoint}不是OP05,数据缺失,请确认情况并做相应处理！"; info.Remarks = $"工件二维码第一次出现的工序{logMiddle.MonitoringPoint}不是OP05,数据缺失,请确认情况并做相应处理！"; } else { @@ -980,37 +995,37 @@ } info.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime();//WorkPieceInitOnlineTime info.WorkingProcedurePlan = ConfigHelper.GetConfigString("WorkingProcedureAllStr") ?? "OP05OP10OP20OP30OP35OP40OP50OP60OP70OP80"; info.CreatedUserName = loginfo.MonitoringPoint; info.CreatedUserName = logMiddle.MonitoringPoint; info.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local); info.WorkingProcedureCurrent = loginfo.WorkingProcedure; info.WorkingProcedureCurrent = logMiddle.WorkingProcedure; info.WorkingProcedureEndTime = null; info = ParseQRCode(info); isAddWorkPieceInfo = true; } if (loginfo.WorkingProcedure.Equals("OP10")) if (logMiddle.WorkingProcedure.Equals("OP10")) { //var WorkingProcedure = (loginfo.MonitoringPoint.Equals("OP1002") ? "OP10" : "OP40"); loginfo2.WorkingProcedure = info.WorkingProcedureCurrent;//解决OP10，OP40同一个的问题 loginfo.WorkingProcedure = info.WorkingProcedureCurrent; //解决OP10，OP40同一个的问题 logMiddle.WorkingProcedure = info.WorkingProcedureCurrent; //解决OP10，OP40同一个的问题 } info.UpdatedUserName = loginfo.MonitoringPoint; info.UpdatedUserName = logMiddle.MonitoringPoint; info.UpdatedTime = DateTimeHelper.GetDateTime(); info.WorkingProcedureCompleted = info.WorkingProcedureCompleted + loginfo.WorkingProcedure;//已完成工序 info.WorkingProcedureCompleted = info.WorkingProcedureCompleted + logMiddle.WorkingProcedure;//已完成工序 if (!(info.WorkingProcedureStartTime.HasValue && info.WorkingProcedureStartTime > DateTime.Parse("1900/01/01"))) {//若一直没有工序开始时间，则赋值当前时间 info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime(); } info.WorkingProcedureEndTime = DateTimeHelper.GetDateTime(); info.WorkPieceCurrentPositionOrder = info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2; info.Remarks = $"{loginfo.WorkingProcedure}工序完成"; info.WorkPieceCurrentPositionOrder = info.WorkingProcedurePlan.IndexOf(logMiddle.WorkingProcedure) / 2; info.Remarks = $"{logMiddle.WorkingProcedure}工序完成"; long op80id = 0; if (loginfo.WorkingProcedure.Equals("OP80")) if (logMiddle.WorkingProcedure.Equals("OP80")) { info.WorkPieceState = (int)WorkPieceState.FinishedProducts; info.WorkPieceLastOfflineTime = DateTimeHelper.GetDateTime(); info.WorkPieceCurrentPosition = "OP80"; info.CompleteTime = DateTimeHelper.GetDateTime(); info.OP80NewCode = loginfo.OP80NewCode; info.OP80NewCode = logMiddle.OP80NewCode; //质检数据改为 获取文件后修改 【Editby shaocx,2024-06-15】 /* @@ -1021,14 +1036,14 @@ info.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString(); //*/ var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault(); var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == logMiddle.WorkPieceID).FirstOrDefault(); if (qualityData == null || qualityData.WorkPieceID.Length < 1 || qualityData.WorkingProcedure.Length < 1) {//插入QualityDataInfo表 qualityData = EntityPropHelper.Mapper<QualityDataInfo, WorkPieceLog>(loginfo); qualityData = EntityPropHelper.Mapper<QualityDataInfo, WorkPieceLog>(logMiddle); db.QualityDataInfo.Add(GetAddQualityDataInfo(qualityData)); } //修改QualityDataInfo表 //重复收到质量信息，会覆盖之前的 EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(loginfo, qualityData, GetQualityDataInfoUpdate(loginfo.WorkingProcedure, loginfo.MonitoringPoint));//指定修改字段 EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(logMiddle, qualityData, GetQualityDataInfoUpdate(logMiddle, logMiddle.WorkingProcedure, logMiddle.MonitoringPoint));//指定修改字段 //质检数据改为 获取文件后修改 【Editby shaocx,2024-06-15】 /* @@ -1050,30 +1065,30 @@ } //*/ } else if (loginfo.WorkingProcedure.Equals("OP30")) else if (logMiddle.WorkingProcedure.Equals("OP30")) { info.QualityState = (int)((loginfo.QualityStateStr.Equals("OK") || loginfo.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG); loginfo.QualityState = info.QualityState; info.QualityStateUpdateUser = loginfo.UpdatedUserName; info.QualityStateUpdateTime = loginfo.UpdatedTime.Value.LocalDateTime; 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(); var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault(); var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == logMiddle.WorkPieceID).FirstOrDefault(); if (qualityData == null || qualityData.WorkPieceID.Length < 1 || qualityData.WorkingProcedure.Length < 1) {//插入QualityDataInfo表 qualityData = EntityPropHelper.Mapper<QualityDataInfo, WorkPieceLog>(loginfo); 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.OP30QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3"; qualityData.OP30QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3"; qualityData.OP30QualityReceiveTime = DateTimeHelper.GetDateTime(); loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"质量：{loginfo.QualityStateStr ?? "空"}"; loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"质量：{logMiddle.QualityStateStr ?? "空"}"; if (!info.QualityState.Equals(((int)QualityState.OK).ToString())) { info.QualityErrorInfo = $"{loginfo.WorkingProcedure}工序质量采集数据不合格"; info.QualityErrorInfo = $"{logMiddle.WorkingProcedure}工序质量采集数据不合格"; } else { @@ -1083,13 +1098,13 @@ else { info.WorkPieceState = (int)WorkPieceState.WIP; if (info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) + 4 <= info.WorkingProcedurePlan.Length) if (info.WorkingProcedurePlan.IndexOf(logMiddle.WorkingProcedure) + 4 <= info.WorkingProcedurePlan.Length) { info.WorkPieceCurrentPosition = info.WorkingProcedurePlan.Substring(info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure), 8); info.WorkPieceCurrentPosition = info.WorkingProcedurePlan.Substring(info.WorkingProcedurePlan.IndexOf(logMiddle.WorkingProcedure), 8); } } var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.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 == info.WorkingProcedureCurrent && o.OperationType == OperationType.生产.ToString()).OrderByDescending(o => o.StartTime).FirstOrDefault(); if (pro == null || pro.WorkPieceID.Length < 1) { WorkPieceProcess process = new WorkPieceProcess(); @@ -1097,22 +1112,22 @@ process.Id = Yitter.IdGenerator.YitIdHelper.NextId(); process.StartTime = DateTimeHelper.GetDateTime(); process.EndTime = DateTimeHelper.GetDateTime(); if (loginfo.WorkingProcedure.Equals("OP80")) if (logMiddle.WorkingProcedure.Equals("OP80")) {//OP80的质量数据是后来获取文件搞的 } else { process.QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value : (int)QualityState.OK; process.QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value : (int)QualityState.OK; } process.CreatedUserName = loginfo.MonitoringPoint; process.CreatedUserName = logMiddle.MonitoringPoint; process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local); process.UpdatedUserName = loginfo.MonitoringPoint; process.UpdatedUserName = logMiddle.MonitoringPoint; process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local); process.OperationType = OperationType.生产.ToString(); process.Remarks = ""; if (loginfo.WorkingProcedure.Equals("OP80")) if (logMiddle.WorkingProcedure.Equals("OP80")) { process.GetQcDataFlag = loginfo.GetQcDataFlag;//赋值标记 [Editby shaocx,2024-06-15] process.GetQcDataFlag = logMiddle.GetQcDataFlag;//赋值标记 [Editby shaocx,2024-06-15] } if (op80id > 0) { @@ -1127,13 +1142,13 @@ pro.QualityDataInfoID = op80id; } pro.EndTime = DateTimeHelper.GetDateTime(); pro.UpdatedUserName = loginfo.MonitoringPoint; pro.UpdatedUserName = logMiddle.MonitoringPoint; pro.UpdatedTime = DateTimeHelper.GetDateTime(); if (loginfo.WorkingProcedure.Equals("OP80")) if (logMiddle.WorkingProcedure.Equals("OP80")) { if (pro.GetQcDataFlag != 0) { pro.GetQcDataFlag = loginfo.GetQcDataFlag;//赋值标记 [Editby shaocx,2024-06-15] pro.GetQcDataFlag = logMiddle.GetQcDataFlag;//赋值标记 [Editby shaocx,2024-06-15] } } } @@ -1147,14 +1162,14 @@ } else { loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"下线完成读取二维码{loginfo.WorkPieceID ?? "空"}异常"; Log4NetHelper.WriteErrorLog(type, $" {loginfo.WorkingProcedure}工序下线 读取工件码数据[{loginfo.WorkPieceID ?? "空"}]时异常："); loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"下线完成读取二维码{logMiddle.WorkPieceID ?? "空"}异常"; Log4NetHelper.WriteErrorLog(type, $" {logMiddle.WorkingProcedure}工序下线 读取工件码数据[{logMiddle.WorkPieceID ?? "空"}]时异常："); } } catch (Exception e) { loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"读取二维码{loginfo.WorkPieceID ?? "空"}更新数据异常{e.Message}"; loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"读取二维码{logMiddle.WorkPieceID ?? "空"}更新数据异常{e.Message}"; } db.WorkPieceLog.Add(GetAddWorkPieceLog(loginfo2));//插入工件采集日志表 db.SaveChanges(); @@ -1942,11 +1957,11 @@ #region 业务方法 /// <summary> /// dict中前面一个是原对象，后面一个是目标对象 /// 【质量数据更新专用】 dict中前面一个是原对象，后面一个是目标对象 /// </summary> /// <param name="WorkingProcedure"></param> /// <returns></returns> public static Dictionary<string, string> GetQualityDataInfoUpdate(string WorkingProcedure = "", string MonitoringPoint = "") public static Dictionary<string, string> GetQualityDataInfoUpdate(WorkPieceLogMiddle logMiddle, string WorkingProcedure = "", string MonitoringPoint = "") { Dictionary<string, string> dict = new Dictionary<string, string>(); @@ -1961,11 +1976,20 @@ { case "OP10": dict.Add("QualityOP10To1", "QualityOP10To1"); dict.Add("QualityNoOk", "QualityNoOk_OP10"); dict.Add("QualityNoOkReason", "QualityNoOkReason_OP10"); break; case "OP20": dict.Add("QualityOP20To1", "QualityOP20To1"); dict.Add("QualityNoOk", "QualityNoOk_OP20"); dict.Add("QualityNoOkReason", "QualityNoOkReason_OP20"); break; case "OP30": dict.Add("QualityNoOk", "QualityNoOk_OP30"); dict.Add("QualityNoOkReason", "QualityNoOkReason_OP30"); switch (MonitoringPoint) { case "OP3002CH3": @@ -1994,13 +2018,24 @@ case "OP35": dict.Add("QualityOP35To1", "QualityOP35To1"); dict.Add("QualityOP35To2", "QualityOP35To2"); dict.Add("QualityNoOk", "QualityNoOk_OP35"); dict.Add("QualityNoOkReason", "QualityNoOkReason_OP35"); break; case "OP40": dict.Add("QualityOP40To1", "QualityOP40To1"); dict.Add("QualityNoOk", "QualityNoOk_OP40"); dict.Add("QualityNoOkReason", "QualityNoOkReason_OP40"); break; case "OP60": dict.Add("QualityOP60To1", "QualityOP60To1"); dict.Add("QualityOP60To2", "QualityOP60To2"); dict.Add("QualityNoOk", "QualityNoOk_OP60"); dict.Add("QualityNoOkReason", "QualityNoOkReason_OP60"); break; case "OP70": dict.Add("QualityOP70To1", "QualityOP70To1"); @@ -2036,7 +2071,10 @@ dict.Add("QualityOP80_X_S_Y", "QualityOP80_X_S_Y"); dict.Add("QualityOP80_X_X_X", "QualityOP80_X_X_X"); dict.Add("QualityOP80_X_X_Y", "QualityOP80_X_X_Y"); dict.Add("QualityNoOk", "QualityNoOk_OP80"); dict.Add("QualityNoOkReason", "QualityNoOkReason_OP80"); break; default: @@ -2045,6 +2083,42 @@ return dict; } /// <summary> /// 【工件或工序数据数据更新专用】 dict中前面一个是原对象，后面一个是目标对象 /// </summary> /// <param name="WorkingProcedure"></param> /// <returns></returns> public static Dictionary<string, string> GetWorkPieceInfoUpdateForQualityNoOk(WorkPieceLogMiddle loginfo) { Dictionary<string, string> dict = new Dictionary<string, string>(); //if (loginfo.QualityState != null) //{ // QualityState qualityState; // bool isRight = Enum.TryParse<QualityState>(loginfo.QualityState.ToString(), out qualityState); // if (isRight && (qualityState == QualityState.NG || qualityState == QualityState.Suspected)) // { // } //} dict.Add("QualityNoOk", "QualityNoOk"); dict.Add("QualityNoOkReason", "QualityNoOkReason"); return dict; } public static void SetQualityNoOk_WorkPieceInfo(WorkPieceLogMiddle logMiddle, ref WorkPieceInfo pieceInfo) { pieceInfo.QualityNoOk = logMiddle.QualityNoOk; pieceInfo.QualityNoOkReason = logMiddle.QualityNoOkReason; } public static void SetQualityNoOk_WorkPieceProcess(WorkPieceLogMiddle logMiddle, ref WorkPieceProcess pieceProcess) { pieceProcess.QualityNoOk = logMiddle.QualityNoOk; pieceProcess.QualityNoOkReason = logMiddle.QualityNoOkReason; } /// <summary> /// 判断是否跳序 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
@@ -19,6 +19,7 @@ using static System.Net.WebRequestMethods; using File = System.IO.File; using Spire.Additions.Xps.Schema; using log4net; namespace iWare_SCADA_BusinessLogical { @@ -114,7 +115,8 @@ string path36 = ConfigHelper.GetConfigString("OP30QualityDataFor36Station");//op30 3工位，6工位地址 string path45 = ConfigHelper.GetConfigString("OP30QualityDataFor45Station");//op30 4工位，5工位地址 string pathOP20 = ConfigHelper.GetConfigString("OP20QualityData"); string pathOP60 = ConfigHelper.GetConfigString("OP60QualityData"); //string pathOP60 = ConfigHelper.GetConfigString("OP60QualityData"); string pathOP60 = @"Q:\Measuring_Data_dfq\";//写死地址 【Editby shaocx,2024-06-25】 if (string.IsNullOrEmpty(path36)) { path36 = @"Z:\"; @@ -129,7 +131,7 @@ } if (string.IsNullOrEmpty(pathOP60)) { pathOP60 = @"V:\"; pathOP60 = @"Q:\Measuring_Data_dfq\"; } if (DataCapturePointCode.Contains("CH3")) @@ -202,18 +204,18 @@ Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}进入测量完成【{value_02}】【{value.ToString()}】"); threadStatusMonitor.Threadlastmodifytime = DateTime.Now; WorkPieceLogMiddle wplog = new WorkPieceLogMiddle(); wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId(); wplog.WorkingProcedure = WorkingProcedure; wplog.EquipmentID = _dataCaptureConfig.EquipmentID; ; wplog.Remarks = WorkingProcedure; wplog.MonitoringPoint = DataCapturePointCode; wplog.CreatedTime = DateTimeHelper.GetDateTime(); wplog.CreatedUserName = DataCapturePointCode; wplog.UpdatedUserName = Environment.MachineName + "自动" + Thread.CurrentThread.ManagedThreadId.ToString(); wplog.UpdatedTime = DateTimeHelper.GetDateTime(); wplog.IsDeleted = false; wplog.QualityType = QualityType.Online.ToString(); WorkPieceLogMiddle logMiddle = new WorkPieceLogMiddle(); logMiddle.Id = Yitter.IdGenerator.YitIdHelper.NextId(); logMiddle.WorkingProcedure = WorkingProcedure; logMiddle.EquipmentID = _dataCaptureConfig.EquipmentID; ; logMiddle.Remarks = WorkingProcedure; logMiddle.MonitoringPoint = DataCapturePointCode; logMiddle.CreatedTime = DateTimeHelper.GetDateTime(); logMiddle.CreatedUserName = DataCapturePointCode; logMiddle.UpdatedUserName = Environment.MachineName + "自动" + Thread.CurrentThread.ManagedThreadId.ToString(); logMiddle.UpdatedTime = DateTimeHelper.GetDateTime(); logMiddle.IsDeleted = false; logMiddle.QualityType = QualityType.Online.ToString(); foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode)) { @@ -221,23 +223,23 @@ { var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType)); //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//给动态字段赋值 var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName); var set = logMiddle.GetType().GetProperty(col.DataCaptureColumnTabelName); if (set == null) { Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}工序监控测量完成标记 读取工件码动态由于字段名没找到，赋值【{WorkingProcedure ?? "空字符串"}】失败{wplog.Id}"); Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}工序监控测量完成标记 读取工件码动态由于字段名没找到，赋值【{WorkingProcedure ?? "空字符串"}】失败{logMiddle.Id}"); } if (set.PropertyType.FullName.Equals("System.String")) { set.SetValue(wplog, valuecol.ToString());//给动态字段赋值 set.SetValue(logMiddle, valuecol.ToString());//给动态字段赋值 } else { set.SetValue(wplog, valuecol);//给动态字段赋值 set.SetValue(logMiddle, valuecol);//给动态字段赋值 } } catch (Exception setex) { Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}工序监控测量完成标记 读取工件码动态赋值【{WorkingProcedure ?? "空字符串"}】异常{wplog.Id}", setex); Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}工序监控测量完成标记 读取工件码动态赋值【{WorkingProcedure ?? "空字符串"}】异常{logMiddle.Id}", setex); } } @@ -295,27 +297,27 @@ files = files.OrderByDescending(o => o.LastWriteTime).ToList(); if (files.Count > 0) { Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"工位【{DataCapturePointCode}】工件【{wplog.WorkPieceID ?? "空字符"}】文件{files[0].FullName}测量完成读取文件数据开始"); Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"工位【{DataCapturePointCode}】工件【{logMiddle.WorkPieceID ?? "空字符"}】文件{files[0].FullName}测量完成读取文件数据开始"); switch (DataCapturePointCode) { case "OP3002CH3": wplog.OP30QualityFilePathCH3 = files[0].FullName; wplog.QualityStateStr = FileHelper.ReadPdfFileForSpire(files[0].FullName, "Result"); wplog.QualityOP30To1 = FileHelper.ReadPdfFileForSpire(files[0].FullName, "Y-Maximum");//涨断力矩 logMiddle.OP30QualityFilePathCH3 = files[0].FullName; logMiddle.QualityStateStr = FileHelper.ReadPdfFileForSpire(files[0].FullName, "Result"); logMiddle.QualityOP30To1 = FileHelper.ReadPdfFileForSpire(files[0].FullName, "Y-Maximum");//涨断力矩 break; case "OP3002CH4": wplog = GetCH4Info(files[0].FullName, wplog); wplog.OP30QualityFilePathCH4 = files[0].FullName; logMiddle = GetCH4Info(files[0].FullName, logMiddle); logMiddle.OP30QualityFilePathCH4 = files[0].FullName; break; case "OP3002CH5": wplog = GetCH5Info(files[0].FullName, wplog); wplog.OP30QualityFilePathCH5 = files[0].FullName; logMiddle = GetCH5Info(files[0].FullName, logMiddle); logMiddle.OP30QualityFilePathCH5 = files[0].FullName; break; case "OP3002CH6": wplog.OP30QualityFilePathCH6 = files[0].FullName; wplog.QualityStateStr = FileHelper.ReadPdfFileForSpire(files[0].FullName, "Result"); wplog.QualityOP30To6 = FileHelper.ReadPdfFileForSpire(files[0].FullName, "Y-Maximum");//衬套压装力矩 wplog.QualityOP30To7 = FileHelper.ReadPdfFileForSpire(files[0].FullName, "Block X");//衬套压装位移 logMiddle.OP30QualityFilePathCH6 = files[0].FullName; logMiddle.QualityStateStr = FileHelper.ReadPdfFileForSpire(files[0].FullName, "Result"); logMiddle.QualityOP30To6 = FileHelper.ReadPdfFileForSpire(files[0].FullName, "Y-Maximum");//衬套压装力矩 logMiddle.QualityOP30To7 = FileHelper.ReadPdfFileForSpire(files[0].FullName, "Block X");//衬套压装位移 break; default: break; @@ -325,25 +327,25 @@ } else if (WorkingProcedure.Equals("OP35")) { if (wplog.OP35OK) if (logMiddle.OP35OK) { wplog.QualityStateStr = "OK"; logMiddle.QualityStateStr = "OK"; } else { wplog.QualityStateStr = "NG"; logMiddle.QualityStateStr = "NG"; } } else if (WorkingProcedure.Equals("OP60")) { //增加OP60 质量信息读取校验 【Editby shaocx,2024-06-07】 var gongweiStr = DataCapturePointCode.Substring(DataCapturePointCode.Length - 1, 1); if (wplog.Op60_Place_Flag == false) if (logMiddle.Op60_Place_Flag == false) { Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成，是指定的工件{wplog.WorkPieceID},工位{gongweiStr}，不通过，读取Op60_Place_Flag:false"); Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成，是指定的工件{logMiddle.WorkPieceID},工位{gongweiStr}，不通过，读取Op60_Place_Flag:false"); continue; }; Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成，是指定的工件{wplog.WorkPieceID},工位{gongweiStr}，校验通过，读取Op60_Place_Flag:true"); Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成，是指定的工件{logMiddle.WorkPieceID},工位{gongweiStr}，校验通过，读取Op60_Place_Flag:true"); var time = DateTimeHelper.GetDateTime(); @@ -363,22 +365,33 @@ files = files.Where(x => x.Name.Contains("SP-" + gongweiStr)).OrderByDescending(o => o.LastWriteTime).ToList();//筛选取最新的文件 【Editby shaocx,2024-06-19】 if (files.Count() > 0) { Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{files.Count()}个，是指定的工件{wplog.WorkPieceID},,工位{gongweiStr}上次获取尼伯丁文件里的时间值:{(op60QualityTime == null ? "" : op60QualityTime.ToString())}"); Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{files.Count()}个，是指定的工件{logMiddle.WorkPieceID},,工位{gongweiStr}上次获取尼伯丁文件里的时间值:{(op60QualityTime == null ? "" : op60QualityTime.ToString())}"); List<OP60Info> op60Infos = new List<OP60Info>(); bool isFindFile = false; //注意：只取第一个文件就可以啦!!!!!! 【Editby shaocx,2024-06-19】 var doFiles = new List<FileInfo>() { files.First() }; var source_doFile = files.First();//原始读的文件 //拷贝文件 //目标文件的完整目录 string destFileName = source_doFile.FullName.Replace("Measuring_Data_dfq", "Measuring_Data_df_Copy"); string source_file_name = source_doFile.Name.Replace(".dfq", "");//不带扩展名的文件名字 destFileName = destFileName.Replace(source_file_name, source_file_name + "_" + logMiddle.WorkPieceID + "_" + DateTime.Now.ToString("yyyyMMddHHmmss")); File.Copy(source_doFile.FullName, destFileName, true); FileInfo destFile = new FileInfo(destFileName); var doFiles = new List<FileInfo>() { destFile }; foreach (var file in doFiles) {//取倒序匹配的文件名为工件号的文件 if (file.Name.Contains("SP-" + gongweiStr)) { Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{wplog.WorkPieceID},,工位{gongweiStr}上次获取尼伯丁文件里的时间值:{(op60QualityTime == null ? "" : op60QualityTime.ToString())}"); Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{logMiddle.WorkPieceID},,工位{gongweiStr}上次获取尼伯丁文件里的时间值:{(op60QualityTime == null ? "" : op60QualityTime.ToString())}"); isFindFile = true; var datatable = CSVHelper.ReadCSVList(file.FullName); Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取文件{file.Name}，指定工件号{wplog.WorkPieceID},,工位{gongweiStr}发现文件行数{datatable.Count}"); Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取文件{file.Name}，指定工件号{logMiddle.WorkPieceID},,工位{gongweiStr}发现文件行数{datatable.Count}"); if (datatable.Count < 106) {//质量数据从106行开始 Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取文件{file.Name}，指定工件号{wplog.WorkPieceID},,工位{gongweiStr}发现文件行数{datatable.Count}小于106"); Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取文件{file.Name}，指定工件号{logMiddle.WorkPieceID},,工位{gongweiStr}发现文件行数{datatable.Count}小于106"); continue; } datatable.Reverse(); @@ -418,44 +431,47 @@ // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{wplog.WorkPieceID},工位{gongweiStr}没能赋值OP60QualityFilePath等字段,{msg}"); // break; //} wplog.QualityOP60To1 = op60Infos[0].value; wplog.QualityOP60To2 = op60Infos[1].value; wplog.OP60QualityFilePath = file.FullName; Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{wplog.WorkPieceID},工位{gongweiStr}成功赋值了OP60QualityFilePath等字段，读取时间:{op60Infos[0].datetimeHandle.ToString()}"); logMiddle.QualityOP60To1 = op60Infos[0].value; logMiddle.QualityOP60To2 = op60Infos[1].value; logMiddle.OP60QualityFilePath = file.FullName; Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{logMiddle.WorkPieceID},工位{gongweiStr}成功赋值了OP60QualityFilePath等字段，读取时间:{op60Infos[0].datetimeHandle.ToString()}"); if (op60Infos[0].datetimeHandle > op60QualityTime.Value) {//这个时间判断要不要拿掉？？ 【Editby shaocx,2024-06-19】 } else { var msg = $"，只是警告！因为判断时间不符合，op60Infos[0].datetimeHandle:{(op60Infos[0].datetimeHandle == null ? "" : op60Infos[0].datetimeHandle.ToString())}小于等于op60QualityTime:{(op60QualityTime.Value == null ? "" : op60QualityTime.Value.ToString())}"; Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{wplog.WorkPieceID},工位{gongweiStr}没能赋值OP60QualityFilePath等字段,{msg}"); Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{logMiddle.WorkPieceID},工位{gongweiStr}没能赋值OP60QualityFilePath等字段,{msg}"); } } else { wplog.QualityOP60To1 = op60Infos[0].value; wplog.QualityOP60To2 = op60Infos[1].value; wplog.OP60QualityFilePath = file.FullName; Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{wplog.WorkPieceID},工位{gongweiStr}成功赋值了OP60QualityFilePath等字段，读取时间:{op60Infos[0].datetimeHandle.ToString()}"); logMiddle.QualityOP60To1 = op60Infos[0].value; logMiddle.QualityOP60To2 = op60Infos[1].value; logMiddle.OP60QualityFilePath = file.FullName; Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{logMiddle.WorkPieceID},工位{gongweiStr}成功赋值了OP60QualityFilePath等字段，读取时间:{op60Infos[0].datetimeHandle.ToString()}"); } op60QualityTime = op60Infos[0].datetimeHandle; break; } } else { Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取文件{file.Name}不是指定工件{wplog.WorkPieceID},工位{gongweiStr}"); Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取文件{file.Name}不是指定工件{logMiddle.WorkPieceID},工位{gongweiStr}"); } } if (isFindFile == false) { Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成没有找到文件,指定工件{wplog.WorkPieceID},工位{gongweiStr}"); Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成没有找到文件,指定工件{logMiddle.WorkPieceID},工位{gongweiStr}"); } } else { Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成,通过筛选过滤,没有找到文件,指定工件{wplog.WorkPieceID},工位{gongweiStr}"); Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成,通过筛选过滤,没有找到文件,指定工件{logMiddle.WorkPieceID},工位{gongweiStr}"); } } else if (WorkingProcedure.Equals("OP20")) @@ -464,13 +480,13 @@ //记录公用变量，保存点位M88的信息 【Editby shaocx,2024-06-07】 if (DataCapturePointCode.Contains("OP2002C")) {//从OP2002C读取，因为顺序是 CBA，而不是ABC string sideValue = GetSideForOP20(plcService, wplog); string sideValue = GetSideForOP20(plcService, logMiddle); SystemValue.OP20_Side_Value = sideValue; } wplog.MonitoringPoint += SystemValue.OP20_Side_Value; wplog.CreatedUserName = wplog.MonitoringPoint; logMiddle.MonitoringPoint += SystemValue.OP20_Side_Value; logMiddle.CreatedUserName = logMiddle.MonitoringPoint; Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成，是指定的工件{wplog.WorkPieceID},工位{gongweiStr}，校验通过，读取Op60_Place_Flag:true"); Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成，是指定的工件{logMiddle.WorkPieceID},工位{gongweiStr}，校验通过，读取Op60_Place_Flag:true"); var time = DateTimeHelper.GetDateTime(); if (fileFindTime == null) @@ -488,12 +504,12 @@ //注意：一定要筛选制定的文件数据 files = files.Where(x => x.Name.Contains("SP-" + gongweiStr)).OrderByDescending(o => o.LastWriteTime).ToList();//筛选取最新的文件 【Editby shaocx,2024-06-19】 Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"工位【{DataCapturePointCode}】工件【{wplog.WorkPieceID ?? "空字符"}】获取到【{files.Count()}】个文件，【{fileFindTime.Value}】【{time.AddHours(2)}】"); Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"工位【{DataCapturePointCode}】工件【{logMiddle.WorkPieceID ?? "空字符"}】获取到【{files.Count()}】个文件，【{fileFindTime.Value}】【{time.AddHours(2)}】"); if (files.Count() > 0) { bool isFindFile = false; Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{files.Count()}个，是指定的工件{wplog.WorkPieceID},工位{gongweiStr},上次获取尼伯丁文件里的时间值:{(op60QualityTime == null ? "" : op60QualityTime.ToString())}"); Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{files.Count()}个，是指定的工件{logMiddle.WorkPieceID},工位{gongweiStr},上次获取尼伯丁文件里的时间值:{(op60QualityTime == null ? "" : op60QualityTime.ToString())}"); files = files.OrderByDescending(o => o.LastWriteTime).ToList(); List<OP60Info> op60Infos = new List<OP60Info>(); //注意：只取第一个文件就可以啦!!!!!! 【Editby shaocx,2024-06-19】 @@ -503,13 +519,13 @@ if (file.Name.Contains("SP-" + gongweiStr)) { isFindFile = true; Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{wplog.WorkPieceID},工位{gongweiStr},上次获取尼伯丁文件里的时间值:{(op60QualityTime == null ? "" : op60QualityTime.ToString())}"); Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{logMiddle.WorkPieceID},工位{gongweiStr},上次获取尼伯丁文件里的时间值:{(op60QualityTime == null ? "" : op60QualityTime.ToString())}"); var datatable = CSVHelper.ReadCSVList(file.FullName); Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取文件{file.Name}，指定工件号{wplog.WorkPieceID},,工位{gongweiStr}发现文件行数{datatable.Count}"); Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取文件{file.Name}，指定工件号{logMiddle.WorkPieceID},,工位{gongweiStr}发现文件行数{datatable.Count}"); if (datatable.Count < 57) {//质量数据从106行开始 Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取文件{file.Name}，指定工件号{wplog.WorkPieceID},,工位{gongweiStr}发现文件行数{datatable.Count}小于106"); Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取文件{file.Name}，指定工件号{logMiddle.WorkPieceID},,工位{gongweiStr}发现文件行数{datatable.Count}小于106"); continue; } datatable.Reverse(); @@ -545,23 +561,23 @@ //{ // break; //} wplog.QualityOP20To1 = op60Infos[0].value; wplog.OP20QualityFilePath = file.FullName; Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{wplog.WorkPieceID},工位{gongweiStr}成功赋值了OP20QualityFilePath等字段，读取时间:{op60Infos[0].datetimeHandle.ToString()}"); logMiddle.QualityOP20To1 = op60Infos[0].value; logMiddle.OP20QualityFilePath = file.FullName; Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{logMiddle.WorkPieceID},工位{gongweiStr}成功赋值了OP20QualityFilePath等字段，读取时间:{op60Infos[0].datetimeHandle.ToString()}"); if (op60Infos[0].datetimeHandle > op60QualityTime.Value) {//这个时间判断要不要拿掉？？ 【Editby shaocx,2024-06-19】 } else { var msg = $"，只是警告！因为判断时间不符合，op60Infos[0].datetimeHandle:{(op60Infos[0].datetimeHandle == null ? "" : op60Infos[0].datetimeHandle.ToString())}小于等于op60QualityTime:{(op60QualityTime.Value == null ? "" : op60QualityTime.Value.ToString())}"; Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{wplog.WorkPieceID},工位{gongweiStr}没能赋值OP60QualityFilePath等字段,{msg}"); Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{logMiddle.WorkPieceID},工位{gongweiStr}没能赋值OP60QualityFilePath等字段,{msg}"); } } else { wplog.QualityOP20To1 = op60Infos[0].value; wplog.OP20QualityFilePath = file.FullName; Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{wplog.WorkPieceID},工位{gongweiStr}成功赋值了OP20QualityFilePath等字段，读取时间:{op60Infos[0].datetimeHandle.ToString()}"); logMiddle.QualityOP20To1 = op60Infos[0].value; logMiddle.OP20QualityFilePath = file.FullName; Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取到文件{file.Name}，是指定的工件{logMiddle.WorkPieceID},工位{gongweiStr}成功赋值了OP20QualityFilePath等字段，读取时间:{op60Infos[0].datetimeHandle.ToString()}"); } op60QualityTime = op60Infos[0].datetimeHandle; break; @@ -570,18 +586,18 @@ } else { Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取文件{file.FullName}不是指定工件{wplog.WorkPieceID}"); Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成读取文件{file.FullName}不是指定工件{logMiddle.WorkPieceID}"); } } if (isFindFile == false) { Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成没有找到文件,指定工件{wplog.WorkPieceID},工位{gongweiStr}"); Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成没有找到文件,指定工件{logMiddle.WorkPieceID},工位{gongweiStr}"); } } else { Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成,通过筛选过滤,没有找到文件,指定工件{wplog.WorkPieceID},工位{gongweiStr}"); Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}下线完成,通过筛选过滤,没有找到文件,指定工件{logMiddle.WorkPieceID},工位{gongweiStr}"); } } @@ -592,8 +608,17 @@ Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}测量完成读取文件数据时异常,避免工序完成异常：", ex); } //根据质量数据判断是否合格/不合格 【Editby shaocx,2024-06-25】 QualityNoOkEnum? qualityNoOkEnum = null; QualityState qualityState = CalcQualityStateForOP(logMiddle, ref qualityNoOkEnum); logMiddle.QualityState = (int)qualityState; if (qualityNoOkEnum != null) { logMiddle.QualityNoOk = (int)qualityNoOkEnum; logMiddle.QualityNoOkReason = qualityNoOkEnum.ToString(); } //更新WorkPieceInfo表以及插入WorkPieceLog表和WorkPieceInfoLog表 WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure)); WorkPieceInfoManager.QualityInfoComplete(logMiddle, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure)); threadStatusMonitor.Threadstatue = 1; @@ -848,5 +873,88 @@ } /// <summary> /// 计算OP 质量数据是否合格 /// </summary> public QualityState CalcQualityStateForOP(WorkPieceLogMiddle logMiddle, ref QualityNoOkEnum? qualityNoOkEnum) { QualityState qualityState = QualityState.Suspected; if (logMiddle.WorkingProcedure == "OP60") { decimal _QualityOP60To1 = SystemHelper.GetDecimal(logMiddle.QualityOP60To1); decimal _QualityOP60To2 = SystemHelper.GetDecimal(logMiddle.QualityOP60To2); var isPass_QualityOP60To1 = false; var isPass_QualityOP60To2 = false; if (_QualityOP60To1 >= (decimal)53.018 && _QualityOP60To1 <= (decimal)53.030) { isPass_QualityOP60To1 = true; } else { qualityNoOkEnum = QualityNoOkEnum.OP60大头孔直径超差; } if (_QualityOP60To2 >= (decimal)22.005 && _QualityOP60To2 <= (decimal)22.011) { isPass_QualityOP60To2 = true; } else { qualityNoOkEnum = QualityNoOkEnum.OP60小头孔直径超差; } if (isPass_QualityOP60To1 && isPass_QualityOP60To2) { qualityState = QualityState.OK; } else { qualityState = QualityState.NG; } if (_QualityOP60To1 == 0 || _QualityOP60To2 == 0) { qualityState = QualityState.Suspected; return qualityState; } return qualityState; } else if (logMiddle.WorkingProcedure == "OP10") { if (logMiddle.QualityState != (int)QualityState.OK) { qualityNoOkEnum = QualityNoOkEnum.OP10厚度超差; } return qualityState; } else if (logMiddle.WorkingProcedure == "OP20") { if (logMiddle.QualityState != (int)QualityState.OK) { qualityNoOkEnum = QualityNoOkEnum.OP20小头孔直径超差; } return qualityState; } else if (logMiddle.WorkingProcedure == "OP35") { if (logMiddle.QualityState != (int)QualityState.OK) { qualityNoOkEnum = QualityNoOkEnum.OP35滚压力不合格; } return qualityState; } else if (logMiddle.WorkingProcedure == "OP40") { if (logMiddle.QualityState != (int)QualityState.OK) { qualityNoOkEnum = QualityNoOkEnum.OP40厚度超差; } return qualityState; } return qualityState; } } } DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_05.cs
@@ -87,9 +87,6 @@ //plcService.OpenService(); } string value_05 = ""; string path = ConfigHelper.GetConfigString("OP80QualityData");//OP80的地址 //string path = "C:\\Users\\SY-PC\\Desktop\\FO";//OP80的地址 DateTime? fileFindTime = null; while (true) { threadStatusMonitor.ErrorMsg = ""; DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
@@ -167,21 +167,21 @@ Log4NetHelper.WriteInfoLog(logType, $"OP80下线完成读取到文件{file.Name}，是指定的工件{pieceProcess.WorkPieceID}"); WorkPieceLogMiddle wplog = new WorkPieceLogMiddle(); wplog.WorkPieceID = pieceProcess.WorkPieceID; wplog.WorkingProcedure = query_WorkingProcedureCurrent; wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId(); wplog.EquipmentID = _dataCaptureConfig.EquipmentID; ; wplog.Remarks = wplog.WorkingProcedure; wplog.MonitoringPoint = _DataCapturePointCode; wplog.CreatedTime = DateTimeHelper.GetDateTime(); wplog.CreatedUserName = _DataCapturePointCode; wplog.UpdatedTime = DateTimeHelper.GetDateTime(); wplog.UpdatedUserName = Environment.MachineName + "自动" + Thread.CurrentThread.ManagedThreadId.ToString(); wplog.IsDeleted = false; WorkPieceLogMiddle logMiddle = new WorkPieceLogMiddle(); logMiddle.WorkPieceID = pieceProcess.WorkPieceID; logMiddle.WorkingProcedure = query_WorkingProcedureCurrent; logMiddle.Id = Yitter.IdGenerator.YitIdHelper.NextId(); logMiddle.EquipmentID = _dataCaptureConfig.EquipmentID; ; logMiddle.Remarks = logMiddle.WorkingProcedure; logMiddle.MonitoringPoint = _DataCapturePointCode; logMiddle.CreatedTime = DateTimeHelper.GetDateTime(); logMiddle.CreatedUserName = _DataCapturePointCode; logMiddle.UpdatedTime = DateTimeHelper.GetDateTime(); logMiddle.UpdatedUserName = Environment.MachineName + "自动" + Thread.CurrentThread.ManagedThreadId.ToString(); logMiddle.IsDeleted = false; WorkPieceLog loginfo2 = new WorkPieceLog(); loginfo2 = EntityPropHelper.Mapper<WorkPieceLog, WorkPieceLogMiddle>(wplog); loginfo2 = EntityPropHelper.Mapper<WorkPieceLog, WorkPieceLogMiddle>(logMiddle); var datatable = CSVHelper.ReadCSVList(file.FullName); List<string> rowFirst = new List<string>(); @@ -243,93 +243,97 @@ { if (oP80Info.OP80ItemStatusInfolist.Any(o => !o.状态.Equals("OK"))) { wplog.QualityStateStr = "NG"; logMiddle.QualityStateStr = "NG"; } else { wplog.QualityStateStr = "OK"; logMiddle.QualityStateStr = "OK"; } } else { wplog.QualityStateStr = "OK"; logMiddle.QualityStateStr = "OK"; } wplog.OP80QualityFilePath = file.FullName; wplog.OP80NewCode = oP80Info.批号?.Replace("#", ""); logMiddle.OP80QualityFilePath = file.FullName; logMiddle.OP80NewCode = oP80Info.批号?.Replace("#", ""); //大头重量 wplog.QualityOP80To1 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Weight Big End")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80To1 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Weight Big End")).FirstOrDefault()?.绝对值; //小头重量 wplog.QualityOP80To2 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Weight Small End")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80To2 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Weight Small End")).FirstOrDefault()?.绝对值; //总重 wplog.QualityOP80To3 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Total Weight")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80To3 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Total Weight")).FirstOrDefault()?.绝对值; //弯曲 wplog.QualityOP80To4 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Bend to A")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80To4 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Bend to A")).FirstOrDefault()?.绝对值; //扭度 wplog.QualityOP80To5 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Twist to A")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80To5 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Twist to A")).FirstOrDefault()?.绝对值; //大头垂直度 wplog.QualityOP80To6 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Big_End_C_Squareness")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80To6 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Big_End_C_Squareness")).FirstOrDefault()?.绝对值; //小头垂直度 wplog.QualityOP80To10 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Sma_End_C_Squareness")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80To10 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Sma_End_C_Squareness")).FirstOrDefault()?.绝对值; //大头孔分组级别 wplog.QualityOP80To7 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Dime Big_End Class")).FirstOrDefault()?.状态; logMiddle.QualityOP80To7 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Dime Big_End Class")).FirstOrDefault()?.状态; //小头孔分组级别 wplog.QualityOP80To8 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Dime Small_End Class")).FirstOrDefault()?.状态; logMiddle.QualityOP80To8 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Dime Small_End Class")).FirstOrDefault()?.状态; //重量组别 wplog.QualityOP80To9 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Weight Class")).FirstOrDefault()?.状态; logMiddle.QualityOP80To9 = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Weight Class")).FirstOrDefault()?.状态; //wplog.Remarks = (wplog.Remarks ?? "") + $"OP80下线完成读取文件{file.FullName},数据【{wplog.OP80NewCode??"空"}】【{wplog.QualityOP80To1 ?? "空"}】【{wplog.QualityOP80To2 ?? "空"}】【{wplog.QualityOP80To3 ?? "空"}】【{wplog.QualityOP80To4 ?? "空"}】【{wplog.QualityOP80To5 ?? "空"}】"; //新增OP80的一些质量数据 【Editby shaocx,2024-06-13】 wplog.QualityOP80_Houdu = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Big_End_Thickness")).FirstOrDefault()?.绝对值; wplog.QualityOP80_ZXJ = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Distance of Two Head")).FirstOrDefault()?.绝对值; wplog.QualityOP80_DTKYZD = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Big_End_Cylindricity")).FirstOrDefault()?.绝对值; wplog.QualityOP80_XTSMYD = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Small_End_Top_Roundn")).FirstOrDefault()?.绝对值; wplog.QualityOP80_XTXMYD = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Small_End_Bot_Roundn")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80_Houdu = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Big_End_Thickness")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80_ZXJ = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Distance of Two Head")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80_DTKYZD = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Big_End_Cylindricity")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80_XTSMYD = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Small_End_Top_Roundn")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80_XTXMYD = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Small_End_Bot_Roundn")).FirstOrDefault()?.绝对值; wplog.QualityOP80_D_S_X = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Big_End_Top_X_Dia.")).FirstOrDefault()?.绝对值; wplog.QualityOP80_D_S_Y = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Big_End_Top_Y_Dia.")).FirstOrDefault()?.绝对值; wplog.QualityOP80_D_X_X = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Big_End_Bot_X_Dia.")).FirstOrDefault()?.绝对值; wplog.QualityOP80_D_X_Y = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Big_End_Bot_Y_Dia.")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80_D_S_X = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Big_End_Top_X_Dia.")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80_D_S_Y = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Big_End_Top_Y_Dia.")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80_D_X_X = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Big_End_Bot_X_Dia.")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80_D_X_Y = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Big_End_Bot_Y_Dia.")).FirstOrDefault()?.绝对值; //计算大头孔直径,大头孔直径=（大头上面X方向直径+大头上面Y方向直径+大头下面X方向直径+大头下面Y方向直径）/4 List<decimal> valueList = new List<decimal>() { SystemHelper.GetDecimal(wplog.QualityOP80_D_S_X), SystemHelper.GetDecimal(wplog.QualityOP80_D_S_Y), SystemHelper.GetDecimal(wplog.QualityOP80_D_X_X), SystemHelper.GetDecimal(wplog.QualityOP80_D_X_Y), SystemHelper.GetDecimal(logMiddle.QualityOP80_D_S_X), SystemHelper.GetDecimal(logMiddle.QualityOP80_D_S_Y), SystemHelper.GetDecimal(logMiddle.QualityOP80_D_X_X), SystemHelper.GetDecimal(logMiddle.QualityOP80_D_X_Y), }; wplog.QualityOP80_D_TKZJ = SystemHelper.CalcDecimalAvg(valueList, 3); logMiddle.QualityOP80_D_TKZJ = SystemHelper.CalcDecimalAvg(valueList, 3); wplog.QualityOP80_X_S_X = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Small_End_Top_X_Dia.")).FirstOrDefault()?.绝对值; wplog.QualityOP80_X_S_Y = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Small_End_Top_Y_Dia.")).FirstOrDefault()?.绝对值; wplog.QualityOP80_X_X_X = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Small_End_Bot_X_Dia.")).FirstOrDefault()?.绝对值; wplog.QualityOP80_X_X_Y = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Small_End_Bot_Y_Dia.")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80_X_S_X = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Small_End_Top_X_Dia.")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80_X_S_Y = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Small_End_Top_Y_Dia.")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80_X_X_X = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Small_End_Bot_X_Dia.")).FirstOrDefault()?.绝对值; logMiddle.QualityOP80_X_X_Y = oP80Info.OP80ItemInfolist.Where(o => o.名称.Equals("Small_End_Bot_Y_Dia.")).FirstOrDefault()?.绝对值; //计算小头孔直径,小头孔直径=（小头上面X方向直径+小头上面Y方向直径+小头下面X方向直径+小头下面Y方向直径）/4 valueList = new List<decimal>(); valueList = new List<decimal>() { SystemHelper.GetDecimal(wplog.QualityOP80_X_S_X), SystemHelper.GetDecimal(wplog.QualityOP80_X_S_Y), SystemHelper.GetDecimal(wplog.QualityOP80_X_X_X), SystemHelper.GetDecimal(wplog.QualityOP80_X_X_Y), SystemHelper.GetDecimal(logMiddle.QualityOP80_X_S_X), SystemHelper.GetDecimal(logMiddle.QualityOP80_X_S_Y), SystemHelper.GetDecimal(logMiddle.QualityOP80_X_X_X), SystemHelper.GetDecimal(logMiddle.QualityOP80_X_X_Y), }; wplog.QualityOP80_X_TKZJ = SystemHelper.CalcDecimalAvg(valueList, 3); logMiddle.QualityOP80_X_TKZJ = SystemHelper.CalcDecimalAvg(valueList, 3); } else { wplog.Remarks = (wplog.Remarks ?? "") + $"OP80下线完成读取文件{file.FullName}异常，行数不是2行"; logMiddle.Remarks = (logMiddle.Remarks ?? "") + $"OP80下线完成读取文件{file.FullName}异常，行数不是2行"; } //更新WorkPieceInfo表以及插入WorkPieceLog表和WorkPieceInfoLog表 info.OP80NewCode = wplog.OP80NewCode;//更新成品吗 info.OP80NewCode = logMiddle.OP80NewCode;//更新成品吗 info.QualityState = (int)((wplog.QualityStateStr.Equals("OK") || wplog.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG); wplog.QualityState = info.QualityState; info.QualityStateUpdateUser = wplog.UpdatedUserName; info.QualityStateUpdateTime = wplog.UpdatedTime.Value.LocalDateTime; info.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG); logMiddle.QualityState = info.QualityState; //赋值不合格原因 //TODO:需要配置OP80质量不合格的原因是啥？？ WorkPieceInfoManager.SetQualityNoOk_WorkPieceInfo(logMiddle, ref info); info.QualityStateUpdateUser = logMiddle.UpdatedUserName; info.QualityStateUpdateTime = logMiddle.UpdatedTime.Value.LocalDateTime; info.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString(); //var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == wplog.WorkPieceID).FirstOrDefault(); @@ -339,24 +343,24 @@ // db.QualityDataInfo.Add(GetAddQualityDataInfo(qualityData)); //} //修改QualityDataInfo表 //重复收到质量信息，会覆盖之前的 EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(wplog, qualityData, WorkPieceInfoManager.GetQualityDataInfoUpdate(wplog.WorkingProcedure, wplog.MonitoringPoint));//指定修改字段 EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(logMiddle, qualityData, WorkPieceInfoManager.GetQualityDataInfoUpdate(logMiddle, logMiddle.WorkingProcedure, logMiddle.MonitoringPoint));//指定修改字段 qualityData.EquipmentID = _EquipmentId; qualityData.QualityStateUpdateUser = info.UpdatedUserName; qualityData.QualityReceiveTime = info.UpdatedTime.Value.LocalDateTime; qualityData.QualityStateUpdateMode = info.QualityStateUpdateMode; qualityData.OP80QualityState = wplog.QualityState.HasValue ? wplog.QualityState.Value.ToString() : "3"; qualityData.OP80QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3"; qualityData.OP80QualityReceiveTime = DateTimeHelper.GetDateTime(); qualityData.OP80QualityFilePath = wplog.OP80QualityFilePath; qualityData.OP80QualityFilePath = logMiddle.OP80QualityFilePath; long op80id = qualityData.Id; if (op80id > 0) { pieceProcess.QualityDataInfoID = op80id; } loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"质量：{wplog.QualityStateStr ?? "空"}"; loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"质量：{logMiddle.QualityStateStr ?? "空"}"; if (!info.QualityState.Equals(((int)QualityState.OK).ToString())) { info.QualityErrorInfo = $"{wplog.WorkingProcedure}工序质量采集数据不合格"; info.QualityErrorInfo = $"{logMiddle.WorkingProcedure}工序质量采集数据不合格"; } else { @@ -367,6 +371,10 @@ pieceProcess.GetQcDataFlag_Remark = "找到文件"; pieceProcess.GetQcDataFlag = 1; pieceProcess.QualityState = info.QualityState.HasValue ? info.QualityState.Value : (int)QualityState.OK; //赋值不合格原因 //TODO:需要配置OP80质量不合格的原因是啥？？ WorkPieceInfoManager.SetQualityNoOk_WorkPieceProcess(logMiddle, ref pieceProcess); pieceProcess.EndTime = file.LastWriteTime;//下线时间改为 文件最后修改时间 【Editby shaocx,2024-06-17】 db.WorkPieceLog.Add(WorkPieceInfoManager.GetAddWorkPieceLog(loginfo2));//插入工件采集日志表 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
@@ -1841,13 +1841,21 @@ { switch (config.DataCapturePointCode) { case "OP2002A": //case "OP2002B": //case "OP2002C": case "OP3002CH3": //case "OP3002CH4": //case "OP3002CH5": //case "OP3002CH6": DataCaptureHandler_02 dc02 = new DataCaptureHandler_02(); dc02._dataCaptureConfig = config; _dataCaptureHandler.Add(dc02); break; //case "OP2002A": // //case "OP2002B": // //case "OP2002C": // DataCaptureHandler_02 dc02 = new DataCaptureHandler_02(); // dc02._dataCaptureConfig = config; // _dataCaptureHandler.Add(dc02); // break; //case "OP6002": // DataCaptureHandler_OP6002.Instance._dataCaptureConfig = config; // _dataCaptureHandler.Add(DataCaptureHandler_OP6002.Instance); DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/App.config
@@ -6,5 +6,7 @@ <appSettings> <add key="OP80QualityData_Test" value="X:\CA4GC20TD_Test\"/> <add key="OP60QualityData_Test" value="Q:\Measuring_Data_df_Test\"/> <add key="OP60QualityData_Zhengshi" value="Q:\Measuring_Data_dfq\"/> <add key="OP60QualityData_Test_Localhost" value="D:\数瀛信息科技\公司项目\DF22001-一汽连杆项目\映射盘文件\OP60（尼伯丁）\"/> </appSettings> </configuration> DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.Designer.cs
@@ -30,6 +30,7 @@ { this.button1 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button(); this.SuspendLayout(); // // button1 @@ -52,11 +53,22 @@ this.button2.UseVisualStyleBackColor = true; this.button2.Click += new System.EventHandler(this.button2_Click); // // button3 // this.button3.Location = new System.Drawing.Point(76, 234); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(244, 54); this.button3.TabIndex = 2; this.button3.Text = "OP60测试读取文件（本地）"; this.button3.UseVisualStyleBackColor = true; this.button3.Click += new System.EventHandler(this.button3_Click); // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(800, 450); this.Controls.Add(this.button3); this.Controls.Add(this.button2); this.Controls.Add(this.button1); this.Name = "Form1"; @@ -69,6 +81,7 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button3; } }
@@ -68,5 +68,35 @@ MessageBox.Show("异常:" + ex.Message); } } private void button3_Click(object sender, EventArgs e) { try { string path = ConfigHelper.GetConfigString("OP60QualityData_Zhengshi"); var newFiles = FileHelper.DetectNewFiles(path, "*.dfq", 300, DateTime.Now.AddDays(-100), DateTime.Now.AddDays(1)); foreach (System.IO.FileInfo source_doFile in newFiles) { //MessageBox.Show("找到FullName:" + source_doFile.FullName+ ",Name:" + source_doFile.Name); //目标文件的完整目录 string destFileName = source_doFile.FullName.Replace("Measuring_Data_dfq", "Measuring_Data_df_Copy"); string source_file_name = source_doFile.Name.Replace(".dfq", "");//不带扩展名的文件名字 destFileName = destFileName.Replace(source_file_name, source_file_name + "_" + "_" + DateTime.Now.ToString("yyyyMMddHHmmss")); File.Copy(source_doFile.FullName, destFileName, true); //FileInfo destFile = new FileInfo(destFileName); //MessageBox.Show("新文件找到FullName:" + destFile.FullName + ",Name:" + destFile.Name); } MessageBox.Show("成功"); } catch (Exception ex) { MessageBox.Show("异常:" + ex.Message); } } } } DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
@@ -79,6 +79,28 @@ /// </summary> Suspected = 3 } /// <summary> /// 不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public enum QualityNoOkEnum { OP10厚度超差 = 2, OP20小头孔直径超差 = 3, OP30涨断工位力矩大 = 4, OP35滚压力不合格 = 5, OP40厚度超差 = 6, OP60小头孔直径超差 = 8, OP80尺寸超差 = 10, OP30预拧紧工位力矩大 = 11, OP30终拧紧工位力矩大 = 12, OP30压衬套工位力矩大 = 13, OP60大头孔直径超差 = 14, OP80重量超差 = 15, } /// <summary> /// 质量状态修改方式 /// </summary> DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
@@ -241,10 +241,14 @@ public string QualityOP35To2 { get; set; } /// <summary> /// 大头孔直径 /// </summary> public string QualityOP60To1 { get; set; } /// <summary> /// 小头孔直径 /// </summary> public string QualityOP60To2 { get; set; }
@@ -302,6 +302,73 @@ #endregion #region 新增 不合格原因 【Editby shaocx,2024-06-26】 /// OP10质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk_OP10 { get; set; } /// <summary> /// OP10质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason_OP10 { get; set; } /// OP20质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk_OP20 { get; set; } /// <summary> /// OP20质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason_OP20 { get; set; } /// OP30质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk_OP30 { get; set; } /// <summary> /// OP30质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason_OP30 { get; set; } /// OP35质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk_OP35 { get; set; } /// <summary> /// OP35质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason_OP35 { get; set; } /// OP40质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk_OP40 { get; set; } /// <summary> /// OP40质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason_OP40 { get; set; } /// OP60质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk_OP60 { get; set; } /// <summary> /// OP60质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason_OP60 { get; set; } /// OP80质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk_OP80 { get; set; } /// <summary> /// OP80质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason_OP80 { get; set; } #endregion } /// <summary> DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/QualityDataInfoLog.cs
@@ -300,5 +300,73 @@ #endregion #endregion #region 新增 不合格原因 【Editby shaocx,2024-06-26】 /// OP10质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk_OP10 { get; set; } /// <summary> /// OP10质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason_OP10 { get; set; } /// OP20质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk_OP20 { get; set; } /// <summary> /// OP20质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason_OP20 { get; set; } /// OP30质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk_OP30 { get; set; } /// <summary> /// OP30质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason_OP30 { get; set; } /// OP35质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk_OP35 { get; set; } /// <summary> /// OP35质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason_OP35 { get; set; } /// OP40质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk_OP40 { get; set; } /// <summary> /// OP40质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason_OP40 { get; set; } /// OP60质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk_OP60 { get; set; } /// <summary> /// OP60质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason_OP60 { get; set; } /// OP80质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk_OP80 { get; set; } /// <summary> /// OP80质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason_OP80 { get; set; } #endregion } } DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceInfo.cs
@@ -70,8 +70,21 @@ [StringLength(2)] public string WorkPieceIDTo7 { get; set; } /// <summary> /// 质量状态，枚举 QualityState /// </summary> public int? QualityState { get; set; } /// <summary> /// 质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk { get; set; } /// <summary> /// 质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason { get; set; } [StringLength(255)] public string QualityErrorInfo { get; set; }
@@ -74,6 +74,16 @@ public int QualityState { get; set; } /// <summary> /// 质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk { get; set; } /// <summary> /// 质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason { get; set; } [StringLength(255)] public string QualityErrorInfo { get; set; }
@@ -44,6 +44,16 @@ public int? QualityState { get; set; } /// <summary> /// 质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk { get; set; } /// <summary> /// 质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason { get; set; } [StringLength(32)] public string EquipmentID { get; set; }
@@ -27,8 +27,21 @@ [Column(TypeName = "datetime2")] public DateTime EndTime { get; set; } /// <summary> /// 质量状态，使用枚举 QualityState /// </summary> public int QualityState { get; set; } /// <summary> /// 质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】 /// </summary> public int? QualityNoOk { get; set; } /// <summary> /// 质量不合格原因 【Editby shaocx,2024-06-26】 /// </summary> public string QualityNoOkReason { get; set; } public long QualityDataInfoID { get; set; } public DateTimeOffset? CreatedTime { get; set; } DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/UnitTest1.cs
@@ -1,4 +1,6 @@ using iWare_SCADA_BusinessLogical.Utils; using iWare_SCADA_BusinessLogical.BLL; using iWare_SCADA_BusinessLogical.Utils; using iWare_SCADA_Model; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections.Generic; @@ -47,5 +49,21 @@ string cc = bb[0]; } [TestMethod] public void zzz() { WorkPieceLogMiddle logMiddle = new WorkPieceLogMiddle( ) { WorkingProcedure = "OP30" } ; QualityDataInfo qualityData = new QualityDataInfo(); //修改QualityDataInfo表 //重复收到质量信息，会覆盖之前的 EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(logMiddle, qualityData, WorkPieceInfoManager.GetQualityDataInfoUpdate(logMiddle, logMiddle.WorkingProcedure, logMiddle.MonitoringPoint));//指定修改字段 string cc = ""; } } } DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Test/iWare_SCADA_Test.csproj
@@ -61,6 +61,10 @@ <Project>{32708f19-fe1a-48f5-b373-8e1c776f216c}</Project> <Name>iWare_SCADA_BusinessLogical</Name> </ProjectReference> <ProjectReference Include="..\iWare_SCADA_Model\iWare_SCADA_Model.csproj"> <Project>{91C185DE-15AB-44AE-B585-53799FC51BE0}</Project> <Name>iWare_SCADA_Model</Name> </ProjectReference> </ItemGroup> <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
