From 5834c3175122fd0fb9665f7cccae1601e47dc423 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 9月 2024 11:09:47 +0800
Subject: [PATCH] 2
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 609 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 479 insertions(+), 130 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 e431e54..8c6f1a0 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -1,4 +1,5 @@
-锘縰sing iWare_SCADA_BusinessLogical.Utils;
+锘縰sing HslCommunication.BasicFramework;
+using iWare_SCADA_BusinessLogical.Utils;
using iWare_SCADA_Model;
using iWare_SCADA_Model.MiddleModel;
using iWare_SCADA_Model.TableModel;
@@ -7,6 +8,7 @@
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
+using System.Data.Entity.Validation;
using System.Diagnostics;
//using System.Data.Entity.Infrastructure;
using System.Linq;
@@ -21,32 +23,32 @@
{
public class WorkPieceInfoManager
{
- public static WorkPieceInfo GetWorkPieceInfo(string WorkPieceID)
- {
- using (DbModel db = new DbModel())
- {
- //鏌ヨ鎵�鏈�
- var query = db.WorkPieceInfo.Where(o => o.WorkPieceID == WorkPieceID).FirstOrDefault();
- return query;
- }
- }
+ //public static WorkPieceInfo GetWorkPieceInfo(string WorkPieceID)
+ //{
+ // using (DbModel db = new DbModel())
+ // {
+ // //鏌ヨ鎵�鏈�
+ // var query = db.WorkPieceInfo.Where(o => o.WorkPieceID == WorkPieceID).FirstOrDefault();
+ // return query;
+ // }
+ //}
- public static long InsertWorkPieceInfo(WorkPieceInfo workPiece)
- {
- using (DbModel db = new DbModel())
- {
- db.WorkPieceInfo.Add(workPiece);
- db.SaveChanges();
- return workPiece.Id;
- }
- }
+ //public static long InsertWorkPieceInfo(WorkPieceInfo workPiece)
+ //{
+ // using (DbModel db = new DbModel())
+ // {
+ // db.WorkPieceInfo.Add(workPiece);
+ // db.SaveChanges();
+ // return workPiece.Id;
+ // }
+ //}
- public static WorkPieceLogMiddle GetAddWorkPieceLog(WorkPieceLogMiddle loginfo)
- {
- loginfo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- return loginfo;
- }
+ //public static WorkPieceLogMiddle GetAddWorkPieceLog(WorkPieceLogMiddle loginfo)
+ //{
+ // loginfo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ // return loginfo;
+ //}
/// <summary>
/// 缁橶orkPieceLog涓婚敭绛夊叕鍏辩殑鐨勫睘鎬ц祴鍊�
@@ -149,7 +151,7 @@
}
catch (Exception ex)
{
- loginfo.Remarks = (loginfo.Remarks ?? "") + $"{loginfo.WorkPieceID ?? "绌�"}鍒�鍏峰鍛芥洿鏂版暟鎹紓甯竰ex.Message}";
+ loginfo.Remarks = $"{loginfo.WorkPieceID ?? "绌�"}鍒�鍏峰鍛芥洿鏂版暟鎹紓甯竰ex.Message}";
}
}
@@ -182,12 +184,13 @@
}
else
{
- info.QualityState = (int)QualityState.OK;//姝ゅ闇�瑕佹敞鎰忥紝鍒ゆ柇鎵�鏈夊伐搴忚川閲忥紝鐒跺悗鍐嶈祴鍊�
+ info.QualityState = (int)QualityState.OK;//姝ゅ闇�瑕佹敞鎰忥紝鍒ゆ柇鎵�鏈夊伐搴忚川閲忥紝鐒跺悗鍐嶈祴鍊� //榛樿鍚堟牸锛孫P05榛樿鏄悎鏍�
info.Remarks = "OP05鏂板宸ヤ欢淇℃伅";
}
info.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime();
info.WorkingProcedurePlan = ConfigHelper.GetConfigString("WorkingProcedureAllStr") ?? "OP05OP10OP20OP30OP35OP40OP50OP60OP70OP80";
info.CreatedUserName = loginfo.MonitoringPoint;
+ SystemBussinessHelper.SetWorkPieceInfoMiddleForCreatedUserName(ref info, loginfo.DataCapturePointCname);
info.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
info = ParseQRCode(info);
isAddWorkPieceInfo = true;
@@ -196,7 +199,7 @@
{
if (info.WorkingProcedureCurrent.Equals("OP05"))
{
- loginfo.Remarks = (loginfo.Remarks ?? "") + $"璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"} OP05宸ュ簭閲嶅璇诲彇浜�";
+ loginfo.Remarks = $"璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"} OP05宸ュ簭閲嶅璇诲彇浜�";
return;
}
}
@@ -208,37 +211,64 @@
info.QualityStateUpdateTime = loginfo.UpdatedTime.Value.LocalDateTime;
info.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString();
info.UpdatedUserName = loginfo.MonitoringPoint;
+ SystemBussinessHelper.SetWorkPieceInfoMiddleForUpdateDataCapturePointCname(ref info, loginfo.DataCapturePointCname);
info.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
info.WorkPieceCurrentPosition = loginfo.WorkingProcedure;
info.WorkPieceCurrentPositionOrder = info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2;
info.WorkingProcedureCurrent = loginfo.WorkingProcedure;
- info.Remarks = info.Remarks ?? "" + $"{info.WorkingProcedureCurrent}宸ヤ欢涓婄嚎";
+ info.Remarks = $"{info.WorkingProcedureCurrent}宸ヤ欢涓婄嚎";
+ //淇涓� op35 鍚屼竴涓欢 涓嬬嚎鏃堕棿璺熶笅涓�涓笂绾挎椂闂翠竴妯′竴鏍风殑闂 銆怑ditby shaocx,2024-08-27銆�
+ var isNeedAddNewProcess = true;
var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && !o.OperationType.Equals("SPC") && (o.EndTime == null || o.EndTime <= DateTime.MinValue)).OrderByDescending(o => o.StartTime).FirstOrDefault();
if (pro != null && pro.WorkPieceID.Length > 1)
{
- pro.EndTime = DateTimeHelper.GetDateTime();
- pro.UpdatedUserName = loginfo.MonitoringPoint;
- pro.UpdatedTime = DateTimeHelper.GetDateTime();
- pro.Remarks = (pro.Remarks ?? "") + "鍙堜竴娆′笂绾匡紝鏇存柊缁撴潫鏃堕棿";
+ if (pro.WorkingProcedureCurrent == loginfo.WorkingProcedure)
+ {//琛ㄧず宸ュ簭鐩稿悓
+ isNeedAddNewProcess = false;
+ pro.Remarks = "鍙堜竴娆′笂绾匡紝鏇存柊缁撴潫鏃堕棿";
+ }
+ else
+ {
+ pro.EndTime = DateTimeHelper.GetDateTime();
+ pro.UpdatedUserName = loginfo.MonitoringPoint;
+ pro.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
+ pro.UpdatedTime = DateTimeHelper.GetDateTime();
+ pro.Remarks = "鍙堜竴娆′笂绾匡紝鏇存柊缁撴潫鏃堕棿";
+ }
}
- //姣忔鎵弿涓婄嚎閮芥彃鍏ヨ拷婧〃
- WorkPieceProcess process = new WorkPieceProcess();
- process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(info);
- process.StartTime = DateTimeHelper.GetDateTime();
- process.QualityState = info.QualityState.HasValue ? info.QualityState.Value : (int)QualityState.OK;
- process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- process.CreatedUserName = loginfo.MonitoringPoint;
- process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
- process.UpdatedUserName = loginfo.MonitoringPoint;
- process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
- process.OperationType = OperationType.鐢熶骇.ToString();
- process.Remarks = "";
- if (loginfo.WorkingProcedure.Equals("OP05"))
+ if (isNeedAddNewProcess)
{
- process.EndTime = process.StartTime;
+ //姣忔鎵弿涓婄嚎閮芥彃鍏ヨ拷婧〃
+ WorkPieceProcess new_process = new WorkPieceProcess();
+ new_process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(info);
+ QualityStateHelper.ResetQualityNoOkForNewProcess(ref new_process);
+ new_process.StartTime = DateTimeHelper.GetDateTime();
+
+ //涓嶅啀榛樿璧嬪�间负鍚堟牸 銆怑ditby shaocx,2024-08-16銆�
+ //process.QualityState = info.QualityState.HasValue ? info.QualityState.Value : (int)QualityState.OK;//榛樿鍚堟牸锛屽凡澶勭悊
+ new_process.QualityState = GetQualityStateValue(info.QualityState);
+
+ if (new_process.WorkingProcedureCurrent == WorkingProcedureForHMI.OP70.ToString())
+ { //鐗规畩澶勭悊OP70锛屽洜涓篛P70娌℃湁娴嬮噺锛岄粯璁ゅ悎鏍� [Editby shaocx,2024-07-03]
+ new_process.QualityState = (int)QualityState.OK;//榛樿鍚堟牸锛孫P70榛樿鏄悎鏍�
+ }
+
+ new_process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ new_process.CreatedUserName = loginfo.MonitoringPoint;
+ new_process.DataCapturePointCname = loginfo.DataCapturePointCname;
+ new_process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
+ new_process.UpdatedUserName = loginfo.MonitoringPoint;
+ new_process.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
+ new_process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
+ new_process.OperationType = OperationType.鐢熶骇.ToString();
+ new_process.Remarks = "";
+ if (loginfo.WorkingProcedure.Equals("OP05"))
+ {
+ new_process.EndTime = new_process.StartTime;
+ }
+ db.WorkPieceProcess.Add(new_process);
}
- db.WorkPieceProcess.Add(process);
//db.Database.AutoTransactionsEnabled = false;// 鍚屼竴涓猄aveChanges榛樿浜嬪姟锛� 鍏抽棴榛樿浜嬪姟锛�... 濂藉儚涓嶈兘鐢ㄥ晩锛屽悗闈㈠啀鐮旂┒鍚�
if (isAddWorkPieceInfo)
@@ -341,20 +371,46 @@
}
else
{
- loginfo.Remarks = (loginfo.Remarks ?? "") + $"涓婄嚎瀹屾垚璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"}寮傚父";
+ loginfo.Remarks = $"涓婄嚎瀹屾垚璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"}寮傚父";
Log4NetHelper.WriteErrorLog(type, $" {loginfo.WorkingProcedure}涓婄嚎鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹甗{loginfo.WorkPieceID ?? "绌�"}]鏃跺紓甯革細");
}
}
catch (Exception e)
{
- loginfo.Remarks = (loginfo.Remarks ?? "") + $"璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"}鏇存柊鏁版嵁寮傚父{e.Message}";
+ loginfo.Remarks = $"璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"}鏇存柊鏁版嵁寮傚父{e.Message}";
+ Log4NetHelper.WriteErrorLog(type, $" {loginfo.WorkingProcedure}涓婄嚎鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹甗{loginfo.WorkPieceID ?? "绌�"}]鏃跺紓甯革細", e);
}
finally
{
loginfo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
db.WorkPieceLog.Add(loginfo);
- db.SaveChanges();
+
+ //淇濆瓨鏁版嵁搴撶殑寮傚父鎹曟崏 [Editby shaocx,2024-08-29]
+ try
+ {
+ db.SaveChanges();
+ }
+ catch (DbEntityValidationException exception)
+ {
+ var errorMessages =
+ exception.EntityValidationErrors
+ .SelectMany(validationResult => validationResult.ValidationErrors)
+ .Select(m => m.ErrorMessage);
+ var fullErrorMessage = string.Join(", ", errorMessages);
+ var exceptionMessage = string.Concat(exception.Message, " 楠岃瘉寮傚父娑堟伅鏄細", fullErrorMessage);
+
+ Log4NetHelper.WriteErrorLog(type, $" {loginfo.WorkingProcedure}涓婄嚎鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹甗{loginfo.WorkPieceID ?? "绌�"}],淇濆瓨鏁版嵁搴撴椂寮傚父锛�" + exceptionMessage, exception);
+
+ throw new DbEntityValidationException(exceptionMessage, exception.EntityValidationErrors);
+ }
+ catch (Exception)
+ {
+
+ throw;
+ }
+
+
}
@@ -460,6 +516,9 @@
/// <param name="type"></param>
public static void QualityInfoComplete(WorkPieceLogMiddle logMiddle, LogType type)
{
+ //鏍规嵁璐ㄩ噺鏁版嵁鍒ゆ柇鏄惁鍚堟牸/涓嶅悎鏍� 銆怑ditby shaocx,2024-06-25銆�
+ WorkPieceInfoManager.SetLogMiddleForQuality(ref logMiddle);
+
//姝ゅ鍚屾椂鎻掑叆浜哤orkPieceLog锛學orkPieceInfoLog琛紝骞舵柊澧炴垨淇敼WorkPieceInfo琛�
//鎻掑叆璐ㄩ噺鐩稿叧琛≦ualityDataInfo
@@ -490,12 +549,13 @@
}
else
{
- pieceInfo.QualityState = (int)QualityState.OK;//姝ゅ闇�瑕佹敞鎰忥紝鍒ゆ柇鎵�鏈夊伐搴忚川閲忥紝鐒跺悗鍐嶈祴鍊�
+ pieceInfo.QualityState = (int)QualityState.OK;//姝ゅ闇�瑕佹敞鎰忥紝鍒ゆ柇鎵�鏈夊伐搴忚川閲忥紝鐒跺悗鍐嶈祴鍊� //榛樿鍚堟牸锛孫P05榛樿鏄悎鏍�
pieceInfo.Remarks = "OP05鏂板宸ヤ欢淇℃伅";
}
pieceInfo.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime();
pieceInfo.WorkingProcedurePlan = ConfigHelper.GetConfigString("WorkingProcedureAllStr") ?? "OP05OP10OP20OP30OP35OP40OP50OP60OP70OP80";
- pieceInfo.CreatedUserName = logMiddle.MonitoringPoint;
+ pieceInfo.CreatedUserName = ResetUpdatedUserName(logMiddle);
+ SystemBussinessHelper.SetWorkPieceInfoMiddleForCreatedUserName(ref pieceInfo, logMiddle.DataCapturePointCname);
pieceInfo.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
pieceInfo.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();//
pieceInfo.WorkingProcedureEndTime = null;
@@ -506,7 +566,7 @@
}
else
{
- loginfo2.Remarks = loginfo2.Remarks ?? "" + $"|宸ヤ欢{logMiddle.WorkPieceID} 璐ㄩ噺妫�娴嬪畬鎴愬伐搴弡logMiddle.MonitoringPoint} 娌℃湁鑾峰彇鍒板伐浠朵俊鎭笉鍋氭洿鏂�";
+ loginfo2.Remarks = $"|宸ヤ欢{logMiddle.WorkPieceID} 璐ㄩ噺妫�娴嬪畬鎴愬伐搴弡logMiddle.MonitoringPoint} 娌℃湁鑾峰彇鍒板伐浠朵俊鎭笉鍋氭洿鏂�";
Log4NetHelper.WriteErrorLog(type, $"宸ヤ欢{logMiddle.WorkPieceID} 璐ㄩ噺妫�娴嬪畬鎴愬伐搴弡logMiddle.MonitoringPoint} 娌℃湁鑾峰彇鍒板伐浠朵俊鎭笉鍋氭洿鏂�");
return;
}
@@ -540,7 +600,7 @@
else
{//鏇存柊宸ヤ欢
equinfo.WorkPieceID = logMiddle.WorkPieceID;
- equinfo.UpdatedUserName = logMiddle.MonitoringPoint;
+ equinfo.UpdatedUserName = ResetUpdatedUserName(logMiddle);
equinfo.UpdatedTime = DateTime.Now;
equinfo.OnlineTime = DateTime.Now;
}
@@ -557,8 +617,9 @@
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.Remarks = $"{logMiddle.WorkingProcedure}璐ㄩ噺妫�娴嬪畬鎴愪慨鏀�";
+ pieceInfo.UpdatedUserName = ResetUpdatedUserName(logMiddle);
+ SystemBussinessHelper.SetWorkPieceInfoMiddleForUpdateDataCapturePointCname(ref pieceInfo, logMiddle.DataCapturePointCname);
pieceInfo.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
if (!(pieceInfo.WorkingProcedureStartTime.HasValue && pieceInfo.WorkingProcedureStartTime > DateTime.Parse("1900/01/01")))
{//宸ュ簭寮�濮嬫椂闂存病鏈夊垯璧嬪��
@@ -709,20 +770,34 @@
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_05 = WorkPieceProcessHelper.CreateWorkPieceProcessForOP05(logMiddle, db, pieceInfo);
+ if (process_05 != null)
+ {//鍒涘缓OP05宸ュ簭锛屽綋娌℃湁05宸ュ簭鏃�,鎵嶅垱寤� 銆怑ditby shaocx,2024-08-29銆�
+ db.WorkPieceProcess.Add(process_05);
+ }
WorkPieceProcess process = new WorkPieceProcess();
process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(pieceInfo);
+ QualityStateHelper.ResetQualityNoOkForNewProcess(ref process);
process.StartTime = DateTimeHelper.GetDateTime();
- process.QualityState = pieceInfo.QualityState.HasValue ? pieceInfo.QualityState.Value : (int)QualityState.OK;
+
+ //涓嶅啀榛樿璧嬪�间负鍚堟牸 銆怑ditby shaocx,2024-08-16銆�
+ //process.QualityState = pieceInfo.QualityState.HasValue ? pieceInfo.QualityState.Value : (int)QualityState.OK;//榛樿鍚堟牸锛屽凡澶勭悊
+ process.QualityState = WorkPieceInfoManager.GetQualityStateValue(pieceInfo.QualityState);
+
+
//璁板綍璐ㄩ噺涓嶅悎鏍煎師鍥� 銆怑ditby shaocx,2024-06-26銆�
//璧嬪�间笉鍚堟牸鍘熷洜
SetQualityNoOk_WorkPieceProcess(logMiddle, ref process);
process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- process.CreatedUserName = logMiddle.MonitoringPoint;
+ process.CreatedUserName = ResetUpdatedUserName(logMiddle);
+ process.DataCapturePointCname = logMiddle.DataCapturePointCname;
process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
- process.UpdatedUserName = logMiddle.MonitoringPoint;
+ process.UpdatedUserName = ResetUpdatedUserName(logMiddle);
+ process.UpdateDataCapturePointCname = logMiddle.DataCapturePointCname;
process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
process.OperationType = OperationType.鐢熶骇.ToString();
process.QualityDataInfoID = qualityData.Id;
@@ -732,17 +807,22 @@
else
{//鍏朵粬鐨勯兘鍙槸淇敼
pro.QualityDataInfoID = qualityData.Id;
- pro.UpdatedUserName = logMiddle.MonitoringPoint;
+ pro.UpdatedUserName = ResetUpdatedUserName(logMiddle);
+ pro.UpdateDataCapturePointCname = logMiddle.DataCapturePointCname;
pro.UpdatedTime = DateTimeHelper.GetDateTime();
- pro.QualityState = pieceInfo.QualityState.HasValue ? pieceInfo.QualityState.Value : 9;
+
+ //涓嶅啀榛樿璧嬪�间负鍚堟牸 銆怑ditby shaocx,2024-08-16銆�
+ //pro.QualityState = pieceInfo.QualityState.HasValue ? pieceInfo.QualityState.Value : 9;
+ pro.QualityState = WorkPieceInfoManager.GetQualityStateValue(pieceInfo.QualityState);
+
//璧嬪�间笉鍚堟牸鍘熷洜
SetQualityNoOk_WorkPieceProcess(logMiddle, ref pro);
//TODO:鍒ゆ柇濡傛灉鏄�60宸ュ簭锛岄偅涔堝氨瑕佹洿鏂皃ro琛ㄧ殑鍒涘缓浜轰负loginfo.MonitoringPoint 銆怑ditby shaocx,2024-06-05銆�
if (logMiddle.WorkingProcedure == "OP60")
{
- pro.CreatedUserName = logMiddle.MonitoringPoint;
-
+ pro.CreatedUserName = ResetUpdatedUserName(logMiddle);
+ pro.DataCapturePointCname = logMiddle.DataCapturePointCname;
}
}
@@ -766,24 +846,107 @@
}
else
{
- loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"璐ㄩ噺妫�娴嬪畬鎴愯鍙栦簩缁寸爜{logMiddle.WorkPieceID ?? "绌�"}寮傚父";
+ loginfo2.Remarks = $"璐ㄩ噺妫�娴嬪畬鎴愯鍙栦簩缁寸爜{logMiddle.WorkPieceID ?? "绌�"}寮傚父";
Log4NetHelper.WriteErrorLog(type, $" {logMiddle.WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹甗{logMiddle.WorkPieceID ?? "绌�"}]鏃跺紓甯革細");
}
}
catch (Exception ex)
{
- loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"璐ㄩ噺妫�娴嬪畬鎴恵logMiddle.WorkPieceID ?? "绌�"}鏇存柊鏁版嵁寮傚父{ex.Message}++{ex.StackTrace}";
+ loginfo2.Remarks = $"璐ㄩ噺妫�娴嬪畬鎴恵logMiddle.WorkPieceID ?? "绌�"}鏇存柊鏁版嵁寮傚父{ex.Message}++{ex.StackTrace}";
Log4NetHelper.WriteErrorLog(type, $" {logMiddle.WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹甗{logMiddle.WorkPieceID ?? "绌�"}]鏃跺紓甯革細");
}
finally
{
- loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"璐ㄩ噺锛歿logMiddle.QualityStateStr ?? "绌�"}";
+ loginfo2.Remarks = $"璐ㄩ噺锛歿logMiddle.QualityStateStr ?? "绌�"}";
db.WorkPieceLog.Add(GetAddWorkPieceLog(loginfo2));//鎻掑叆宸ヤ欢閲囬泦鏃ュ織琛�
db.SaveChanges();
}
}
}
+
+ /// <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>
+ /// <returns></returns>
+ public static string ResetUpdatedUserName(WorkPieceLogMiddle logMiddle)
+ {
+ if (logMiddle.MonitoringPoint.Equals("OP1003"))
+ {//鍥犱负OP10鍜孫P40鏄竴鍙版満鍣紝OP1003涓撻棬鏄疧P40娴嬮噺鐨勩��
+ return "OP4003";
+ }
+ return logMiddle.MonitoringPoint;
+ }
+
/// <summary>
/// 宸ヤ欢鎺ㄥ嚭NOOK
/// </summary>
@@ -799,9 +962,9 @@
{
if (loginfo.WorkPieceID != null && loginfo.WorkPieceID.Trim('\0').Length == 22)
{
- WorkPieceInfo info = new WorkPieceInfo();
- info = db.WorkPieceInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault();
- if (info == null || info.WorkPieceID.Length < 1)
+ WorkPieceInfo cur_db_info = new WorkPieceInfo();
+ cur_db_info = db.WorkPieceInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault();
+ if (cur_db_info == null || cur_db_info.WorkPieceID.Length < 1)
{//娌℃湁宸ヤ欢淇℃伅锛屼笉鍋氭洿鏂�
Log4NetHelper.WriteErrorLog(type, $"宸ヤ欢{loginfo.WorkPieceID} 宸ヤ欢鎺ㄥ嚭宸ュ簭{loginfo.WorkingProcedure} 娌℃湁鑾峰彇鍒板伐浠朵俊鎭笉鍋氭洿鏂�");
return;
@@ -810,43 +973,62 @@
{//鏇存柊琛╓orkPieceInfo
if (loginfo.WorkingProcedure.Equals("OP10"))
{
+ /*
info.WorkPieceCurrentPosition = info.WorkingProcedureCurrent + "NOOK";
- //var WorkingProcedure = (loginfo.MonitoringPoint.Equals("OP1002") ? "OP10" : "OP40");
loginfo2.WorkingProcedure = info.WorkingProcedureCurrent;//瑙ｅ喅OP10锛孫P40鍚屼竴涓殑闂
loginfo.WorkingProcedure = info.WorkingProcedureCurrent; //瑙ｅ喅OP10锛孫P40鍚屼竴涓殑闂
+ //*/
+ //淇 閿欒璁板綍鎴怬P05鐨勯棶棰� 銆怑ditby shaocx,2024-08-26銆�
+ var set_WorkingProcedureCurrent = "";
+ if (cur_db_info.WorkingProcedureCurrent != "OP10" && cur_db_info.WorkingProcedureCurrent != "OP40")
+ {
+ SetWorkingProcedureCurrentForOP10(cur_db_info, ref set_WorkingProcedureCurrent);
+ }
+ else
+ {
+ set_WorkingProcedureCurrent = cur_db_info.WorkingProcedureCurrent;
+ }
+ cur_db_info.WorkingProcedureCurrent = set_WorkingProcedureCurrent;
+ cur_db_info.WorkPieceCurrentPosition = set_WorkingProcedureCurrent + "NOOK";
+ loginfo2.WorkingProcedure = set_WorkingProcedureCurrent;//瑙ｅ喅OP10锛孫P40鍚屼竴涓殑闂
+ loginfo.WorkingProcedure = set_WorkingProcedureCurrent; //瑙ｅ喅OP10锛孫P40鍚屼竴涓殑闂
}
else
{
- info.WorkingProcedureCurrent = loginfo.WorkingProcedure;
- info.WorkPieceCurrentPosition = loginfo.WorkingProcedure + "NOOK";
+ cur_db_info.WorkingProcedureCurrent = loginfo.WorkingProcedure;
+ cur_db_info.WorkPieceCurrentPosition = loginfo.WorkingProcedure + "NOOK";
}
- info.WorkPieceState = (int)WorkPieceState.NOOKPush;
- info.UpdatedUserName = loginfo.MonitoringPoint;
- info.UpdatedTime = DateTime.Now;
- info.Remarks = "宸ヤ欢NOOK鎺ㄥ嚭";
- if (!(info.WorkingProcedureStartTime.HasValue && info.WorkingProcedureStartTime > DateTime.Parse("1900/01/01")))
+ cur_db_info.WorkPieceState = (int)WorkPieceState.NOOKPush;
+ cur_db_info.UpdatedUserName = loginfo.MonitoringPoint;
+ SystemBussinessHelper.SetWorkPieceInfoMiddleForUpdateDataCapturePointCname(ref cur_db_info, loginfo.DataCapturePointCname);
+ cur_db_info.UpdatedTime = DateTime.Now;
+ cur_db_info.Remarks = "宸ヤ欢NOOK鎺ㄥ嚭";
+ loginfo2.Remarks = cur_db_info.Remarks;
+ if (!(cur_db_info.WorkingProcedureStartTime.HasValue && cur_db_info.WorkingProcedureStartTime > DateTime.Parse("1900/01/01")))
{
- info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();
+ cur_db_info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();
}
- info.WorkingProcedureEndTime = DateTimeHelper.GetDateTime();
- info.WorkingProcedureCompleted = info.WorkingProcedureCompleted + loginfo.WorkingProcedure;//宸插畬鎴愬伐搴�
- info.WorkPieceCurrentPositionOrder = info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2;
+ 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;
}
+ 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() : "绌�")}";
- info.QualityState = (int)QualityState.NG;
- if (!info.QualityState.Equals(((int)QualityState.OK).ToString()))
+ loginfo2.Remarks = $"OP35NOOK鍘熻川閲忎俊鎭瘂(cur_db_info.QualityState.HasValue ? cur_db_info.QualityState.Value.ToString() : "绌�")}";
+ cur_db_info.QualityState = (int)QualityState.NG;
+ if (!cur_db_info.QualityState.Equals(((int)QualityState.OK).ToString()))
{
- info.QualityErrorInfo = $"{loginfo.WorkingProcedure}宸ュ簭璐ㄩ噺NOOK閲囬泦鏁版嵁涓嶅悎鏍納info.QualityState}";
+ cur_db_info.QualityErrorInfo = $"{loginfo.WorkingProcedure}宸ュ簭璐ㄩ噺NOOK閲囬泦鏁版嵁涓嶅悎鏍納cur_db_info.QualityState}";
}
else
{
- info.QualityErrorInfo = "";
+ cur_db_info.QualityErrorInfo = "";
}
- loginfo.QualityState = info.QualityState;
+ loginfo.QualityState = cur_db_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";
@@ -861,21 +1043,24 @@
pro.EndTime = DateTimeHelper.GetDateTime();
pro.Remarks = (pro.Remarks ?? "") + "NOOK缁撴潫";
pro.UpdatedUserName = loginfo.MonitoringPoint;
+ pro.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
pro.UpdatedTime = DateTimeHelper.GetDateTime();
}
- db.WorkPieceInfoLog.Add(GetAddWorkPieceInfoLog(info));
+ QualityStateHelper.SetQualityStateForNoOk(ref cur_db_info, ref pro, ref qualityData);
+
+ db.WorkPieceInfoLog.Add(GetAddWorkPieceInfoLog(cur_db_info));
}
else
{
- loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"宸ヤ欢NOOK鎺ㄥ嚭璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"}寮傚父";
+ loginfo2.Remarks = $"宸ヤ欢NOOK鎺ㄥ嚭璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"}寮傚父";
Log4NetHelper.WriteErrorLog(type, $" {loginfo.WorkingProcedure}宸ヤ欢NOOK鎺ㄥ嚭璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹甗{loginfo.WorkPieceID ?? "绌�"}]鏃跺紓甯革細");
}
}
catch (Exception e)
{
- loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"}鏇存柊鏁版嵁寮傚父{e.Message}";
+ loginfo2.Remarks = $"璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"}鏇存柊鏁版嵁寮傚父{e.Message}";
}
@@ -902,9 +1087,9 @@
//|| !((loginfo.WorkingProcedure.Equals("OP10") || loginfo.WorkingProcedure.Equals("OP40")) && loginfo.Remarks.Length > 0)
)
{
- WorkPieceInfo info = new WorkPieceInfo();
- info = db.WorkPieceInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault();
- if (info == null || info.WorkPieceID.Length < 1)
+ WorkPieceInfo cur_db_info = new WorkPieceInfo();
+ cur_db_info = db.WorkPieceInfo.Where(o => o.WorkPieceID == loginfo.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} 娌℃湁鑾峰彇鍒板伐浠朵俊鎭笉鍋氭洿鏂�");
@@ -914,66 +1099,83 @@
{//鏇存柊琛╓orkPieceInfo
if (loginfo.WorkingProcedure.Equals("OP10"))
{
- info.WorkPieceCurrentPosition = info.WorkingProcedureCurrent + "SPC";
- //var WorkingProcedure = (loginfo.MonitoringPoint.Equals("OP1002") ? "OP10" : "OP40");
- loginfo2.WorkingProcedure = info.WorkingProcedureCurrent;//瑙ｅ喅OP10锛孫P40鍚屼竴涓殑闂
- loginfo.WorkingProcedure = info.WorkingProcedureCurrent; //瑙ｅ喅OP10锛孫P40鍚屼竴涓殑闂
+ //淇 閿欒璁板綍鎴怬P05鐨勯棶棰� 銆怑ditby shaocx,2024-08-26銆�
+ var set_WorkingProcedureCurrent = "";
+ if (cur_db_info.WorkingProcedureCurrent != "OP10" && cur_db_info.WorkingProcedureCurrent != "OP40")
+ {
+ SetWorkingProcedureCurrentForOP10(cur_db_info, ref set_WorkingProcedureCurrent);
+ }
+ else
+ {
+ set_WorkingProcedureCurrent = cur_db_info.WorkingProcedureCurrent;
+ }
+ cur_db_info.WorkingProcedureCurrent = set_WorkingProcedureCurrent;
+ cur_db_info.WorkPieceCurrentPosition = set_WorkingProcedureCurrent + "SPC";
+ loginfo2.WorkingProcedure = set_WorkingProcedureCurrent;//瑙ｅ喅OP10锛孫P40鍚屼竴涓殑闂
+ loginfo.WorkingProcedure = set_WorkingProcedureCurrent; //瑙ｅ喅OP10锛孫P40鍚屼竴涓殑闂
}
else
{
- info.WorkingProcedureCurrent = loginfo.WorkingProcedure;
- info.WorkPieceCurrentPosition = loginfo.WorkingProcedure + "SPC";
+ cur_db_info.WorkingProcedureCurrent = loginfo.WorkingProcedure;
+ cur_db_info.WorkPieceCurrentPosition = loginfo.WorkingProcedure + "SPC";
}
- info.WorkPieceState = (int)WorkPieceState.SPCPush;
- info.UpdatedUserName = loginfo.MonitoringPoint;
- info.UpdatedTime = DateTime.Now;
- info.WorkingProcedureEndTime = DateTimeHelper.GetDateTime();
- if (!(info.WorkingProcedureStartTime.HasValue && info.WorkingProcedureStartTime > DateTime.Parse("1900/01/01")))
+ cur_db_info.WorkPieceState = (int)WorkPieceState.SPCPush;
+ cur_db_info.UpdatedUserName = loginfo.MonitoringPoint;
+ SystemBussinessHelper.SetWorkPieceInfoMiddleForUpdateDataCapturePointCname(ref cur_db_info, loginfo.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")))
{
- info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();
+ cur_db_info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();
}
- info.WorkingProcedureCompleted = info.WorkingProcedureCompleted + loginfo.WorkingProcedure;//宸插畬鎴愬伐搴�
- info.WorkPieceCurrentPositionOrder = info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2;
+ cur_db_info.WorkingProcedureCompleted = cur_db_info.WorkingProcedureCompleted + loginfo.WorkingProcedure;//宸插畬鎴愬伐搴�
+ cur_db_info.WorkPieceCurrentPositionOrder = cur_db_info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2;
}
- info.Remarks = "宸ヤ欢SPC鎶芥鎺ㄥ嚭";
+ 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 && 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 ?? "") + "SPC鎶芥缁撴潫";
pro.UpdatedUserName = loginfo.MonitoringPoint;
+ pro.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
pro.UpdatedTime = DateTimeHelper.GetDateTime();
}
//姣忔SPC 閮芥彃鍏ヨ拷婧〃
WorkPieceProcess process = new WorkPieceProcess();
- process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(info);
+ process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(cur_db_info);
+ QualityStateHelper.ResetQualityNoOkForNewProcess(ref process);
process.StartTime = DateTimeHelper.GetDateTime();
process.OperationType = OperationType.SPC.ToString();
process.QualityState = (int)QualityState.Suspected;
process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
process.CreatedUserName = loginfo.MonitoringPoint;
+ process.DataCapturePointCname = loginfo.DataCapturePointCname;
process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
process.UpdatedUserName = loginfo.MonitoringPoint;
+ process.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
process.Remarks = "宸ヤ欢SPC鎶芥鎺ㄥ嚭";
db.WorkPieceProcess.Add(process);
- db.WorkPieceInfoLog.Add(GetAddWorkPieceInfoLog(info));
+ db.WorkPieceInfoLog.Add(GetAddWorkPieceInfoLog(cur_db_info));
}
else
{
- loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"宸ヤ欢SPC鎶芥鎺ㄥ嚭璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"}寮傚父";
+ loginfo2.Remarks = $"宸ヤ欢SPC鎶芥鎺ㄥ嚭璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"}寮傚父";
Log4NetHelper.WriteErrorLog(type, $" {loginfo.WorkingProcedure}宸ヤ欢SPC鎶芥鎺ㄥ嚭璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹甗{loginfo.WorkPieceID ?? "绌�"}]鏃跺紓甯革細");
}
}
catch (Exception e)
{
- loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"}鏇存柊鏁版嵁寮傚父{e.Message}";
+ loginfo2.Remarks = $"璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"}鏇存柊鏁版嵁寮傚父{e.Message}";
}
finally
{
@@ -983,6 +1185,37 @@
}
}
+
+
+ public static void SetWorkingProcedureCurrentForOP10(WorkPieceInfo cur_db_info, ref string set_WorkingProcedureCurrent)
+ {
+ //鎴柇瀛楃涓�
+ if (cur_db_info.WorkingProcedureCurrent.Length == 4)
+ {
+ try
+ {
+ var bb = cur_db_info.WorkingProcedureCurrent.Substring(2, 2);
+ int ii = Convert.ToInt32(bb);
+ if (ii <= 10)
+ {
+ set_WorkingProcedureCurrent = "OP10";
+ }
+ else
+ {
+ set_WorkingProcedureCurrent = "OP40";
+ }
+ }
+ catch (Exception)
+ {
+ set_WorkingProcedureCurrent = cur_db_info.WorkingProcedureCurrent;
+ }
+ }
+ else
+ {
+ set_WorkingProcedureCurrent = cur_db_info.WorkingProcedureCurrent;
+ }
+ }
+
/// <summary>
/// 宸ュ簭瀹屾垚
/// </summary>
@@ -1026,12 +1259,13 @@
}
else
{
- info.QualityState = (int)QualityState.OK;//姝ゅ闇�瑕佹敞鎰忥紝鍒ゆ柇鎵�鏈夊伐搴忚川閲忥紝鐒跺悗鍐嶈祴鍊�
+ info.QualityState = (int)QualityState.OK;//姝ゅ闇�瑕佹敞鎰忥紝鍒ゆ柇鎵�鏈夊伐搴忚川閲忥紝鐒跺悗鍐嶈祴鍊� //榛樿鍚堟牸锛孫P05榛樿鏄悎鏍�
info.Remarks = "OP05鏂板宸ヤ欢淇℃伅";
}
info.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime();//WorkPieceInitOnlineTime
info.WorkingProcedurePlan = ConfigHelper.GetConfigString("WorkingProcedureAllStr") ?? "OP05OP10OP20OP30OP35OP40OP50OP60OP70OP80";
info.CreatedUserName = logMiddle.MonitoringPoint;
+ SystemBussinessHelper.SetWorkPieceInfoMiddleForCreatedUserName(ref info, logMiddle.DataCapturePointCname);
info.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
info.WorkingProcedureCurrent = logMiddle.WorkingProcedure;
info.WorkingProcedureEndTime = null;
@@ -1045,6 +1279,7 @@
logMiddle.WorkingProcedure = info.WorkingProcedureCurrent; //瑙ｅ喅OP10锛孫P40鍚屼竴涓殑闂
}
info.UpdatedUserName = logMiddle.MonitoringPoint;
+ SystemBussinessHelper.SetWorkPieceInfoMiddleForUpdateDataCapturePointCname(ref info, logMiddle.DataCapturePointCname);
info.UpdatedTime = DateTimeHelper.GetDateTime();
info.WorkingProcedureCompleted = info.WorkingProcedureCompleted + logMiddle.WorkingProcedure;//宸插畬鎴愬伐搴�
if (!(info.WorkingProcedureStartTime.HasValue && info.WorkingProcedureStartTime > DateTime.Parse("1900/01/01")))
@@ -1071,6 +1306,7 @@
info.QualityStateUpdateTime = loginfo.UpdatedTime.Value.LocalDateTime;
info.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString();
//*/
+
var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == logMiddle.WorkPieceID).FirstOrDefault();
if (qualityData == null || qualityData.WorkPieceID.Length < 1 || qualityData.WorkingProcedure.Length < 1)
@@ -1133,7 +1369,14 @@
}
else
{
- info.WorkPieceState = (int)WorkPieceState.WIP;
+ //杩欓噷淇OP10銆丱P40 鍥犱负PLC鍏堟帹 SPC鎺ㄥ嚭銆佸啀鎺� 浜у搧涓嬬嚎闂锛屽鑷� 浜у搧涓嬬嚎鏇存柊鏁版嵁鏃讹紝鎶奡PC鏁版嵁瑕嗙洊鐨勯棶棰� 銆怑ditby shaocx,2024-08-27銆�
+ var isAlow = SystemBussinessHelper.IsAllowUpdateWorkPieceStateToWip(info, db, logMiddle);
+ if (isAlow)
+ {
+ info.WorkPieceState = (int)WorkPieceState.WIP;
+ }
+
+
if (info.WorkingProcedurePlan.IndexOf(logMiddle.WorkingProcedure) + 4 <= info.WorkingProcedurePlan.Length)
{
info.WorkPieceCurrentPosition = info.WorkingProcedurePlan.Substring(info.WorkingProcedurePlan.IndexOf(logMiddle.WorkingProcedure), 8);
@@ -1145,19 +1388,26 @@
{
WorkPieceProcess process = new WorkPieceProcess();
process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(info);
+ QualityStateHelper.ResetQualityNoOkForNewProcess(ref process);
process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
process.StartTime = DateTimeHelper.GetDateTime();
process.EndTime = DateTimeHelper.GetDateTime();
if (logMiddle.WorkingProcedure.Equals("OP80"))
{//OP80鐨勮川閲忔暟鎹槸鍚庢潵鑾峰彇鏂囦欢鎼炵殑
+ //璐ㄦ鏁版嵁锛屽啀鑰冭檻 鍙﹀涓ょ鐘舵�� 銆怑ditby shaocx,2024-08-27銆�
+ QualityStateHelper.SetQualityStateForOP80(logMiddle, ref info, ref process);
}
else
{
- process.QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value : (int)QualityState.OK;
+ //涓嶅啀榛樿璧嬪�间负鍚堟牸 銆怑ditby shaocx,2024-08-16銆�
+ //process.QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value : (int)QualityState.OK;//榛樿鍚堟牸锛屽凡澶勭悊
+ process.QualityState = WorkPieceInfoManager.GetQualityStateValue(logMiddle.QualityState);
}
process.CreatedUserName = logMiddle.MonitoringPoint;
+ process.DataCapturePointCname = logMiddle.DataCapturePointCname;
process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
process.UpdatedUserName = logMiddle.MonitoringPoint;
+ process.UpdateDataCapturePointCname = logMiddle.DataCapturePointCname;
process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
process.OperationType = OperationType.鐢熶骇.ToString();
process.Remarks = "";
@@ -1173,12 +1423,18 @@
}
else
{
+ if (logMiddle.WorkingProcedure.Equals("OP80"))
+ {//OP80鐨勮川閲忔暟鎹槸鍚庢潵鑾峰彇鏂囦欢鎼炵殑
+ //璐ㄦ鏁版嵁锛屽啀鑰冭檻 鍙﹀涓ょ鐘舵�� 銆怑ditby shaocx,2024-08-27銆�
+ QualityStateHelper.SetQualityStateForOP80(logMiddle, ref info, ref pro);
+ }
if (op80id > 0)
{
pro.QualityDataInfoID = op80id;
}
pro.EndTime = DateTimeHelper.GetDateTime();
pro.UpdatedUserName = logMiddle.MonitoringPoint;
+ pro.UpdateDataCapturePointCname = logMiddle.DataCapturePointCname;
pro.UpdatedTime = DateTimeHelper.GetDateTime();
if (logMiddle.WorkingProcedure.Equals("OP80"))
{
@@ -1198,14 +1454,14 @@
}
else
{
- loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"涓嬬嚎瀹屾垚璇诲彇浜岀淮鐮亄logMiddle.WorkPieceID ?? "绌�"}寮傚父";
+ loginfo2.Remarks = $"涓嬬嚎瀹屾垚璇诲彇浜岀淮鐮亄logMiddle.WorkPieceID ?? "绌�"}寮傚父";
Log4NetHelper.WriteErrorLog(type, $" {logMiddle.WorkingProcedure}宸ュ簭涓嬬嚎 璇诲彇宸ヤ欢鐮佹暟鎹甗{logMiddle.WorkPieceID ?? "绌�"}]鏃跺紓甯革細");
}
}
catch (Exception e)
{
- loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"璇诲彇浜岀淮鐮亄logMiddle.WorkPieceID ?? "绌�"}鏇存柊鏁版嵁寮傚父{e.Message}";
+ loginfo2.Remarks = $"璇诲彇浜岀淮鐮亄logMiddle.WorkPieceID ?? "绌�"}鏇存柊鏁版嵁寮傚父{e.Message}";
}
db.WorkPieceLog.Add(GetAddWorkPieceLog(loginfo2));//鎻掑叆宸ヤ欢閲囬泦鏃ュ織琛�
db.SaveChanges();
@@ -1812,7 +2068,7 @@
}
catch (Exception e)
{
- loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"{loginfo2.MonitoringPoint}璁惧鐩戞帶鏇存柊鏁版嵁寮傚父{e.Message}.{e.StackTrace}";
+ loginfo2.Remarks = $"{loginfo2.MonitoringPoint}璁惧鐩戞帶鏇存柊鏁版嵁寮傚父{e.Message}.{e.StackTrace}";
Log4NetHelper.WriteErrorLog(type, $"{loginfo2.MonitoringPoint}璁惧鐩戞帶鏇存柊鏁版嵁寮傚父{e.Message}.{e.StackTrace}");
}
@@ -2146,13 +2402,47 @@
public static void SetQualityNoOk_WorkPieceInfo(WorkPieceLogMiddle logMiddle, ref WorkPieceInfo pieceInfo)
{
+ if (!IsWirteQualityNoOk(logMiddle, pieceInfo.QualityNoOk)) return;
+
pieceInfo.QualityNoOk = logMiddle.QualityNoOk;
pieceInfo.QualityNoOkReason = logMiddle.QualityNoOkReason;
}
public static void SetQualityNoOk_WorkPieceProcess(WorkPieceLogMiddle logMiddle, ref WorkPieceProcess pieceProcess)
{
+ if (!IsWirteQualityNoOk(logMiddle, pieceProcess.QualityNoOk)) return;
+
pieceProcess.QualityNoOk = logMiddle.QualityNoOk;
pieceProcess.QualityNoOkReason = logMiddle.QualityNoOkReason;
+ }
+
+ /// <summary>
+ /// 鏄惁闇�瑕侀噸鍐� NOOK鍘熷洜
+ /// </summary>
+ /// <param name="logMiddle"></param>
+ /// <param name="pieceInfo"></param>
+ /// <returns></returns>
+ public static bool IsWirteQualityNoOk(WorkPieceLogMiddle logMiddle, int? qualityNoOk)
+ {
+ if (logMiddle.WorkingProcedure == (WorkingProcedureForHMI.OP30).ToString())
+ {
+ //鐗规畩閫昏緫锛氭寜鐓P30鐨勯『搴忓垽鏂�
+ if (logMiddle.QualityNoOk != null && qualityNoOk != null
+ && (
+ qualityNoOk == (int)QualityNoOkEnum.OP30鍘嬭‖濂楀伐浣嶅姏鐭╁ぇ
+ || qualityNoOk == (int)QualityNoOkEnum.OP30娑ㄦ柇宸ヤ綅鍔涚煩澶�
+ || qualityNoOk == (int)QualityNoOkEnum.OP30缁堟嫥绱у伐浣嶅姏鐭╁ぇ
+ || qualityNoOk == (int)QualityNoOkEnum.OP30棰勬嫥绱у伐浣嶅姏鐭╁ぇ
+ )
+ )
+ {
+ if ((int)logMiddle.QualityNoOk > (int)qualityNoOk)
+ {//涓嶉渶瑕侀噸鏂拌祴鍊�
+ return false;
+ }
+ }
+ }
+
+ return true;
}
@@ -2241,6 +2531,8 @@
public static void SetLogMiddleForQuality(ref WorkPieceLogMiddle logMiddle)
{
+ logMiddle.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
+
//鏍规嵁璐ㄩ噺鏁版嵁鍒ゆ柇鏄惁鍚堟牸/涓嶅悎鏍� 銆怑ditby shaocx,2024-06-25銆�
QualityNoOkEnum? qualityNoOkEnum = null;
QualityState qualityState = WorkPieceInfoManager.CalcQualityStateForOP(logMiddle, ref qualityNoOkEnum);
@@ -2260,7 +2552,7 @@
{
QualityState qualityState = QualityState.Suspected;
if (logMiddle.WorkingProcedure == "OP60")
- {
+ {//鍚堟牸/涓嶅悎鏍肩敱 WMS鑷鍒ゆ柇
decimal _QualityOP60To1 = SystemHelper.GetDecimal(logMiddle.QualityOP60To1);
decimal _QualityOP60To2 = SystemHelper.GetDecimal(logMiddle.QualityOP60To2);
var isPass_QualityOP60To1 = false;
@@ -2299,8 +2591,14 @@
}
return qualityState;
}
- if (logMiddle.WorkingProcedure == "OP80")
- {
+ else if (logMiddle.WorkingProcedure == "OP80")
+ {//鍚堟牸/涓嶅悎鏍肩敱 OP80 鍒ゆ柇锛孮ualityState 鍜� QualityStateStr 閮藉湪璋冪敤褰撳墠鏂规硶鍓� 鍐欏叆鍊间簡
+ if (logMiddle.QualityState == (int)QualityState.OK)
+ {
+ qualityState = QualityState.OK;
+ return qualityState;
+ }
+
decimal _QualityOP80_D_TKZJ = SystemHelper.GetDecimal(logMiddle.QualityOP80_D_TKZJ);
if (!(_QualityOP80_D_TKZJ >= (decimal)53.018 && _QualityOP80_D_TKZJ <= (decimal)53.03))
{
@@ -2338,13 +2636,13 @@
}
decimal _QualityOP80To4 = SystemHelper.GetDecimal(logMiddle.QualityOP80To4);
- if (!(_QualityOP80To4 >= (decimal)0 && _QualityOP80To4 <= (decimal)0.075))
+ if (!(_QualityOP80To4 >= (decimal)(-0.075) && _QualityOP80To4 <= (decimal)0.075))
{
qualityNoOkEnum = QualityNoOkEnum.OP80灏忓ご瀛斿钩琛屽害寮洸瓒呭樊;
}
decimal _QualityOP80To5 = SystemHelper.GetDecimal(logMiddle.QualityOP80To5);
- if (!(_QualityOP80To5 >= (decimal)0 && _QualityOP80To5 <= (decimal)0.2))
+ if (!(_QualityOP80To5 >= (decimal)(-0.2) && _QualityOP80To5 <= (decimal)0.2))
{
qualityNoOkEnum = QualityNoOkEnum.OP80灏忓ご瀛斿钩琛屽害鎵洸瓒呭樊;
}
@@ -2383,41 +2681,92 @@
return qualityState;
}
else if (logMiddle.WorkingProcedure == "OP10")
- {
+ {//鍚堟牸/涓嶅悎鏍肩敱 QualityStateStr鍊煎垽鏂�
if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP10鍘氬害瓒呭樊;
}
+ else
+ {
+ qualityState = QualityState.OK;
+ }
return qualityState;
}
else if (logMiddle.WorkingProcedure == "OP20")
- {
+ {//鍚堟牸/涓嶅悎鏍肩敱 QualityStateStr鍊煎垽鏂�
if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP20灏忓ご瀛旂洿寰勮秴宸�;
}
+ else
+ {
+ qualityState = QualityState.OK;
+ }
+ return qualityState;
+ }
+ else if (logMiddle.WorkingProcedure == "OP30")
+ {//鍚堟牸/涓嶅悎鏍肩敱 QualityStateStr鍊煎垽鏂�
+ if (logMiddle.QualityStateStr.Equals("OK"))
+ {
+ qualityState = QualityState.OK;
+ }
+ else
+ {
+ qualityState = QualityState.NG;
+ }
return qualityState;
}
else if (logMiddle.WorkingProcedure == "OP35")
- {
+ {//鍚堟牸/涓嶅悎鏍肩敱 QualityStateStr鍊煎垽鏂�
if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP35婊氬帇鍔涗笉鍚堟牸;
}
+ else
+ {
+ qualityState = QualityState.OK;
+ }
return qualityState;
}
else if (logMiddle.WorkingProcedure == "OP40")
- {
+ {//鍚堟牸/涓嶅悎鏍肩敱 QualityStateStr鍊煎垽鏂�
if (logMiddle.QualityState == (int)QualityState.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP40鍘氬害瓒呭樊;
}
+ else
+ {
+ qualityState = QualityState.OK;
+ }
return qualityState;
}
return qualityState;
}
+ /// <summary>
+ /// 鑾峰彇璐ㄩ噺鐘舵�佸��
+ /// </summary>
+ /// <param name="qualityState"></param>
+ /// <returns></returns>
+ public static int GetQualityStateValue(int? qualityState)
+ {
+ if (qualityState.HasValue == false)
+ {
+ return (int)QualityState.Suspected;
+ }
+ if (qualityState.Value == 1)
+ {
+ return (int)QualityState.OK;
+ }
+ if (qualityState.Value == 2)
+ {
+ return (int)QualityState.NG;
+ }
+ return (int)QualityState.Suspected;
+ }
+
+
#endregion
}
}
--
Gitblit v1.9.3