From c7acb51c3ace14e509704f453adc58b9eb6613a8 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 16 10月 2024 16:23:28 +0800
Subject: [PATCH] 细节
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/2_QualityInfoCompleteManager.cs | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/2_QualityInfoCompleteManager.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/2_QualityInfoCompleteManager.cs
index 7ee69c9..98908f3 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/2_QualityInfoCompleteManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/2_QualityInfoCompleteManager.cs
@@ -5,6 +5,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using System.Web.UI.WebControls;
namespace iWare_SCADA_BusinessLogical.BLL.Important
{
@@ -67,9 +68,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} 娌℃湁鑾峰彇鍒板伐浠朵俊鎭�,姝ゆ椂闇�瑕佹柊澧炴暟鎹�");
+
+ //鏂板鏁版嵁 銆怑ditby shaocx,2024-09-07銆�
+ WorkPieceInfoHelper.CreateWorkPieceInfoForNoData(logMiddle, ref pieceInfo, ref isAddWorkPieceInfo);
}
}
if (logMiddle.MonitoringPoint.Equals("OP1002") || logMiddle.MonitoringPoint.Equals("OP1003") || logMiddle.MonitoringPoint.Contains("OP2002"))
@@ -301,6 +304,7 @@
process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
process.CreatedUserName = WorkPieceInfoManager.ResetUpdatedUserName(logMiddle);
+ process.JiaJuGongWei = logMiddle.JiaJuGongWei;
process.DataCapturePointCname = logMiddle.DataCapturePointCname;
process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
process.UpdatedUserName = WorkPieceInfoManager.ResetUpdatedUserName(logMiddle);
@@ -423,6 +427,16 @@
{
db.QualityDataInfo.Add(WorkPieceInfoManager.GetAddQualityDataInfo(qualityData));
}
+
+ //鏇存柊琛╓orkPieceProcess
+ var pro_70 = db.WorkPieceProcess.Where(o => o.WorkPieceID == logMiddle.WorkPieceID && o.WorkingProcedureCurrent == "OP70"
+ ).OrderByDescending(o => o.StartTime).FirstOrDefault();
+
+ if (pro_70 != null)
+ {
+ pro_70.Update70Flag = 2;
+ }
+
db.SaveChanges();//淇濆瓨鏁版嵁
}
else
--
Gitblit v1.9.3