DF22001YiQi.git

			@@ -263,6 +263,7 @@
			new_process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
			new_process.OperationType = OperationType.生产.ToString();
			new_process.Remarks = "";
			new_process.MyRemarks = "读码上线时，如果找不到就新建";
			if (loginfo.WorkingProcedure.Equals("OP05"))
			{
			new_process.EndTime = new_process.StartTime;
			@@ -808,6 +809,7 @@
			process.OperationType = OperationType.生产.ToString();
			process.QualityDataInfoID = qualityData.Id;
			process.Remarks = "";
			process.MyRemarks = "质量检测完成时，如果找不到就新建";
			db.WorkPieceProcess.Add(process);
			}
			else
			@@ -1043,14 +1045,37 @@
			}
			}
			//更新上一工序的结束时间
			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 == loginfo.WorkPieceID
			&& o.WorkingProcedureCurrent == loginfo.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 ?? "") + "NOOK结束";
			pro.Remarks = "NOOK结束";
			pro.UpdatedUserName = loginfo.MonitoringPoint;
			pro.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
			pro.UpdatedTime = DateTimeHelper.GetDateTime();
			}
			else
			{//如果找不到就新建【Editby shaocx,2024-09-03】
			WorkPieceProcess add_process = new WorkPieceProcess();
			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.EndTime = DateTimeHelper.GetDateTime();
			//不再默认赋值为合格【Editby shaocx,2024-08-16】
			add_process.QualityState = WorkPieceInfoManager.GetQualityStateValue(loginfo.QualityState);

			add_process.CreatedUserName = loginfo.MonitoringPoint;
			add_process.DataCapturePointCname = loginfo.DataCapturePointCname;
			add_process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
			add_process.UpdatedUserName = loginfo.MonitoringPoint;
			add_process.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
			add_process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
			add_process.OperationType = OperationType.生产.ToString();
			add_process.Remarks = "NOOK结束";
			add_process.MyRemarks = "NOOK结束时，如果找不到就新建";
			db.WorkPieceProcess.Add(add_process);
			}

			QualityStateHelper.SetQualityStateForNoOk(ref cur_db_info, ref pro, ref qualityData);
			@@ -1168,6 +1193,7 @@
			process.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
			process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
			process.Remarks = "工件SPC抽检推出";
			process.MyRemarks = "SPC时，插入追溯表";
			db.WorkPieceProcess.Add(process);


			@@ -1421,6 +1447,7 @@
			add_process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
			add_process.OperationType = OperationType.生产.ToString();
			add_process.Remarks = "";
			add_process.MyRemarks = "工序完成时，如果找不到就新建";
			if (logMiddle.WorkingProcedure.Equals("OP80"))
			{
			add_process.GetQcDataFlag = logMiddle.GetQcDataFlag;//赋值标记 [Editby shaocx,2024-06-15]