From 6a9cb330790ca75dffe43e87bd5c5ad8a5ec3311 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 07 9月 2024 07:09:56 +0800
Subject: [PATCH] 如果主工序表没有数据，就创建
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/WorkPieceInfoHelper.cs | 61 +++++++++++++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/4_WorkPiecePushOffManager.cs | 73 ++++++++++--------
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/5_WorkPieceSPCPushOffManager.cs | 62 ++++++++------
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/2_QualityInfoCompleteManager.cs | 8 +
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj | 1
5 files changed, 142 insertions(+), 63 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..8a04177 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
@@ -67,9 +67,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"))
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/4_WorkPiecePushOffManager.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/4_WorkPiecePushOffManager.cs
index 598c7fe..f10ab83 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/4_WorkPiecePushOffManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/4_WorkPiecePushOffManager.cs
@@ -13,28 +13,30 @@
/// <summary>
/// 宸ヤ欢鎺ㄥ嚭NOOK
/// </summary>
- /// <param name="loginfo"></param>
+ /// <param name="logMiddle"></param>
/// <param name="type"></param>
- public static void WorkPiecePushOff(WorkPieceLogMiddle loginfo, LogType type)
+ public static void WorkPiecePushOff(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)
{
+ 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)
{//娌℃湁宸ヤ欢淇℃伅锛屼笉鍋氭洿鏂�
- Log4NetHelper.WriteErrorLog(type, $"宸ヤ欢{loginfo.WorkPieceID} 宸ヤ欢鎺ㄥ嚭NOOK宸ュ簭{loginfo.WorkingProcedure} 娌℃湁鑾峰彇鍒板伐浠朵俊鎭笉鍋氭洿鏂�");
- return;
+ Log4NetHelper.WriteErrorLog(type, $"宸ヤ欢{logMiddle.WorkPieceID} 宸ヤ欢鎺ㄥ嚭NOOK宸ュ簭{logMiddle.WorkingProcedure} 娌℃湁鑾峰彇鍒板伐浠朵俊鎭�,姝ゆ椂闇�瑕佹柊澧炴暟鎹�");
+ //鏂板鏁版嵁 銆怑ditby shaocx,2024-09-07銆�
+ WorkPieceInfoHelper.CreateWorkPieceInfoForPushOff(logMiddle, ref cur_db_info, ref isAddWorkPieceInfo);
}
else
{//鏇存柊琛╓orkPieceInfo
- if (loginfo.WorkingProcedure.Equals("OP10"))
+ if (logMiddle.WorkingProcedure.Equals("OP10"))
{
/*
info.WorkPieceCurrentPosition = info.WorkingProcedureCurrent + "NOOK";
@@ -54,16 +56,16 @@
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鍚屼竴涓殑闂
+ logMiddle.WorkingProcedure = set_WorkingProcedureCurrent; //瑙ｅ喅OP10锛孫P40鍚屼竴涓殑闂
}
else
{
- cur_db_info.WorkingProcedureCurrent = loginfo.WorkingProcedure;
- cur_db_info.WorkPieceCurrentPosition = loginfo.WorkingProcedure + "NOOK";
+ cur_db_info.WorkingProcedureCurrent = logMiddle.WorkingProcedure;
+ cur_db_info.WorkPieceCurrentPosition = logMiddle.WorkingProcedure + "NOOK";
}
cur_db_info.WorkPieceState = (int)WorkPieceState.NOOKPush;
- 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.Remarks = "宸ヤ欢NOOK鎺ㄥ嚭";
loginfo2.Remarks = cur_db_info.Remarks;
@@ -72,42 +74,42 @@
cur_db_info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();
}
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;
+ cur_db_info.WorkingProcedureCompleted = cur_db_info.WorkingProcedureCompleted + logMiddle.WorkingProcedure;//宸插畬鎴愬伐搴�
+ cur_db_info.WorkPieceCurrentPositionOrder = cur_db_info.WorkingProcedurePlan.IndexOf(logMiddle.WorkingProcedure) / 2;
}
QualityDataInfo qualityData = null;
- qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault();
- if (loginfo.WorkingProcedure.Equals("OP35"))
+ qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == logMiddle.WorkPieceID).FirstOrDefault();
+ if (logMiddle.WorkingProcedure.Equals("OP35"))
{//涓轰簡瑙ｅ喅OP35鐨勯噰闆嗗埌鐨勮川閲忎俊鎭槸OK杩楴OOK鐨勬儏鍐碉紝OP35 NOOK鏃舵洿鏂拌川閲忎俊鎭�
loginfo2.Remarks = $"OP35NOOK鍘熻川閲忎俊鎭瘂(cur_db_info.QualityState.HasValue ? cur_db_info.QualityState.Value.ToString() : "绌�")}";
cur_db_info.QualityState = (int)QualityStateEnum.NG;
if (!cur_db_info.QualityState.Equals(((int)QualityStateEnum.OK).ToString()))
{
- cur_db_info.QualityErrorInfo = $"{loginfo.WorkingProcedure}宸ュ簭璐ㄩ噺NOOK閲囬泦鏁版嵁涓嶅悎鏍納cur_db_info.QualityState}";
+ cur_db_info.QualityErrorInfo = $"{logMiddle.WorkingProcedure}宸ュ簭璐ㄩ噺NOOK閲囬泦鏁版嵁涓嶅悎鏍納cur_db_info.QualityState}";
}
else
{
cur_db_info.QualityErrorInfo = "";
}
- loginfo.QualityState = cur_db_info.QualityState;
+ logMiddle.QualityState = cur_db_info.QualityState;
if (qualityData != null)
{
- qualityData.OP35QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value.ToString() : "3";
+ qualityData.OP35QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
qualityData.OP35QualityReceiveTime = DateTimeHelper.GetDateTime();
db.QualityDataInfoLog.Add(WorkPieceInfoManager.GetAddQualityDataInfoLog(qualityData));
}
}
//鏇存柊涓婁竴宸ュ簭鐨勭粨鏉熸椂闂�
- 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 == 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 = "NOOK缁撴潫";
- pro.UpdatedUserName = loginfo.MonitoringPoint;
- pro.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
+ pro.UpdatedUserName = logMiddle.MonitoringPoint;
+ pro.UpdateDataCapturePointCname = logMiddle.DataCapturePointCname;
pro.UpdatedTime = DateTimeHelper.GetDateTime();
}
else
@@ -116,16 +118,16 @@
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.StartTime = DateTimeHelper.GetDateTime().AddSeconds(-SystemBussinessHelper.MoNiTimeForWorkingProcedure(logMiddle.WorkingProcedure));
add_process.EndTime = DateTimeHelper.GetDateTime();
//涓嶅啀榛樿璧嬪�间负鍚堟牸 銆怑ditby shaocx,2024-08-16銆�
- add_process.QualityState = WorkPieceInfoManager.GetQualityStateValue(loginfo.QualityState);
+ add_process.QualityState = WorkPieceInfoManager.GetQualityStateValue(logMiddle.QualityState);
- add_process.CreatedUserName = loginfo.MonitoringPoint;
- add_process.DataCapturePointCname = loginfo.DataCapturePointCname;
+ add_process.CreatedUserName = logMiddle.MonitoringPoint;
+ add_process.DataCapturePointCname = logMiddle.DataCapturePointCname;
add_process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
- add_process.UpdatedUserName = loginfo.MonitoringPoint;
- add_process.UpdateDataCapturePointCname = loginfo.DataCapturePointCname;
+ add_process.UpdatedUserName = logMiddle.MonitoringPoint;
+ add_process.UpdateDataCapturePointCname = logMiddle.DataCapturePointCname;
add_process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
add_process.OperationType = OperationType.鐢熶骇.ToString();
add_process.Remarks = "NOOK缁撴潫";
@@ -135,18 +137,23 @@
QualityStateHelper.SetQualityStateForNoOk(ref cur_db_info, ref pro, ref qualityData);
+ if (isAddWorkPieceInfo)
+ {
+ db.WorkPieceInfo.Add(cur_db_info);
+ }
+
db.WorkPieceInfoLog.Add(WorkPieceInfoManager.GetAddWorkPieceInfoLog(cur_db_info));
}
else
{
- loginfo2.Remarks = $"宸ヤ欢NOOK鎺ㄥ嚭璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"}寮傚父";
- Log4NetHelper.WriteErrorLog(type, $" {loginfo.WorkingProcedure}宸ヤ欢NOOK鎺ㄥ嚭璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹甗{loginfo.WorkPieceID ?? "绌�"}]鏃跺紓甯革細");
+ loginfo2.Remarks = $"宸ヤ欢NOOK鎺ㄥ嚭璇诲彇浜岀淮鐮亄logMiddle.WorkPieceID ?? "绌�"}寮傚父";
+ Log4NetHelper.WriteErrorLog(type, $" {logMiddle.WorkingProcedure}宸ヤ欢NOOK鎺ㄥ嚭璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹甗{logMiddle.WorkPieceID ?? "绌�"}]鏃跺紓甯革細");
}
}
catch (Exception e)
{
- loginfo2.Remarks = $"璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"}鏇存柊鏁版嵁寮傚父{e.Message}";
+ loginfo2.Remarks = $"璇诲彇浜岀淮鐮亄logMiddle.WorkPieceID ?? "绌�"}鏇存柊鏁版嵁寮傚父{e.Message}";
}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/5_WorkPieceSPCPushOffManager.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/5_WorkPieceSPCPushOffManager.cs
index c46119d..dad6360 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/5_WorkPieceSPCPushOffManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/5_WorkPieceSPCPushOffManager.cs
@@ -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} 娌℃湁鑾峰彇鍒板伐浠朵俊鎭�,姝ゆ椂闇�瑕佹柊澧炴暟鎹�");
+
+ //鏂板鏁版嵁 銆怑ditby shaocx,2024-09-07銆�
+ WorkPieceInfoHelper.CreateWorkPieceInfoForNoData(logMiddle, ref cur_db_info, ref isAddWorkPieceInfo);
+
}
else
{//鏇存柊琛╓orkPieceInfo
- if (loginfo.WorkingProcedure.Equals("OP10"))
+ if (logMiddle.WorkingProcedure.Equals("OP10"))
{
//淇 閿欒璁板綍鎴怬P05鐨勯棶棰� 銆怑ditby 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锛孫P40鍚屼竴涓殑闂
- loginfo.WorkingProcedure = set_WorkingProcedureCurrent; //瑙ｅ喅OP10锛孫P40鍚屼竴涓殑闂
+ logMiddle.WorkingProcedure = set_WorkingProcedureCurrent; //瑙ｅ喅OP10锛孫P40鍚屼竴涓殑闂
}
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
{
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/WorkPieceInfoHelper.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/WorkPieceInfoHelper.cs
new file mode 100644
index 0000000..f7b76e1
--- /dev/null
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/WorkPieceInfoHelper.cs
@@ -0,0 +1,61 @@
+锘�
+using iWare_SCADA_BusinessLogical.BLL;
+using iWare_SCADA_Model;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.UI.WebControls;
+
+namespace iWare_SCADA_BusinessLogical.Utils
+{
+ /// <summary>
+ /// 涓诲伐搴忓府鍔╃被
+ /// </summary>
+ public class WorkPieceInfoHelper
+ {
+
+ /// <summary>
+ /// NOOK鏃舵帹鍑猴紝濡傛灉娌℃湁宸ヤ欢淇℃伅锛屽垯鍒涘缓宸ヤ欢淇℃伅
+ /// </summary>
+ /// <param name="db"></param>
+ /// <param name="pieceInfo"></param>
+ /// <returns></returns>
+ public static void CreateWorkPieceInfoForPushOff(WorkPieceLogMiddle logMiddle, ref WorkPieceInfo db_info, ref bool isAddWorkPieceInfo)
+ {
+ CreateWorkPieceInfoForNoData(logMiddle, ref db_info, ref isAddWorkPieceInfo);
+
+ db_info.QualityState = (int)QualityStateEnum.NG;
+
+ }
+
+ /// <summary>
+ /// 濡傛灉娌℃湁宸ヤ欢淇℃伅锛屽垯鍒涘缓宸ヤ欢淇℃伅,娉ㄦ剰锛氫笉澶勭悊璐ㄩ噺鐘舵��
+ /// </summary>
+ /// <param name="db"></param>
+ /// <param name="pieceInfo"></param>
+ /// <returns></returns>
+ public static void CreateWorkPieceInfoForNoData(WorkPieceLogMiddle logMiddle, ref WorkPieceInfo db_info, ref bool isAddWorkPieceInfo)
+ {
+ db_info = EntityPropHelper.Mapper<WorkPieceInfo, WorkPieceLog>(logMiddle);
+
+ //璐ㄩ噺鏁版嵁鍚庨潰鏇存柊
+ //db_info.QualityState = "";
+
+ db_info.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime();
+ db_info.WorkingProcedurePlan = ConfigHelper.GetConfigString("WorkingProcedureAllStr") ?? "OP05OP10OP20OP30OP35OP40OP50OP60OP70OP80";
+ db_info.CreatedUserName = logMiddle.MonitoringPoint;
+ SystemBussinessHelper.SetWorkPieceInfoMiddleForCreatedUserName(ref db_info, logMiddle.DataCapturePointCname);
+ db_info.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
+ db_info.WorkingProcedureCurrent = logMiddle.WorkingProcedure;
+ db_info.WorkingProcedureEndTime = null;
+ db_info = WorkPieceInfoManager.ParseQRCode(db_info);
+
+ db_info.Remarks = $"{logMiddle.WorkingProcedure}鏂板宸ヤ欢淇℃伅";
+
+ isAddWorkPieceInfo = true;
+ }
+ }
+}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
index 8f8b6a9..e82b2f9 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
@@ -165,6 +165,7 @@
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Utils\ClearDataHandler.cs" />
+ <Compile Include="Utils\WorkPieceInfoHelper.cs" />
<Compile Include="Utils\WorkPieceProcessHelper.cs" />
<Compile Include="Utils\QualityStateHelper.cs" />
<Compile Include="Utils\MonitorHelper.cs" />
--
Gitblit v1.9.3