DF22001YiQi.git

			@@ -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
			{