DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/2_QualityInfoCompleteManager.cs
@@ -67,9 +67,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")) DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/4_WorkPiecePushOffManager.cs
@@ -13,28 +13,30 @@ /// <summary> /// 工件æ¨åºNOOK /// </summary> /// <param name="loginfo"></param> /// <param name="logMiddle"></param> /// <param name="type"></param> public static void WorkPiecePushOff(WorkPieceLogMiddle loginfo, LogType type) public static void WorkPiecePushOff(WorkPieceLogMiddle logMiddle, LogType type) { using (DbModel db = new DbModel()) { 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 cur_db_info = new WorkPieceInfo(); cur_db_info = db.WorkPieceInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault(); cur_db_info = db.WorkPieceInfo.Where(o => o.WorkPieceID == logMiddle.WorkPieceID).FirstOrDefault(); if (cur_db_info == null || cur_db_info.WorkPieceID.Length < 1) {//没æå·¥ä»¶ä¿¡æ¯ï¼ä¸åæ´æ° Log4NetHelper.WriteErrorLog(type, $"工件{loginfo.WorkPieceID} 工件æ¨åºNOOKå·¥åº{loginfo.WorkingProcedure} 没æè·åå°å·¥ä»¶ä¿¡æ¯ä¸åæ´æ°"); return; Log4NetHelper.WriteErrorLog(type, $"工件{logMiddle.WorkPieceID} 工件æ¨åºNOOKå·¥åº{logMiddle.WorkingProcedure} 没æè·åå°å·¥ä»¶ä¿¡æ¯,æ¤æ¶éè¦æ°å¢æ°æ®"); //æ°å¢æ°æ® ãEditby shaocx,2024-09-07ã WorkPieceInfoHelper.CreateWorkPieceInfoForPushOff(logMiddle, ref cur_db_info, ref isAddWorkPieceInfo); } else {//æ´æ°è¡¨WorkPieceInfo if (loginfo.WorkingProcedure.Equals("OP10")) if (logMiddle.WorkingProcedure.Equals("OP10")) { /* info.WorkPieceCurrentPosition = info.WorkingProcedureCurrent + "NOOK"; @@ -54,16 +56,16 @@ cur_db_info.WorkingProcedureCurrent = set_WorkingProcedureCurrent; cur_db_info.WorkPieceCurrentPosition = set_WorkingProcedureCurrent + "NOOK"; loginfo2.WorkingProcedure = set_WorkingProcedureCurrent;//è§£å³OP10ï¼OP40åä¸ä¸ªçé®é¢ loginfo.WorkingProcedure = set_WorkingProcedureCurrent; //è§£å³OP10ï¼OP40åä¸ä¸ªçé®é¢ logMiddle.WorkingProcedure = set_WorkingProcedureCurrent; //è§£å³OP10ï¼OP40åä¸ä¸ªçé®é¢ } else { cur_db_info.WorkingProcedureCurrent = loginfo.WorkingProcedure; cur_db_info.WorkPieceCurrentPosition = loginfo.WorkingProcedure + "NOOK"; cur_db_info.WorkingProcedureCurrent = logMiddle.WorkingProcedure; cur_db_info.WorkPieceCurrentPosition = logMiddle.WorkingProcedure + "NOOK"; } cur_db_info.WorkPieceState = (int)WorkPieceState.NOOKPush; cur_db_info.UpdatedUserName = loginfo.MonitoringPoint; SystemBussinessHelper.SetWorkPieceInfoMiddleForUpdateDataCapturePointCname(ref cur_db_info, loginfo.DataCapturePointCname); cur_db_info.UpdatedUserName = logMiddle.MonitoringPoint; SystemBussinessHelper.SetWorkPieceInfoMiddleForUpdateDataCapturePointCname(ref cur_db_info, logMiddle.DataCapturePointCname); cur_db_info.UpdatedTime = DateTime.Now; cur_db_info.Remarks = "工件NOOKæ¨åº"; loginfo2.Remarks = cur_db_info.Remarks; @@ -72,42 +74,42 @@ cur_db_info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime(); } cur_db_info.WorkingProcedureEndTime = DateTimeHelper.GetDateTime(); cur_db_info.WorkingProcedureCompleted = cur_db_info.WorkingProcedureCompleted + loginfo.WorkingProcedure;//å·²å®æå·¥åº cur_db_info.WorkPieceCurrentPositionOrder = cur_db_info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2; cur_db_info.WorkingProcedureCompleted = cur_db_info.WorkingProcedureCompleted + logMiddle.WorkingProcedure;//å·²å®æå·¥åº cur_db_info.WorkPieceCurrentPositionOrder = cur_db_info.WorkingProcedurePlan.IndexOf(logMiddle.WorkingProcedure) / 2; } QualityDataInfo qualityData = null; qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault(); if (loginfo.WorkingProcedure.Equals("OP35")) qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == logMiddle.WorkPieceID).FirstOrDefault(); if (logMiddle.WorkingProcedure.Equals("OP35")) {//为äºè§£å³OP35çééå°çè´¨éä¿¡æ¯æ¯OKè¿NOOKçæ åµï¼OP35 NOOKæ¶æ´æ°è´¨éä¿¡æ¯ loginfo2.Remarks = $"OP35NOOKåè´¨éä¿¡æ¯{(cur_db_info.QualityState.HasValue ? cur_db_info.QualityState.Value.ToString() : "空")}"; cur_db_info.QualityState = (int)QualityStateEnum.NG; if (!cur_db_info.QualityState.Equals(((int)QualityStateEnum.OK).ToString())) { cur_db_info.QualityErrorInfo = $"{loginfo.WorkingProcedure}å·¥åºè´¨éNOOKééæ°æ®ä¸åæ ¼{cur_db_info.QualityState}"; cur_db_info.QualityErrorInfo = $"{logMiddle.WorkingProcedure}å·¥åºè´¨éNOOKééæ°æ®ä¸åæ ¼{cur_db_info.QualityState}"; } else { cur_db_info.QualityErrorInfo = ""; } loginfo.QualityState = cur_db_info.QualityState; logMiddle.QualityState = cur_db_info.QualityState; if (qualityData != null) { qualityData.OP35QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3"; qualityData.OP35QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3"; qualityData.OP35QualityReceiveTime = DateTimeHelper.GetDateTime(); db.QualityDataInfoLog.Add(WorkPieceInfoManager.GetAddQualityDataInfoLog(qualityData)); } } //æ´æ°ä¸ä¸å·¥åºçç»ææ¶é´ 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 == logMiddle.WorkPieceID && o.WorkingProcedureCurrent == logMiddle.WorkingProcedure && o.OperationType == OperationType.ç产.ToString()).OrderByDescending(o => o.StartTime).FirstOrDefault(); if (pro != null && pro.WorkPieceID.Length > 0) { pro.EndTime = DateTimeHelper.GetDateTime(); pro.Remarks = "NOOKç»æ"; pro.UpdatedUserName = loginfo.MonitoringPoint; pro.UpdateDataCapturePointCname = loginfo.DataCapturePointCname; pro.UpdatedUserName = logMiddle.MonitoringPoint; pro.UpdateDataCapturePointCname = logMiddle.DataCapturePointCname; pro.UpdatedTime = DateTimeHelper.GetDateTime(); } else @@ -116,16 +118,16 @@ 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.StartTime = DateTimeHelper.GetDateTime().AddSeconds(-SystemBussinessHelper.MoNiTimeForWorkingProcedure(logMiddle.WorkingProcedure)); add_process.EndTime = DateTimeHelper.GetDateTime(); //ä¸åé»è®¤èµå¼ä¸ºåæ ¼ ãEditby shaocx,2024-08-16ã add_process.QualityState = WorkPieceInfoManager.GetQualityStateValue(loginfo.QualityState); add_process.QualityState = WorkPieceInfoManager.GetQualityStateValue(logMiddle.QualityState); add_process.CreatedUserName = loginfo.MonitoringPoint; add_process.DataCapturePointCname = loginfo.DataCapturePointCname; add_process.CreatedUserName = logMiddle.MonitoringPoint; add_process.DataCapturePointCname = logMiddle.DataCapturePointCname; add_process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local); add_process.UpdatedUserName = loginfo.MonitoringPoint; add_process.UpdateDataCapturePointCname = loginfo.DataCapturePointCname; 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 = "NOOKç»æ"; @@ -135,18 +137,23 @@ QualityStateHelper.SetQualityStateForNoOk(ref cur_db_info, ref pro, ref qualityData); if (isAddWorkPieceInfo) { db.WorkPieceInfo.Add(cur_db_info); } db.WorkPieceInfoLog.Add(WorkPieceInfoManager.GetAddWorkPieceInfoLog(cur_db_info)); } else { loginfo2.Remarks = $"工件NOOKæ¨åºè¯»åäºç»´ç {loginfo.WorkPieceID ?? "空"}å¼å¸¸"; Log4NetHelper.WriteErrorLog(type, $" {loginfo.WorkingProcedure}工件NOOKæ¨åºè¯»ç æ è®° 读åå·¥ä»¶ç æ°æ®[{loginfo.WorkPieceID ?? "空"}]æ¶å¼å¸¸ï¼"); loginfo2.Remarks = $"工件NOOKæ¨åºè¯»åäºç»´ç {logMiddle.WorkPieceID ?? "空"}å¼å¸¸"; Log4NetHelper.WriteErrorLog(type, $" {logMiddle.WorkingProcedure}工件NOOKæ¨åºè¯»ç æ è®° 读åå·¥ä»¶ç æ°æ®[{logMiddle.WorkPieceID ?? "空"}]æ¶å¼å¸¸ï¼"); } } catch (Exception e) { loginfo2.Remarks = $"读åäºç»´ç {loginfo.WorkPieceID ?? "空"}æ´æ°æ°æ®å¼å¸¸{e.Message}"; loginfo2.Remarks = $"读åäºç»´ç {logMiddle.WorkPieceID ?? "空"}æ´æ°æ°æ®å¼å¸¸{e.Message}"; } DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/5_WorkPieceSPCPushOffManager.cs
@@ -13,32 +13,36 @@ /// <summary> /// 工件SPCæ½æ£æ¨åº /// </summary> /// <param name="loginfo"></param> /// <param name="logMiddle"></param> /// <param name="type"></param> public static void WorkPieceSPCPushOff(WorkPieceLogMiddle loginfo, LogType type) public static void WorkPieceSPCPushOff(WorkPieceLogMiddle logMiddle, LogType type) { using (DbModel db = new DbModel()) { 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) //|| !((loginfo.WorkingProcedure.Equals("OP10") || loginfo.WorkingProcedure.Equals("OP40")) && loginfo.Remarks.Length > 0) ) { bool isAddWorkPieceInfo = false; WorkPieceInfo cur_db_info = new WorkPieceInfo(); cur_db_info = db.WorkPieceInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault(); cur_db_info = db.WorkPieceInfo.Where(o => o.WorkPieceID == logMiddle.WorkPieceID).FirstOrDefault(); if (cur_db_info == null || cur_db_info.WorkPieceID.Length < 1) {//没æå·¥ä»¶ä¿¡æ¯ï¼ä¸åæ´æ° loginfo2.Remarks = $"工件{loginfo.WorkPieceID} 工件SPCæ¨åºå·¥åº{loginfo.WorkingProcedure} 没æè·åå°å·¥ä»¶ä¿¡æ¯ä¸åæ´æ°"; Log4NetHelper.WriteErrorLog(type, $"工件{loginfo.WorkPieceID} 工件SPCæ¨åºå·¥åº{loginfo.WorkingProcedure} 没æè·åå°å·¥ä»¶ä¿¡æ¯ä¸åæ´æ°"); return; {//æ¤æ¶éè¦æ°å¢æ°æ® loginfo2.Remarks = $"工件{logMiddle.WorkPieceID} 工件SPCæ¨åºå·¥åº{logMiddle.WorkingProcedure} 没æè·åå°å·¥ä»¶ä¿¡æ¯,æ¤æ¶éè¦æ°å¢æ°æ®"; Log4NetHelper.WriteErrorLog(type, $"工件{logMiddle.WorkPieceID} 工件SPCæ¨åºå·¥åº{logMiddle.WorkingProcedure} 没æè·åå°å·¥ä»¶ä¿¡æ¯,æ¤æ¶éè¦æ°å¢æ°æ®"); //æ°å¢æ°æ® ãEditby shaocx,2024-09-07ã WorkPieceInfoHelper.CreateWorkPieceInfoForNoData(logMiddle, ref cur_db_info, ref isAddWorkPieceInfo); } else {//æ´æ°è¡¨WorkPieceInfo if (loginfo.WorkingProcedure.Equals("OP10")) if (logMiddle.WorkingProcedure.Equals("OP10")) { //ä¿®å¤ éè¯¯è®°å½æOP05çé®é¢ ãEditby shaocx,2024-08-26ã var set_WorkingProcedureCurrent = ""; @@ -53,16 +57,16 @@ cur_db_info.WorkingProcedureCurrent = set_WorkingProcedureCurrent; cur_db_info.WorkPieceCurrentPosition = set_WorkingProcedureCurrent + "SPC"; loginfo2.WorkingProcedure = set_WorkingProcedureCurrent;//è§£å³OP10ï¼OP40åä¸ä¸ªçé®é¢ loginfo.WorkingProcedure = set_WorkingProcedureCurrent; //è§£å³OP10ï¼OP40åä¸ä¸ªçé®é¢ logMiddle.WorkingProcedure = set_WorkingProcedureCurrent; //è§£å³OP10ï¼OP40åä¸ä¸ªçé®é¢ } else { cur_db_info.WorkingProcedureCurrent = loginfo.WorkingProcedure; cur_db_info.WorkPieceCurrentPosition = loginfo.WorkingProcedure + "SPC"; cur_db_info.WorkingProcedureCurrent = logMiddle.WorkingProcedure; cur_db_info.WorkPieceCurrentPosition = logMiddle.WorkingProcedure + "SPC"; } cur_db_info.WorkPieceState = (int)WorkPieceState.SPCPush; cur_db_info.UpdatedUserName = loginfo.MonitoringPoint; SystemBussinessHelper.SetWorkPieceInfoMiddleForUpdateDataCapturePointCname(ref cur_db_info, loginfo.DataCapturePointCname); cur_db_info.UpdatedUserName = logMiddle.MonitoringPoint; SystemBussinessHelper.SetWorkPieceInfoMiddleForUpdateDataCapturePointCname(ref cur_db_info, logMiddle.DataCapturePointCname); cur_db_info.UpdatedTime = DateTime.Now; cur_db_info.WorkingProcedureEndTime = DateTimeHelper.GetDateTime(); if (!(cur_db_info.WorkingProcedureStartTime.HasValue && cur_db_info.WorkingProcedureStartTime > DateTime.Parse("1900/01/01"))) @@ -71,21 +75,21 @@ } cur_db_info.WorkingProcedureCompleted = cur_db_info.WorkingProcedureCompleted + loginfo.WorkingProcedure;//å·²å®æå·¥åº cur_db_info.WorkPieceCurrentPositionOrder = cur_db_info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2; cur_db_info.WorkingProcedureCompleted = cur_db_info.WorkingProcedureCompleted + logMiddle.WorkingProcedure;//å·²å®æå·¥åº cur_db_info.WorkPieceCurrentPositionOrder = cur_db_info.WorkingProcedurePlan.IndexOf(logMiddle.WorkingProcedure) / 2; } cur_db_info.Remarks = "工件SPCæ½æ£æ¨åº"; loginfo2.Remarks = cur_db_info.Remarks; //æ´æ°ä¸ä¸å·¥åºçç»ææ¶é´ var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && o.WorkingProcedureCurrent == loginfo.WorkingProcedure var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == logMiddle.WorkPieceID && o.WorkingProcedureCurrent == logMiddle.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 ?? "") + "SPCæ½æ£ç»æ"; pro.UpdatedUserName = loginfo.MonitoringPoint; pro.UpdateDataCapturePointCname = loginfo.DataCapturePointCname; pro.UpdatedUserName = logMiddle.MonitoringPoint; pro.UpdateDataCapturePointCname = logMiddle.DataCapturePointCname; pro.UpdatedTime = DateTimeHelper.GetDateTime(); } //æ¯æ¬¡SPC é½æå ¥è¿½æº¯è¡¨ @@ -96,28 +100,32 @@ process.OperationType = OperationType.SPC.ToString(); process.QualityState = (int)QualityStateEnum.Suspected; process.Id = Yitter.IdGenerator.YitIdHelper.NextId(); process.CreatedUserName = loginfo.MonitoringPoint; process.DataCapturePointCname = loginfo.DataCapturePointCname; process.CreatedUserName = logMiddle.MonitoringPoint; process.DataCapturePointCname = logMiddle.DataCapturePointCname; process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local); process.UpdatedUserName = loginfo.MonitoringPoint; process.UpdateDataCapturePointCname = loginfo.DataCapturePointCname; process.UpdatedUserName = logMiddle.MonitoringPoint; process.UpdateDataCapturePointCname = logMiddle.DataCapturePointCname; process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local); process.Remarks = "工件SPCæ½æ£æ¨åº"; process.MyRemarks = "SPCæ¶ï¼æå ¥è¿½æº¯è¡¨"; db.WorkPieceProcess.Add(process); if (isAddWorkPieceInfo) { db.WorkPieceInfo.Add(cur_db_info); } db.WorkPieceInfoLog.Add(WorkPieceInfoManager.GetAddWorkPieceInfoLog(cur_db_info)); } else { loginfo2.Remarks = $"工件SPCæ½æ£æ¨åºè¯»åäºç»´ç {loginfo.WorkPieceID ?? "空"}å¼å¸¸"; Log4NetHelper.WriteErrorLog(type, $" {loginfo.WorkingProcedure}工件SPCæ½æ£æ¨åºè¯»ç æ è®° 读åå·¥ä»¶ç æ°æ®[{loginfo.WorkPieceID ?? "空"}]æ¶å¼å¸¸ï¼"); loginfo2.Remarks = $"工件SPCæ½æ£æ¨åºè¯»åäºç»´ç {logMiddle.WorkPieceID ?? "空"}å¼å¸¸"; Log4NetHelper.WriteErrorLog(type, $" {logMiddle.WorkingProcedure}工件SPCæ½æ£æ¨åºè¯»ç æ è®° 读åå·¥ä»¶ç æ°æ®[{logMiddle.WorkPieceID ?? "空"}]æ¶å¼å¸¸ï¼"); } } catch (Exception e) { loginfo2.Remarks = $"读åäºç»´ç {loginfo.WorkPieceID ?? "空"}æ´æ°æ°æ®å¼å¸¸{e.Message}"; loginfo2.Remarks = $"读åäºç»´ç {logMiddle.WorkPieceID ?? "空"}æ´æ°æ°æ®å¼å¸¸{e.Message}"; } finally { DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/WorkPieceInfoHelper.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,61 @@  using iWare_SCADA_BusinessLogical.BLL; using iWare_SCADA_Model; using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using System.Web.UI.WebControls; namespace iWare_SCADA_BusinessLogical.Utils { /// <summary> /// 主工åºå¸®å©ç±» /// </summary> public class WorkPieceInfoHelper { /// <summary> /// NOOKæ¶æ¨åºï¼å¦ææ²¡æå·¥ä»¶ä¿¡æ¯ï¼ååå»ºå·¥ä»¶ä¿¡æ¯ /// </summary> /// <param name="db"></param> /// <param name="pieceInfo"></param> /// <returns></returns> public static void CreateWorkPieceInfoForPushOff(WorkPieceLogMiddle logMiddle, ref WorkPieceInfo db_info, ref bool isAddWorkPieceInfo) { CreateWorkPieceInfoForNoData(logMiddle, ref db_info, ref isAddWorkPieceInfo); db_info.QualityState = (int)QualityStateEnum.NG; } /// <summary> /// å¦ææ²¡æå·¥ä»¶ä¿¡æ¯ï¼åå建工件信æ¯,注æï¼ä¸å¤çè´¨éç¶æ /// </summary> /// <param name="db"></param> /// <param name="pieceInfo"></param> /// <returns></returns> public static void CreateWorkPieceInfoForNoData(WorkPieceLogMiddle logMiddle, ref WorkPieceInfo db_info, ref bool isAddWorkPieceInfo) { db_info = EntityPropHelper.Mapper<WorkPieceInfo, WorkPieceLog>(logMiddle); //è´¨éæ°æ®å颿´æ° //db_info.QualityState = ""; db_info.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime(); 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 = WorkPieceInfoManager.ParseQRCode(db_info); db_info.Remarks = $"{logMiddle.WorkingProcedure}æ°å¢å·¥ä»¶ä¿¡æ¯"; isAddWorkPieceInfo = true; } } } DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
@@ -165,6 +165,7 @@ <DependentUpon>Resources.resx</DependentUpon> </Compile> <Compile Include="Utils\ClearDataHandler.cs" /> <Compile Include="Utils\WorkPieceInfoHelper.cs" /> <Compile Include="Utils\WorkPieceProcessHelper.cs" /> <Compile Include="Utils\QualityStateHelper.cs" /> <Compile Include="Utils\MonitorHelper.cs" />