From 81a5ef9f635ea6ca6855560ca816dacf09911fa4 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 26 8月 2024 10:16:47 +0800
Subject: [PATCH] 2
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 74 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 1 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
index 0e02dea..5dd9efd 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -804,6 +804,74 @@
}
/// <summary>
+ /// 璐ㄩ噺妫�娴嬪畬鎴�-OP70涓撶敤
+ /// </summary>
+ /// <param name="logMiddle"></param>
+ /// <param name="type"></param>
+ public static void QualityInfoCompleteForOP70(WorkPieceLogMiddle logMiddle, LogType type)
+ {
+ if (string.IsNullOrEmpty(logMiddle.QualityOP70To1) && string.IsNullOrEmpty(logMiddle.QualityOP70To2) && string.IsNullOrEmpty(logMiddle.QualityOP70To3))
+ {
+ Log4NetHelper.WriteErrorLog(type, $" {logMiddle.WorkingProcedure}宸ュ簭鐩戞帶娓呮礂鏈烘暟鎹� 璇诲彇宸ヤ欢鐮佹暟鎹甗{logMiddle.WorkPieceID ?? "绌�"}]鑾峰彇鐨勪笁涓�奸兘鏄┖鐨勶紝涓嶅鐞嗚繑鍥�");
+ return;
+ }
+ using (DbModel db = new DbModel())
+ {
+ try
+ {
+ bool isAdd = false;
+ if (logMiddle.WorkPieceID.Length == 22)
+ {
+ var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == logMiddle.WorkPieceID).FirstOrDefault();
+ if (qualityData == null || qualityData.WorkPieceID.Length < 1 || qualityData.WorkingProcedure.Length < 1)
+ {//鎻掑叆QualityDataInfo琛�
+ isAdd = true;
+ qualityData = EntityPropHelper.Mapper<QualityDataInfo, WorkPieceLog>(logMiddle);
+ }
+
+ qualityData.QualityStateUpdateUser = "OP7009";
+ qualityData.QualityReceiveTime = DateTime.Now;
+
+ //鐗规畩澶勭悊OP70鐨勮川閲忔暟鎹�
+ if (string.IsNullOrEmpty(qualityData.QualityOP70To1) && !string.IsNullOrEmpty(SystemHelper.GetStrForQualityOP70(logMiddle.QualityOP70To1)))
+ {
+ qualityData.QualityOP70To1 = logMiddle.QualityOP70To1;
+ }
+ if (string.IsNullOrEmpty(qualityData.QualityOP70To2) && !string.IsNullOrEmpty(SystemHelper.GetStrForQualityOP70(logMiddle.QualityOP70To2)))
+ {
+ qualityData.QualityOP70To2 = logMiddle.QualityOP70To2;
+ }
+ if (string.IsNullOrEmpty(qualityData.QualityOP70To3) && !string.IsNullOrEmpty(SystemHelper.GetStrForQualityOP70(logMiddle.QualityOP70To3)))
+ {
+ qualityData.QualityOP70To3 = logMiddle.QualityOP70To3;
+ }
+
+
+ db.QualityDataInfoLog.Add(GetAddQualityDataInfoLog(qualityData));//鎻掑叆鏃ュ織
+
+ if (isAdd)
+ {
+ db.QualityDataInfo.Add(GetAddQualityDataInfo(qualityData));
+ }
+ db.SaveChanges();//淇濆瓨鏁版嵁
+ }
+ else
+ {
+ Log4NetHelper.WriteErrorLog(type, $" {logMiddle.WorkingProcedure}宸ュ簭鐩戞帶娓呮礂鏈烘暟鎹� 璇诲彇宸ヤ欢鐮佹暟鎹甗{logMiddle.WorkPieceID ?? "绌�"}]鏃跺紓甯革細");
+
+ }
+ }
+ catch (Exception ex)
+ {
+ Log4NetHelper.WriteErrorLog(type, $" {logMiddle.WorkingProcedure}宸ュ簭鐩戞帶娓呮礂鏈烘暟鎹� 璇诲彇宸ヤ欢鐮佹暟鎹甗{logMiddle.WorkPieceID ?? "绌�"}]鏃跺紓甯革細", ex);
+ }
+ finally
+ {
+ }
+ }
+ }
+
+ /// <summary>
/// 璧嬪�� 淇敼浜� 銆怑ditby shaocx,2024-07-05銆�
/// </summary>
/// <param name="logMiddle"></param>
@@ -865,6 +933,8 @@
info.WorkingProcedureCompleted = info.WorkingProcedureCompleted + loginfo.WorkingProcedure;//宸插畬鎴愬伐搴�
info.WorkPieceCurrentPositionOrder = info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2;
}
+ QualityDataInfo qualityData = null;
+ qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault();
if (loginfo.WorkingProcedure.Equals("OP35"))
{//涓轰簡瑙ｅ喅OP35鐨勯噰闆嗗埌鐨勮川閲忎俊鎭槸OK杩楴OOK鐨勬儏鍐碉紝OP35 NOOK鏃舵洿鏂拌川閲忎俊鎭�
loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"OP35NOOK鍘熻川閲忎俊鎭瘂(info.QualityState.HasValue ? info.QualityState.Value.ToString() : "绌�")}";
@@ -879,7 +949,7 @@
}
loginfo.QualityState = info.QualityState;
- var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault();
+
if (qualityData != null)
{
qualityData.OP35QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3";
@@ -897,6 +967,8 @@
pro.UpdatedTime = DateTimeHelper.GetDateTime();
}
+ QualityStateHelper.SetQualityStateForNoOk(ref info, ref pro, ref qualityData);
+
db.WorkPieceInfoLog.Add(GetAddWorkPieceInfoLog(info));
}
--
Gitblit v1.9.3