From be9b996f8d4dd05efcd84e9e9397d31a0d33ab50 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 05 9月 2024 14:21:16 +0800
Subject: [PATCH] 代码回归
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 168 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 99 insertions(+), 69 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 944f141..b074e05 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -178,13 +178,13 @@
//EntityPropHelper<WorkPieceLog, WorkPieceInfo>.CopyProp(loginfo, info, loginfo.GetWorkPieceInfoDict());
if (!loginfo.WorkingProcedure.Equals("OP05"))
{//褰撳伐浠朵簩缁寸爜绗竴娆″嚭鐜扮殑宸ュ簭涓嶆槸OP05锛屽垯璁剧疆涓哄彲鐤戠姸鎬�
- info.QualityState = (int)QualityState.Suspected;
+ info.QualityState = (int)QualityStateEnum.Suspected;
info.QualityErrorInfo = $"宸ヤ欢浜岀淮鐮佺涓�娆″嚭鐜扮殑宸ュ簭{loginfo.MonitoringPoint}涓嶆槸OP05,鏁版嵁缂哄け,璇风‘璁ゆ儏鍐靛苟鍋氱浉搴斿鐞嗭紒";
info.Remarks = $"宸ヤ欢浜岀淮鐮佺涓�娆″嚭鐜扮殑宸ュ簭{loginfo.WorkingProcedure}涓嶆槸OP05,鏁版嵁缂哄け,璇风‘璁ゆ儏鍐靛苟鍋氱浉搴斿鐞嗭紒";
}
else
- {
- info.QualityState = (int)QualityState.OK;//姝ゅ闇�瑕佹敞鎰忥紝鍒ゆ柇鎵�鏈夊伐搴忚川閲忥紝鐒跺悗鍐嶈祴鍊� //榛樿鍚堟牸锛孫P05榛樿鏄悎鏍�
+ {//OP05宸ュ簭
+ info.QualityState = (int)QualityStateEnum.OK;//姝ゅ闇�瑕佹敞鎰忥紝鍒ゆ柇鎵�鏈夊伐搴忚川閲忥紝鐒跺悗鍐嶈祴鍊� //榛樿鍚堟牸锛孫P05榛樿鏄悎鏍�
info.Remarks = "OP05鏂板宸ヤ欢淇℃伅";
}
info.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime();
@@ -203,20 +203,29 @@
return;
}
}
- info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();//
- info.WorkingProcedureEndTime = null;
- info.WorkPieceState = (int)WorkPieceState.WIP;
- info.EquipmentID = loginfo.EquipmentID;
- info.QualityStateUpdateUser = loginfo.UpdatedUserName;
- 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.WorkingProcedureCurrent}宸ヤ欢涓婄嚎";
+ if ((info.WorkingProcedureCurrent.Equals("OP05") && isAddWorkPieceInfo == false))
+ {
+ //濡傛灉鏄疧P05鐨勶紝骞朵笖鏄� 涓嶉渶瑕佹柊澧� 琛╓orkPieceInfo锛岄偅涔堝氨涓嶉渶瑕佹洿鏂拌〃 WorkPieceInfo
+ }
+ else
+ {
+ info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();//
+ info.WorkingProcedureEndTime = null;
+ info.WorkPieceState = (int)WorkPieceState.WIP;
+ info.EquipmentID = loginfo.EquipmentID;
+ info.QualityStateUpdateUser = loginfo.UpdatedUserName;
+ 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.WorkingProcedureCurrent}宸ヤ欢涓婄嚎";
+ }
+
//淇涓� op35 鍚屼竴涓欢 涓嬬嚎鏃堕棿璺熶笅涓�涓笂绾挎椂闂翠竴妯′竴鏍风殑闂 銆怑ditby shaocx,2024-08-27銆�
var isNeedAddNewProcess = true;
@@ -237,6 +246,15 @@
pro.Remarks = "鍙堜竴娆′笂绾匡紝鏇存柊缁撴潫鏃堕棿";
}
}
+ //鐗规畩澶勭悊OP05涓婄嚎锛屽洜涓轰粬鏄牴鎹枃鏈垪琛ㄥ唴瀹逛笂绾跨殑 銆怑ditby shaocx,2024-09-03銆�
+ if (loginfo.WorkingProcedure.Equals("OP05"))
+ {
+ var op05Proccss = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && o.WorkingProcedureCurrent == loginfo.WorkingProcedure).FirstOrDefault();
+ if (op05Proccss != null)
+ {
+ isNeedAddNewProcess = false;//涓嶉渶瑕佹柊澧炰簡
+ }
+ }
if (isNeedAddNewProcess)
{
//姣忔鎵弿涓婄嚎閮芥彃鍏ヨ拷婧〃
@@ -251,7 +269,7 @@
if (new_process.WorkingProcedureCurrent == WorkingProcedureForHMI.OP70.ToString())
{ //鐗规畩澶勭悊OP70锛屽洜涓篛P70娌℃湁娴嬮噺锛岄粯璁ゅ悎鏍� [Editby shaocx,2024-07-03]
- new_process.QualityState = (int)QualityState.OK;//榛樿鍚堟牸锛孫P70榛樿鏄悎鏍�
+ new_process.QualityState = (int)QualityStateEnum.OK;//榛樿鍚堟牸锛孫P70榛樿鏄悎鏍�
}
new_process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
@@ -263,14 +281,24 @@
new_process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
new_process.OperationType = OperationType.鐢熶骇.ToString();
new_process.Remarks = "";
- new_process.MyRemarks = "璇荤爜涓婄嚎鏃讹紝濡傛灉鎵句笉鍒板氨鏂板缓";
+ new_process.MyRemarks = "璇荤爜涓婄嚎鏃讹紝姣忔鎵弿涓婄嚎閮芥彃鍏ヨ拷婧〃";
if (loginfo.WorkingProcedure.Equals("OP05"))
- {
+ {//鐗规畩澶勭悊OP05宸ュ簭
new_process.EndTime = new_process.StartTime;
+
+ //濡傛灉宸茬粡瀛樺湪鍏朵粬宸ュ簭锛岄偅涔堝氨蹇呴』瑕佹寜鐓у叾浠栧伐搴忕殑鏃堕棿寰�鍓嶆帹鏁版嵁 銆怑ditby shaocx,2024-09-05銆�
+ var op05OtherProccss = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID).OrderBy(x => x.StartTime).FirstOrDefault();
+ if (op05OtherProccss != null)
+ {//璇存槑鏈夛紝閭ｄ箞鏃堕棿灏辨寜鐓ц繖涓椂闂村線鍓嶆帹
+ var _time = op05OtherProccss.StartTime.AddHours(-1);
+ new_process.StartTime = _time;
+ new_process.EndTime = _time;
+ new_process.CreatedTime = _time;
+ new_process.UpdatedTime = _time;
+ }
}
db.WorkPieceProcess.Add(new_process);
}
-
//db.Database.AutoTransactionsEnabled = false;// 鍚屼竴涓猄aveChanges榛樿浜嬪姟锛� 鍏抽棴榛樿浜嬪姟锛�... 濂藉儚涓嶈兘鐢ㄥ晩锛屽悗闈㈠啀鐮旂┒鍚�
if (isAddWorkPieceInfo)
{
@@ -289,11 +317,11 @@
string message = "";
checkQualityInfoCompleteFlag = WorkPieceInfoManager.CheckQualityInfoComplete(info, loginfo, type);
- if (!checkQualityInfoCompleteFlag || info.QualityState != (int)QualityState.OK)
+ if (!checkQualityInfoCompleteFlag || info.QualityState != (int)QualityStateEnum.OK)
{
plcFlag = false;
message = !checkQualityInfoCompleteFlag ? "璺冲簭锛�" : "";
- message += info.QualityState != (int)QualityState.OK ? "璐ㄩ噺涓嶇鍚�" : "";
+ message += info.QualityState != (int)QualityStateEnum.OK ? "璐ㄩ噺涓嶇鍚�" : "";
}
////鍙嶉缁橮LC锛岋紙鍐欏叆鐐瑰緟瀹氾級
//MessageModel fr = null;
@@ -544,13 +572,13 @@
//EntityPropHelper<WorkPieceLog, WorkPieceInfo>.CopyProp(loginfo, info, loginfo.GetWorkPieceInfoDict());
if (!logMiddle.WorkingProcedure.Equals("OP05"))
{//褰撳伐浠朵簩缁寸爜绗竴娆″嚭鐜扮殑宸ュ簭涓嶆槸OP05锛屽垯璁剧疆涓哄彲鐤戠姸鎬�
- pieceInfo.QualityState = (int)QualityState.Suspected;
+ pieceInfo.QualityState = (int)QualityStateEnum.Suspected;
pieceInfo.QualityErrorInfo = $"宸ヤ欢浜岀淮鐮佺涓�娆″嚭鐜扮殑宸ュ簭{logMiddle.MonitoringPoint}涓嶆槸OP05,鏁版嵁缂哄け,璇风‘璁ゆ儏鍐靛苟鍋氱浉搴斿鐞嗭紒";
pieceInfo.Remarks = $"宸ヤ欢浜岀淮鐮佺涓�娆″嚭鐜扮殑宸ュ簭{logMiddle.WorkingProcedure}涓嶆槸OP05,鏁版嵁缂哄け,璇风‘璁ゆ儏鍐靛苟鍋氱浉搴斿鐞嗭紒";
}
else
{
- pieceInfo.QualityState = (int)QualityState.OK;//姝ゅ闇�瑕佹敞鎰忥紝鍒ゆ柇鎵�鏈夊伐搴忚川閲忥紝鐒跺悗鍐嶈祴鍊� //榛樿鍚堟牸锛孫P05榛樿鏄悎鏍�
+ pieceInfo.QualityState = (int)QualityStateEnum.OK;//姝ゅ闇�瑕佹敞鎰忥紝鍒ゆ柇鎵�鏈夊伐搴忚川閲忥紝鐒跺悗鍐嶈祴鍊� //榛樿鍚堟牸锛孫P05榛樿鏄悎鏍�
pieceInfo.Remarks = "OP05鏂板宸ヤ欢淇℃伅";
}
pieceInfo.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime();
@@ -628,12 +656,12 @@
{//宸ュ簭寮�濮嬫椂闂存病鏈夊垯璧嬪��
pieceInfo.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();
}
- pieceInfo.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
+ pieceInfo.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityStateEnum.OK : QualityStateEnum.NG);
//璧嬪�间笉鍚堟牸鍘熷洜
SetQualityNoOk_WorkPieceInfo(logMiddle, ref pieceInfo);
- if (!pieceInfo.QualityState.Equals(((int)QualityState.OK).ToString()))
+ if (!pieceInfo.QualityState.Equals(((int)QualityStateEnum.OK).ToString()))
{
pieceInfo.QualityErrorInfo = $"{logMiddle.WorkingProcedure}宸ュ簭璐ㄩ噺閲囬泦鏁版嵁涓嶅悎鏍納pieceInfo.QualityState}";
}
@@ -690,7 +718,7 @@
qualityData.OP30QualityStateCH3 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
qualityData.OP30QualityReceiveTimeCH3 = DateTimeHelper.GetDateTime();
- if (qualityData.OP30QualityStateCH3 == ((int)QualityState.NG).ToString())
+ if (qualityData.OP30QualityStateCH3 == ((int)QualityStateEnum.NG).ToString())
{
logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30娑ㄦ柇宸ヤ綅鍔涚煩瓒呭樊;
logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30娑ㄦ柇宸ヤ綅鍔涚煩瓒呭樊.ToString();
@@ -704,7 +732,7 @@
qualityData.OP30QualityStateCH4 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
qualityData.OP30QualityReceiveTimeCH4 = DateTimeHelper.GetDateTime();
- if (qualityData.OP30QualityStateCH4 == ((int)QualityState.NG).ToString())
+ if (qualityData.OP30QualityStateCH4 == ((int)QualityStateEnum.NG).ToString())
{
logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30棰勬嫥绱у伐浣嶅姏鐭╄秴宸�;
logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30棰勬嫥绱у伐浣嶅姏鐭╄秴宸�.ToString();
@@ -718,7 +746,7 @@
qualityData.OP30QualityStateCH5 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
qualityData.OP30QualityReceiveTimeCH5 = DateTimeHelper.GetDateTime();
- if (qualityData.OP30QualityStateCH5 == ((int)QualityState.NG).ToString())
+ if (qualityData.OP30QualityStateCH5 == ((int)QualityStateEnum.NG).ToString())
{
logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30缁堟嫥绱у伐浣嶅姏鐭╄秴宸�;
logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30缁堟嫥绱у伐浣嶅姏鐭╄秴宸�.ToString();
@@ -732,7 +760,7 @@
qualityData.OP30QualityStateCH6 = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
qualityData.OP30QualityReceiveTimeCH6 = DateTimeHelper.GetDateTime();
- if (qualityData.OP30QualityStateCH6 == ((int)QualityState.NG).ToString())
+ if (qualityData.OP30QualityStateCH6 == ((int)QualityStateEnum.NG).ToString())
{
logMiddle.QualityNoOk = (int)QualityNoOkEnum.OP30鍘嬭‖濂楀伐浣嶅姏鐭╄秴宸�;
logMiddle.QualityNoOkReason = QualityNoOkEnum.OP30鍘嬭‖濂楀伐浣嶅姏鐭╄秴宸�.ToString();
@@ -836,7 +864,7 @@
if (logMiddle.QualityType != null && logMiddle.QualityType.Equals(QualityType.SPC.ToString()))
{//SPC鍙嶉锛�
- if (logMiddle.QualityState != (int)QualityState.OK)
+ if (logMiddle.QualityState != (int)QualityStateEnum.OK)
{
//褰撴煇鍒板伐搴忔娴嬪埌涓嶅悎鏍煎伐浠舵椂锛屼粠璇ュ伐浠跺姞宸ュ畬鎴愭椂鍒诲墠鎸囧畾鏃堕棿璧疯嚦鎶ユ涓嶅悎鏍兼椂闂存锛岀郴缁熷皢璇ュ伐浠剁殑鏈�鍚庡姞宸ュ伐搴忓湪璇ユ椂闂存鍐呭姞宸ョ殑鎵�鏈夊伐浠躲�佹鍦ㄥ姞宸ョ殑宸ヤ欢銆佽宸ュ簭鍏ュ彛澶勭殑绗竴涓伐浠跺叏閮ㄦ爣璁颁负鐤戜技鐘舵�侊紝鐢变汉宸ュ妫�宸ヤ欢骞朵慨鏀圭姸鎬侊紝骞舵敮鎸佹壒閲忓彉鏇淬��
//绛斿锛氬湪绾挎祴閲忎笉闇�瑕佽蛋杩欎釜娴佺▼锛屽彧鏈塖PC鎶芥鎵嶉渶瑕侊紝闇�瑕佹妸杩欐椂闂存鐨勫伐浠跺叏閮ㄧ疆涓虹枒浼硷紝鍝�曟槸宸插畬鎴愬伐浠�
@@ -974,7 +1002,7 @@
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} 娌℃湁鑾峰彇鍒板伐浠朵俊鎭笉鍋氭洿鏂�");
+ Log4NetHelper.WriteErrorLog(type, $"宸ヤ欢{loginfo.WorkPieceID} 宸ヤ欢鎺ㄥ嚭NOOK宸ュ簭{loginfo.WorkingProcedure} 娌℃湁鑾峰彇鍒板伐浠朵俊鎭笉鍋氭洿鏂�");
return;
}
else
@@ -1025,8 +1053,8 @@
if (loginfo.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)QualityState.NG;
- if (!cur_db_info.QualityState.Equals(((int)QualityState.OK).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}";
}
@@ -1184,7 +1212,7 @@
QualityStateHelper.ResetQualityNoOkForNewProcess(ref process);
process.StartTime = DateTimeHelper.GetDateTime();
process.OperationType = OperationType.SPC.ToString();
- process.QualityState = (int)QualityState.Suspected;
+ process.QualityState = (int)QualityStateEnum.Suspected;
process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
process.CreatedUserName = loginfo.MonitoringPoint;
process.DataCapturePointCname = loginfo.DataCapturePointCname;
@@ -1260,7 +1288,7 @@
{
if (logMiddle.WorkingProcedure.Equals("OP70"))
{
- logMiddle.QualityState = (int)QualityState.OK; //濡傛灉鏄疧P70锛屽垯榛樿鏄悎鏍� 銆怑ditby shaocx,2024-06-25銆�
+ logMiddle.QualityState = (int)QualityStateEnum.OK; //濡傛灉鏄疧P70锛屽垯榛樿鏄悎鏍� 銆怑ditby shaocx,2024-06-25銆�
}
WorkPieceLog loginfo2 = new WorkPieceLog();
@@ -1285,13 +1313,13 @@
//EntityPropHelper<WorkPieceLog, WorkPieceInfo>.CopyProp(loginfo, info, loginfo.GetWorkPieceInfoDict());
if (!logMiddle.WorkingProcedure.Equals("OP05"))
{//褰撳伐浠朵簩缁寸爜绗竴娆″嚭鐜扮殑宸ュ簭涓嶆槸OP05锛屽垯璁剧疆涓哄彲鐤戠姸鎬�
- db_info.QualityState = (int)QualityState.Suspected;
+ db_info.QualityState = (int)QualityStateEnum.Suspected;
db_info.QualityErrorInfo = $"宸ヤ欢浜岀淮鐮佺涓�娆″嚭鐜扮殑宸ュ簭{logMiddle.MonitoringPoint}涓嶆槸OP05,鏁版嵁缂哄け,璇风‘璁ゆ儏鍐靛苟鍋氱浉搴斿鐞嗭紒";
db_info.Remarks = $"宸ヤ欢浜岀淮鐮佺涓�娆″嚭鐜扮殑宸ュ簭{logMiddle.MonitoringPoint}涓嶆槸OP05,鏁版嵁缂哄け,璇风‘璁ゆ儏鍐靛苟鍋氱浉搴斿鐞嗭紒";
}
else
{
- db_info.QualityState = (int)QualityState.OK;//姝ゅ闇�瑕佹敞鎰忥紝鍒ゆ柇鎵�鏈夊伐搴忚川閲忥紝鐒跺悗鍐嶈祴鍊� //榛樿鍚堟牸锛孫P05榛樿鏄悎鏍�
+ db_info.QualityState = (int)QualityStateEnum.OK;//姝ゅ闇�瑕佹敞鎰忥紝鍒ゆ柇鎵�鏈夊伐搴忚川閲忥紝鐒跺悗鍐嶈祴鍊� //榛樿鍚堟牸锛孫P05榛樿鏄悎鏍�
db_info.Remarks = "OP05鏂板宸ヤ欢淇℃伅";
}
db_info.WorkPieceinitOnlineTime = DateTimeHelper.GetDateTime();//WorkPieceInitOnlineTime
@@ -1370,11 +1398,13 @@
info.QualityErrorInfo = "";
}
//*/
+
+ loginfo2.Remarks = $"娴嬮噺鍚堟牸鐘舵��:{logMiddle.St3_Means_OK},绉伴噸鐘舵��:{logMiddle.St4_Weight_OK}";
}
else if (logMiddle.WorkingProcedure.Equals("OP30"))
{
- db_info.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
+ db_info.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityStateEnum.OK : QualityStateEnum.NG);
logMiddle.QualityState = db_info.QualityState;
db_info.QualityStateUpdateUser = logMiddle.UpdatedUserName;
db_info.QualityStateUpdateTime = logMiddle.UpdatedTime.Value.LocalDateTime;
@@ -1392,7 +1422,7 @@
qualityData.OP30QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
qualityData.OP30QualityReceiveTime = DateTimeHelper.GetDateTime();
loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"璐ㄩ噺锛歿logMiddle.QualityStateStr ?? "绌�"}";
- if (!db_info.QualityState.Equals(((int)QualityState.OK).ToString()))
+ if (!db_info.QualityState.Equals(((int)QualityStateEnum.OK).ToString()))
{
db_info.QualityErrorInfo = $"{logMiddle.WorkingProcedure}宸ュ簭璐ㄩ噺閲囬泦鏁版嵁涓嶅悎鏍�";
}
@@ -1918,7 +1948,7 @@
.OrderByDescending(o => o.WarnStartTime).FirstOrDefault();
if (loginfo.IsMessage)
{//鑻ユ湁鍛婅锛屽鏋滄湁璁惧鐘舵�佸彉鏇达紝鑲畾鎻掑叆锛屾澶勫彧淇敼鍗冲彲
- //鑻ユ湁鍛婅锛屽鏋滆澶囩姸鎬佹病鏈夊彉鏇达紝鏈夊憡璀︼紝涔熶笉鎻掑叆鏂扮殑锛堥棶棰橈細褰撶姸鎬佹病鏈夋洿鏀癸紝濡備竴鐩存槸鏁呴殰锛屼絾鍛婅淇℃伅鏈夊彉鍖栵紝鎬庝箞鍔� ps锛氭澶勫厛涓嶇锛�
+ //鑻ユ湁鍛婅锛屽鏋滆澶囩姸鎬佹病鏈夊彉鏇达紝鏈夊憡璀︼紝涔熶笉鎻掑叆鏂扮殑锛堥棶棰橈細褰撶姸鎬佹病鏈夋洿鏀癸紝濡備竴鐩存槸鏁呴殰锛屼絾鍛婅淇℃伅鏈夊彉鍖栵紝鎬庝箞鍔� ps锛氭澶勫厛涓嶇锛�
infolog.WarnStartTime = DateTimeHelper.GetDateTime();
infolog.WarnType = alertall;
infolog.Warnmsg = warnmsg;
@@ -2268,10 +2298,10 @@
info.UpdatedTime = DateTimeHelper.GetDateTime();
info.UpdatedUserName = threadinfo.Threadcode;
info.Threadlastmodifytime = threadinfo.Threadlastmodifytime > DateTime.MinValue ? threadinfo.Threadlastmodifytime : info.Threadlastmodifytime;//濡傛灉鏈変紶鍙傚垯鏇存柊
- //if (info.Threadstatue==1)
- //{
- // info.Threadlastmodifytime = DateTimeHelper.GetDateTime();//鏈�鏂拌窇鍒版暟鎹�
- //}
+ //if (info.Threadstatue==1)
+ //{
+ // info.Threadlastmodifytime = DateTimeHelper.GetDateTime();//鏈�鏂拌窇鍒版暟鎹�
+ //}
}
db.SaveChanges();
}
@@ -2568,11 +2598,11 @@
public static void SetLogMiddleForQuality(ref WorkPieceLogMiddle logMiddle)
{
- logMiddle.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
+ logMiddle.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityStateEnum.OK : QualityStateEnum.NG);
//鏍规嵁璐ㄩ噺鏁版嵁鍒ゆ柇鏄惁鍚堟牸/涓嶅悎鏍� 銆怑ditby shaocx,2024-06-25銆�
QualityNoOkEnum? qualityNoOkEnum = null;
- QualityState qualityState = WorkPieceInfoManager.CalcQualityStateForOP(logMiddle, ref qualityNoOkEnum);
+ QualityStateEnum qualityState = WorkPieceInfoManager.CalcQualityStateForOP(logMiddle, ref qualityNoOkEnum);
logMiddle.QualityState = (int)qualityState;
logMiddle.QualityStateStr = qualityState.ToString();
if (qualityNoOkEnum != null)
@@ -2585,9 +2615,9 @@
/// <summary>
/// 璁＄畻OP 璐ㄩ噺鏁版嵁鏄惁鍚堟牸
/// </summary>
- private static QualityState CalcQualityStateForOP(WorkPieceLogMiddle logMiddle, ref QualityNoOkEnum? qualityNoOkEnum)
+ private static QualityStateEnum CalcQualityStateForOP(WorkPieceLogMiddle logMiddle, ref QualityNoOkEnum? qualityNoOkEnum)
{
- QualityState qualityState = QualityState.Suspected;
+ QualityStateEnum qualityState = QualityStateEnum.Suspected;
if (logMiddle.WorkingProcedure == "OP60")
{//鍚堟牸/涓嶅悎鏍肩敱 WMS鑷鍒ゆ柇
decimal _QualityOP60To1 = SystemHelper.GetDecimal(logMiddle.QualityOP60To1);
@@ -2615,24 +2645,24 @@
if (isPass_QualityOP60To1 && isPass_QualityOP60To2)
{
- qualityState = QualityState.OK;
+ qualityState = QualityStateEnum.OK;
}
else
{
- qualityState = QualityState.NG;
+ qualityState = QualityStateEnum.NG;
}
if (_QualityOP60To1 == 0 || _QualityOP60To2 == 0)
{
- qualityState = QualityState.Suspected;
+ qualityState = QualityStateEnum.Suspected;
return qualityState;
}
return qualityState;
}
else if (logMiddle.WorkingProcedure == "OP80")
{//鍚堟牸/涓嶅悎鏍肩敱 OP80 鍒ゆ柇锛孮ualityState 鍜� QualityStateStr 閮藉湪璋冪敤褰撳墠鏂规硶鍓� 鍐欏叆鍊间簡
- if (logMiddle.QualityState == (int)QualityState.OK)
+ if (logMiddle.QualityState == (int)QualityStateEnum.OK)
{
- qualityState = QualityState.OK;
+ qualityState = QualityStateEnum.OK;
return qualityState;
}
@@ -2719,25 +2749,25 @@
}
else if (logMiddle.WorkingProcedure == "OP10")
{//鍚堟牸/涓嶅悎鏍肩敱 QualityStateStr鍊煎垽鏂�
- if (logMiddle.QualityState == (int)QualityState.NG)
+ if (logMiddle.QualityState == (int)QualityStateEnum.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP10鍘氬害瓒呭樊;
}
else
{
- qualityState = QualityState.OK;
+ qualityState = QualityStateEnum.OK;
}
return qualityState;
}
else if (logMiddle.WorkingProcedure == "OP20")
{//鍚堟牸/涓嶅悎鏍肩敱 QualityStateStr鍊煎垽鏂�
- if (logMiddle.QualityState == (int)QualityState.NG)
+ if (logMiddle.QualityState == (int)QualityStateEnum.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP20灏忓ご瀛旂洿寰勮秴宸�;
}
else
{
- qualityState = QualityState.OK;
+ qualityState = QualityStateEnum.OK;
}
return qualityState;
}
@@ -2745,35 +2775,35 @@
{//鍚堟牸/涓嶅悎鏍肩敱 QualityStateStr鍊煎垽鏂�
if (logMiddle.QualityStateStr.Equals("OK"))
{
- qualityState = QualityState.OK;
+ qualityState = QualityStateEnum.OK;
}
else
{
- qualityState = QualityState.NG;
+ qualityState = QualityStateEnum.NG;
}
return qualityState;
}
else if (logMiddle.WorkingProcedure == "OP35")
{//鍚堟牸/涓嶅悎鏍肩敱 QualityStateStr鍊煎垽鏂�
- if (logMiddle.QualityState == (int)QualityState.NG)
+ if (logMiddle.QualityState == (int)QualityStateEnum.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP35婊氬帇鍔涜秴宸�;
}
else
{
- qualityState = QualityState.OK;
+ qualityState = QualityStateEnum.OK;
}
return qualityState;
}
else if (logMiddle.WorkingProcedure == "OP40")
{//鍚堟牸/涓嶅悎鏍肩敱 QualityStateStr鍊煎垽鏂�
- if (logMiddle.QualityState == (int)QualityState.NG)
+ if (logMiddle.QualityState == (int)QualityStateEnum.NG)
{
qualityNoOkEnum = QualityNoOkEnum.OP40鍘氬害瓒呭樊;
}
else
{
- qualityState = QualityState.OK;
+ qualityState = QualityStateEnum.OK;
}
return qualityState;
}
@@ -2790,17 +2820,17 @@
{
if (qualityState.HasValue == false)
{
- return (int)QualityState.Suspected;
+ return (int)QualityStateEnum.Suspected;
}
if (qualityState.Value == 1)
{
- return (int)QualityState.OK;
+ return (int)QualityStateEnum.OK;
}
if (qualityState.Value == 2)
{
- return (int)QualityState.NG;
+ return (int)QualityStateEnum.NG;
}
- return (int)QualityState.Suspected;
+ return (int)QualityStateEnum.Suspected;
}
--
Gitblit v1.9.3