From bddf8b335ae61804576f160e98fd21e7c7bd5da8 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 16 6月 2024 11:35:06 +0800
Subject: [PATCH] 2
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs | 375 ++++++++++++++++++++++++++--------------------------
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 8 +
2 files changed, 194 insertions(+), 189 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 9775d69..3e1b93c 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -1097,7 +1097,13 @@
process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
process.StartTime = DateTimeHelper.GetDateTime();
process.EndTime = DateTimeHelper.GetDateTime();
- process.QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value : (int)QualityState.OK;
+ if (loginfo.WorkingProcedure.Equals("OP80"))
+ {//OP80鐨勮川閲忔暟鎹槸鍚庢潵鑾峰彇鏂囦欢鎼炵殑
+ }
+ else
+ {
+ process.QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value : (int)QualityState.OK;
+ }
process.CreatedUserName = loginfo.MonitoringPoint;
process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
process.UpdatedUserName = loginfo.MonitoringPoint;
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
index 987804e..59a2b4b 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
@@ -141,231 +141,230 @@
bool isGetQcSuccess = false;
- foreach (var file in files)
- {//鍙栧�掑簭鍖归厤鐨勬枃浠跺悕涓哄伐浠跺彿鐨勬枃浠�
- if (file.Name.Contains(pieceProcess.WorkPieceID))
+ var findFiles = files.Where(x => x.Name.Contains(pieceProcess.WorkPieceID)).OrderByDescending(x => x.LastWriteTime).ToList();
+ if (findFiles != null && findFiles.Count > 0)
+ {
+ var file = findFiles.First();
+
+ Log4NetHelper.WriteErrorLog(logType, $"OP80涓嬬嚎瀹屾垚璇诲彇鍒版枃浠秢file.Name}锛屾槸鎸囧畾鐨勫伐浠秢pieceProcess.WorkPieceID}");
+
+ WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+ wplog.WorkPieceID = pieceProcess.WorkPieceID;
+ wplog.WorkingProcedure = _DataCapturePointCode;
+ wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ wplog.EquipmentID = _dataCaptureConfig.EquipmentID; ;
+ wplog.Remarks = wplog.WorkingProcedure;
+ wplog.MonitoringPoint = _DataCapturePointCode;
+ wplog.CreatedTime = DateTimeHelper.GetDateTime();
+ wplog.CreatedUserName = _DataCapturePointCode;
+ wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+ wplog.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
+ wplog.IsDeleted = false;
+
+ WorkPieceLog loginfo2 = new WorkPieceLog();
+ loginfo2 = EntityPropHelper.Mapper<WorkPieceLog, WorkPieceLogMiddle>(wplog);
+
+ var datatable = CSVHelper.ReadCSVList(file.FullName);
+ List<string> rowFirst = new List<string>();
+ List<string> rowSecond = new List<string>();
+ if (datatable.Count == 2)
{
- Log4NetHelper.WriteErrorLog(logType, $"OP80涓嬬嚎瀹屾垚璇诲彇鍒版枃浠秢file.Name}锛屾槸鎸囧畾鐨勫伐浠秢pieceProcess.WorkPieceID}");
-
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.WorkPieceID = pieceProcess.WorkPieceID;
- wplog.WorkingProcedure = _DataCapturePointCode;
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID; ;
- wplog.Remarks = wplog.WorkingProcedure;
- wplog.MonitoringPoint = _DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = _DataCapturePointCode;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
- wplog.IsDeleted = false;
-
- WorkPieceLog loginfo2 = new WorkPieceLog();
- loginfo2 = EntityPropHelper.Mapper<WorkPieceLog, WorkPieceLogMiddle>(wplog);
-
- var datatable = CSVHelper.ReadCSVList(file.FullName);
- List<string> rowFirst = new List<string>();
- List<string> rowSecond = new List<string>();
- if (datatable.Count == 2)
+ rowFirst = datatable[0].Split(',').ToList();
+ rowSecond = datatable[1].Split(',').ToList();
+ if (rowSecond.Count < 11)
{
- rowFirst = datatable[0].Split(',').ToList();
- rowSecond = datatable[1].Split(',').ToList();
- if (rowSecond.Count < 11)
+ return;
+ }
+ //鏃ユ湡鍜屾椂闂� 鎵瑰彿/鏍囪瘑鍙� 宓屽鍙�/涓昏酱鍙� 鎿嶄綔绗� 鏂囨湰 娴嬮噺鏈� 杩囩▼鍙傛暟 娴嬮噺绯荤粺 杩囩▼鍙傛暟鍊� 搴忓垪鍙� 闆朵欢璇嗗埆鍙� 1
+ OP80Info oP80Info = new OP80Info();
+ oP80Info.鏃ユ湡鍜屾椂闂� = rowSecond[0];
+ oP80Info.鎵瑰彿 = rowSecond[1];
+ oP80Info.宓屽鍙� = rowSecond[2];
+ oP80Info.鎿嶄綔绗� = rowSecond[3];
+ oP80Info.鏂囨湰 = rowSecond[4];
+ oP80Info.娴嬮噺鏈� = rowSecond[5];
+ oP80Info.杩囩▼鍙傛暟 = rowSecond[6];
+ oP80Info.娴嬮噺绯荤粺 = rowSecond[7];
+ oP80Info.杩囩▼鍙傛暟鍊� = rowSecond[8];
+ oP80Info.搴忓垪鍙� = rowSecond[9];
+ oP80Info.闆朵欢璇嗗埆鍙� = rowSecond[10];
+ for (int i = 1; i <= (rowSecond.Count - 11) / 10; i++)
+ {
+ if (rowSecond.Count < (11 + i * 10))
{
- continue;
+ break;
}
- //鏃ユ湡鍜屾椂闂� 鎵瑰彿/鏍囪瘑鍙� 宓屽鍙�/涓昏酱鍙� 鎿嶄綔绗� 鏂囨湰 娴嬮噺鏈� 杩囩▼鍙傛暟 娴嬮噺绯荤粺 杩囩▼鍙傛暟鍊� 搴忓垪鍙� 闆朵欢璇嗗埆鍙� 1
- OP80Info oP80Info = new OP80Info();
- oP80Info.鏃ユ湡鍜屾椂闂� = rowSecond[0];
- oP80Info.鎵瑰彿 = rowSecond[1];
- oP80Info.宓屽鍙� = rowSecond[2];
- oP80Info.鎿嶄綔绗� = rowSecond[3];
- oP80Info.鏂囨湰 = rowSecond[4];
- oP80Info.娴嬮噺鏈� = rowSecond[5];
- oP80Info.杩囩▼鍙傛暟 = rowSecond[6];
- oP80Info.娴嬮噺绯荤粺 = rowSecond[7];
- oP80Info.杩囩▼鍙傛暟鍊� = rowSecond[8];
- oP80Info.搴忓垪鍙� = rowSecond[9];
- oP80Info.闆朵欢璇嗗埆鍙� = rowSecond[10];
- for (int i = 1; i <= (rowSecond.Count - 11) / 10; i++)
+ //鍚嶇О 鐩稿鍊� 鐩稿鍊煎崟浣� 缁濆鍊� 缁濆鍊煎崟浣� 鍚嶄箟鍊� 涓婇檺 涓嬮檺 鐘舵��/绛夌骇 鍒嗛殧绗�
+ OP80ItemInfo item = new OP80ItemInfo();
+ item.鍒嗛殧绗� = rowSecond[1 + i * 10];//渚嬪锛�* 琛ㄥご锛氱姸鎬�
+ item.鍚嶇О = rowSecond[2 + i * 10];//渚嬪锛歐eight Big End 琛ㄥご锛�*
+ item.鐩稿鍊� = rowSecond[3 + i * 10];//渚嬪锛�-2.8 琛ㄥご锛氱畝杩�
+ item.鐩稿鍊煎崟浣� = rowSecond[4 + i * 10];//渚嬪锛歡r 琛ㄥご锛歐eight Big End
+ item.缁濆鍊� = rowSecond[5 + i * 10];//渚嬪锛�371.66 琛ㄥご锛氭祴閲忓崟浣�
+ item.缁濆鍊煎崟浣� = rowSecond[6 + i * 10];//渚嬪锛歡r 琛ㄥご锛氱粷瀵瑰��
+ item.鍚嶄箟鍊� = rowSecond[7 + i * 10];//渚嬪锛�374.5 琛ㄥご锛氱粷瀵瑰�兼祴閲忓崟浣嶏紙UoM锛�
+ item.涓婇檺 = rowSecond[8 + i * 10];//渚嬪锛�10.5 琛ㄥご锛氬悕涔夊��
+ item.涓嬮檺 = rowSecond[9 + i * 10];//渚嬪锛�-10.5 琛ㄥご锛歎SL鍊�
+ item.鐘舵�� = rowSecond[10 + i * 10];//渚嬪锛�3 琛ㄥご锛歀SL鍊�
+ oP80Info.OP80ItemInfolist.Add(item);
+ if (item.鍚嶇О.Equals("Weight Class") || item.鍚嶇О.Equals("Weight Small End")
+ || item.鍚嶇О.Equals("Weight Big End") || item.鍚嶇О.Equals("Dime Small_End Class")
+ || item.鍚嶇О.Equals("Dime Big_End Class"))
{
- if (rowSecond.Count < (11 + i * 10))
+ }
+ else
+ {
+ if (!string.IsNullOrEmpty(item.鐘舵��))
{
- break;
- }
- //鍚嶇О 鐩稿鍊� 鐩稿鍊煎崟浣� 缁濆鍊� 缁濆鍊煎崟浣� 鍚嶄箟鍊� 涓婇檺 涓嬮檺 鐘舵��/绛夌骇 鍒嗛殧绗�
- OP80ItemInfo item = new OP80ItemInfo();
- item.鍒嗛殧绗� = rowSecond[1 + i * 10];//渚嬪锛�* 琛ㄥご锛氱姸鎬�
- item.鍚嶇О = rowSecond[2 + i * 10];//渚嬪锛歐eight Big End 琛ㄥご锛�*
- item.鐩稿鍊� = rowSecond[3 + i * 10];//渚嬪锛�-2.8 琛ㄥご锛氱畝杩�
- item.鐩稿鍊煎崟浣� = rowSecond[4 + i * 10];//渚嬪锛歡r 琛ㄥご锛歐eight Big End
- item.缁濆鍊� = rowSecond[5 + i * 10];//渚嬪锛�371.66 琛ㄥご锛氭祴閲忓崟浣�
- item.缁濆鍊煎崟浣� = rowSecond[6 + i * 10];//渚嬪锛歡r 琛ㄥご锛氱粷瀵瑰��
- item.鍚嶄箟鍊� = rowSecond[7 + i * 10];//渚嬪锛�374.5 琛ㄥご锛氱粷瀵瑰�兼祴閲忓崟浣嶏紙UoM锛�
- item.涓婇檺 = rowSecond[8 + i * 10];//渚嬪锛�10.5 琛ㄥご锛氬悕涔夊��
- item.涓嬮檺 = rowSecond[9 + i * 10];//渚嬪锛�-10.5 琛ㄥご锛歎SL鍊�
- item.鐘舵�� = rowSecond[10 + i * 10];//渚嬪锛�3 琛ㄥご锛歀SL鍊�
- oP80Info.OP80ItemInfolist.Add(item);
- if (item.鍚嶇О.Equals("Weight Class") || item.鍚嶇О.Equals("Weight Small End")
- || item.鍚嶇О.Equals("Weight Big End") || item.鍚嶇О.Equals("Dime Small_End Class")
- || item.鍚嶇О.Equals("Dime Big_End Class"))
- {
- }
- else
- {
- if (!string.IsNullOrEmpty(item.鐘舵��))
- {
- oP80Info.OP80ItemStatusInfolist.Add(item);
- }
+ oP80Info.OP80ItemStatusInfolist.Add(item);
}
}
- if (oP80Info.OP80ItemStatusInfolist.Count > 0)
+ }
+ if (oP80Info.OP80ItemStatusInfolist.Count > 0)
+ {
+ if (oP80Info.OP80ItemStatusInfolist.Any(o => !o.鐘舵��.Equals("OK")))
{
- if (oP80Info.OP80ItemStatusInfolist.Any(o => !o.鐘舵��.Equals("OK")))
- {
- wplog.QualityStateStr = "NG";
- }
- else
- {
- wplog.QualityStateStr = "OK";
- }
+ wplog.QualityStateStr = "NG";
}
else
{
wplog.QualityStateStr = "OK";
}
+ }
+ else
+ {
+ wplog.QualityStateStr = "OK";
+ }
- wplog.OP80QualityFilePath = file.FullName;
- wplog.OP80NewCode = oP80Info.鎵瑰彿?.Replace("#", "");
- //澶уご閲嶉噺
- wplog.QualityOP80To1 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Weight Big End")).FirstOrDefault()?.缁濆鍊�;
- //灏忓ご閲嶉噺
- wplog.QualityOP80To2 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Weight Small End")).FirstOrDefault()?.缁濆鍊�;
- //鎬婚噸
- wplog.QualityOP80To3 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Total Weight")).FirstOrDefault()?.缁濆鍊�;
- //寮洸
- wplog.QualityOP80To4 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Bend to A")).FirstOrDefault()?.缁濆鍊�;
- //鎵害
- wplog.QualityOP80To5 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Twist to A")).FirstOrDefault()?.缁濆鍊�;
- //澶уご鍨傜洿搴�
- wplog.QualityOP80To6 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Big_End_C_Squareness")).FirstOrDefault()?.缁濆鍊�;
- //灏忓ご鍨傜洿搴�
- wplog.QualityOP80To10 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Sma_End_C_Squareness")).FirstOrDefault()?.缁濆鍊�;
- //澶уご瀛斿垎缁勭骇鍒�
- wplog.QualityOP80To7 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Dime Big_End Class")).FirstOrDefault()?.鐘舵��;
- //灏忓ご瀛斿垎缁勭骇鍒�
- wplog.QualityOP80To8 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Dime Small_End Class")).FirstOrDefault()?.鐘舵��;
- //閲嶉噺缁勫埆
- wplog.QualityOP80To9 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Weight Class")).FirstOrDefault()?.鐘舵��;
- //wplog.Remarks = (wplog.Remarks ?? "") + $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢{file.FullName},鏁版嵁銆恵wplog.OP80NewCode??"绌�"}銆戙�恵wplog.QualityOP80To1 ?? "绌�"}銆戙�恵wplog.QualityOP80To2 ?? "绌�"}銆戙�恵wplog.QualityOP80To3 ?? "绌�"}銆戙�恵wplog.QualityOP80To4 ?? "绌�"}銆戙�恵wplog.QualityOP80To5 ?? "绌�"}銆�";
+ wplog.OP80QualityFilePath = file.FullName;
+ wplog.OP80NewCode = oP80Info.鎵瑰彿?.Replace("#", "");
+ //澶уご閲嶉噺
+ wplog.QualityOP80To1 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Weight Big End")).FirstOrDefault()?.缁濆鍊�;
+ //灏忓ご閲嶉噺
+ wplog.QualityOP80To2 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Weight Small End")).FirstOrDefault()?.缁濆鍊�;
+ //鎬婚噸
+ wplog.QualityOP80To3 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Total Weight")).FirstOrDefault()?.缁濆鍊�;
+ //寮洸
+ wplog.QualityOP80To4 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Bend to A")).FirstOrDefault()?.缁濆鍊�;
+ //鎵害
+ wplog.QualityOP80To5 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Twist to A")).FirstOrDefault()?.缁濆鍊�;
+ //澶уご鍨傜洿搴�
+ wplog.QualityOP80To6 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Big_End_C_Squareness")).FirstOrDefault()?.缁濆鍊�;
+ //灏忓ご鍨傜洿搴�
+ wplog.QualityOP80To10 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Sma_End_C_Squareness")).FirstOrDefault()?.缁濆鍊�;
+ //澶уご瀛斿垎缁勭骇鍒�
+ wplog.QualityOP80To7 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Dime Big_End Class")).FirstOrDefault()?.鐘舵��;
+ //灏忓ご瀛斿垎缁勭骇鍒�
+ wplog.QualityOP80To8 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Dime Small_End Class")).FirstOrDefault()?.鐘舵��;
+ //閲嶉噺缁勫埆
+ wplog.QualityOP80To9 = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Weight Class")).FirstOrDefault()?.鐘舵��;
+ //wplog.Remarks = (wplog.Remarks ?? "") + $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢{file.FullName},鏁版嵁銆恵wplog.OP80NewCode??"绌�"}銆戙�恵wplog.QualityOP80To1 ?? "绌�"}銆戙�恵wplog.QualityOP80To2 ?? "绌�"}銆戙�恵wplog.QualityOP80To3 ?? "绌�"}銆戙�恵wplog.QualityOP80To4 ?? "绌�"}銆戙�恵wplog.QualityOP80To5 ?? "绌�"}銆�";
- //鏂板OP80鐨勪竴浜涜川閲忔暟鎹� 銆怑ditby shaocx,2024-06-13銆�
- wplog.QualityOP80_Houdu = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Big_End_Thickness")).FirstOrDefault()?.缁濆鍊�;
- wplog.QualityOP80_ZXJ = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Distance of Two Head")).FirstOrDefault()?.缁濆鍊�;
- wplog.QualityOP80_DTKYZD = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Big_End_Cylindricity")).FirstOrDefault()?.缁濆鍊�;
- wplog.QualityOP80_XTSMYD = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Small_End_Top_Roundn")).FirstOrDefault()?.缁濆鍊�;
- wplog.QualityOP80_XTXMYD = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Small_End_Bot_Roundn")).FirstOrDefault()?.缁濆鍊�;
+ //鏂板OP80鐨勪竴浜涜川閲忔暟鎹� 銆怑ditby shaocx,2024-06-13銆�
+ wplog.QualityOP80_Houdu = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Big_End_Thickness")).FirstOrDefault()?.缁濆鍊�;
+ wplog.QualityOP80_ZXJ = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Distance of Two Head")).FirstOrDefault()?.缁濆鍊�;
+ wplog.QualityOP80_DTKYZD = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Big_End_Cylindricity")).FirstOrDefault()?.缁濆鍊�;
+ wplog.QualityOP80_XTSMYD = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Small_End_Top_Roundn")).FirstOrDefault()?.缁濆鍊�;
+ wplog.QualityOP80_XTXMYD = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Small_End_Bot_Roundn")).FirstOrDefault()?.缁濆鍊�;
- wplog.QualityOP80_D_S_X = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Big_End_Top_X_Dia.")).FirstOrDefault()?.缁濆鍊�;
- wplog.QualityOP80_D_S_Y = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Big_End_Top_Y_Dia.")).FirstOrDefault()?.缁濆鍊�;
- wplog.QualityOP80_D_X_X = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Big_End_Bot_X_Dia.")).FirstOrDefault()?.缁濆鍊�;
- wplog.QualityOP80_D_X_Y = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Big_End_Bot_Y_Dia.")).FirstOrDefault()?.缁濆鍊�;
- //璁＄畻澶уご瀛旂洿寰�,澶уご瀛旂洿寰�=锛堝ぇ澶翠笂闈鏂瑰悜鐩村緞+澶уご涓婇潰Y鏂瑰悜鐩村緞+澶уご涓嬮潰X鏂瑰悜鐩村緞+澶уご涓嬮潰Y鏂瑰悜鐩村緞锛�/4
- List<decimal> valueList = new List<decimal>() {
+ wplog.QualityOP80_D_S_X = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Big_End_Top_X_Dia.")).FirstOrDefault()?.缁濆鍊�;
+ wplog.QualityOP80_D_S_Y = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Big_End_Top_Y_Dia.")).FirstOrDefault()?.缁濆鍊�;
+ wplog.QualityOP80_D_X_X = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Big_End_Bot_X_Dia.")).FirstOrDefault()?.缁濆鍊�;
+ wplog.QualityOP80_D_X_Y = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Big_End_Bot_Y_Dia.")).FirstOrDefault()?.缁濆鍊�;
+ //璁＄畻澶уご瀛旂洿寰�,澶уご瀛旂洿寰�=锛堝ぇ澶翠笂闈鏂瑰悜鐩村緞+澶уご涓婇潰Y鏂瑰悜鐩村緞+澶уご涓嬮潰X鏂瑰悜鐩村緞+澶уご涓嬮潰Y鏂瑰悜鐩村緞锛�/4
+ List<decimal> valueList = new List<decimal>() {
SystemHelper.GetDecimal(wplog.QualityOP80_D_S_X),
SystemHelper.GetDecimal(wplog.QualityOP80_D_S_Y),
SystemHelper.GetDecimal(wplog.QualityOP80_D_X_X),
SystemHelper.GetDecimal(wplog.QualityOP80_D_X_Y),
};
- wplog.QualityOP80_D_TKZJ = SystemHelper.CalcDecimalAvg(valueList, 3);
+ wplog.QualityOP80_D_TKZJ = SystemHelper.CalcDecimalAvg(valueList, 3);
- wplog.QualityOP80_X_S_X = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Small_End_Top_X_Dia.")).FirstOrDefault()?.缁濆鍊�;
- wplog.QualityOP80_X_S_Y = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Small_End_Top_Y_Dia.")).FirstOrDefault()?.缁濆鍊�;
- wplog.QualityOP80_X_X_X = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Small_End_Bot_X_Dia.")).FirstOrDefault()?.缁濆鍊�;
- wplog.QualityOP80_X_X_Y = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Small_End_Bot_Y_Dia.")).FirstOrDefault()?.缁濆鍊�;
- //璁＄畻灏忓ご瀛旂洿寰�,灏忓ご瀛旂洿寰�=锛堝皬澶翠笂闈鏂瑰悜鐩村緞+灏忓ご涓婇潰Y鏂瑰悜鐩村緞+灏忓ご涓嬮潰X鏂瑰悜鐩村緞+灏忓ご涓嬮潰Y鏂瑰悜鐩村緞锛�/4
- valueList = new List<decimal>();
- valueList = new List<decimal>() {
+ wplog.QualityOP80_X_S_X = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Small_End_Top_X_Dia.")).FirstOrDefault()?.缁濆鍊�;
+ wplog.QualityOP80_X_S_Y = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Small_End_Top_Y_Dia.")).FirstOrDefault()?.缁濆鍊�;
+ wplog.QualityOP80_X_X_X = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Small_End_Bot_X_Dia.")).FirstOrDefault()?.缁濆鍊�;
+ wplog.QualityOP80_X_X_Y = oP80Info.OP80ItemInfolist.Where(o => o.鍚嶇О.Equals("Small_End_Bot_Y_Dia.")).FirstOrDefault()?.缁濆鍊�;
+ //璁＄畻灏忓ご瀛旂洿寰�,灏忓ご瀛旂洿寰�=锛堝皬澶翠笂闈鏂瑰悜鐩村緞+灏忓ご涓婇潰Y鏂瑰悜鐩村緞+灏忓ご涓嬮潰X鏂瑰悜鐩村緞+灏忓ご涓嬮潰Y鏂瑰悜鐩村緞锛�/4
+ valueList = new List<decimal>();
+ valueList = new List<decimal>() {
SystemHelper.GetDecimal(wplog.QualityOP80_X_S_X),
SystemHelper.GetDecimal(wplog.QualityOP80_X_S_Y),
SystemHelper.GetDecimal(wplog.QualityOP80_X_X_X),
SystemHelper.GetDecimal(wplog.QualityOP80_X_X_Y),
};
- wplog.QualityOP80_X_TKZJ = SystemHelper.CalcDecimalAvg(valueList, 3);
+ wplog.QualityOP80_X_TKZJ = SystemHelper.CalcDecimalAvg(valueList, 3);
- }
- else
- {
- wplog.Remarks = (wplog.Remarks ?? "") + $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢{file.FullName}寮傚父锛岃鏁颁笉鏄�2琛�";
- }
-
-
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- info.OP80NewCode = wplog.OP80NewCode;//鏇存柊鎴愬搧鍚�
-
- info.QualityState = (int)((wplog.QualityStateStr.Equals("OK") || wplog.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
- wplog.QualityState = info.QualityState;
- info.QualityStateUpdateUser = wplog.UpdatedUserName;
- info.QualityStateUpdateTime = wplog.UpdatedTime.Value.LocalDateTime;
- info.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString();
-
- //var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == wplog.WorkPieceID).FirstOrDefault();
- //if (qualityData == null || qualityData.WorkPieceID.Length < 1 || qualityData.WorkingProcedure.Length < 1)
- //{//鎻掑叆QualityDataInfo琛�
- // qualityData = EntityPropHelper.Mapper<QualityDataInfo, WorkPieceLog>(wplog);
- // db.QualityDataInfo.Add(GetAddQualityDataInfo(qualityData));
- //}
- //淇敼QualityDataInfo琛� //閲嶅鏀跺埌璐ㄩ噺淇℃伅锛屼細瑕嗙洊涔嬪墠鐨�
- EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(wplog, qualityData, WorkPieceInfoManager.GetQualityDataInfoUpdate(wplog.WorkingProcedure, wplog.MonitoringPoint));//鎸囧畾淇敼瀛楁
-
- qualityData.QualityStateUpdateUser = info.UpdatedUserName;
- qualityData.QualityReceiveTime = info.UpdatedTime.Value.LocalDateTime;
- qualityData.QualityStateUpdateMode = info.QualityStateUpdateMode;
- qualityData.OP80QualityState = wplog.QualityState.HasValue ? wplog.QualityState.Value.ToString() : "3";
- qualityData.OP80QualityReceiveTime = DateTimeHelper.GetDateTime();
- qualityData.OP80QualityFilePath = wplog.OP80QualityFilePath;
- long op80id = qualityData.Id;
- if (op80id > 0)
- {
- pieceProcess.QualityDataInfoID = op80id;
- }
- loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"璐ㄩ噺锛歿wplog.QualityStateStr ?? "绌�"}";
- if (!info.QualityState.Equals(((int)QualityState.OK).ToString()))
- {
- info.QualityErrorInfo = $"{wplog.WorkingProcedure}宸ュ簭璐ㄩ噺閲囬泦鏁版嵁涓嶅悎鏍�";
- }
- else
- {
- info.QualityErrorInfo = "";
- }
-
- pieceProcess.GetQcDataCount = (pieceProcess.GetQcDataCount ?? 0) + 1;
- pieceProcess.GetQcDataFlag_Remark = "鎵惧埌鏂囦欢";
- pieceProcess.GetQcDataFlag = 1;
-
- db.WorkPieceLog.Add(WorkPieceInfoManager.GetAddWorkPieceLog(loginfo2));//鎻掑叆宸ヤ欢閲囬泦鏃ュ織琛�
-
- db.QualityDataInfoLog.Add(WorkPieceInfoManager.GetAddQualityDataInfoLog(qualityData));//鎻掑叆璐ㄩ噺鏃ュ織
-
- //杞Щ鏂囦欢
- var toPath = file.FullName.Replace("CA4GC20TD", "CA4GC20TD_COPY");
- File.Move(file.FullName, toPath);//绉诲姩
-
- db.SaveChanges();
-
- isGetQcSuccess = true;
- Log4NetHelper.WriteInfoLog(logType, $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢锛屾垚鍔熷鐞嗕簡鎸囧畾宸ヤ欢{info.WorkPieceID}鐨勬枃浠�");
-
- break;
}
else
{
-
+ wplog.Remarks = (wplog.Remarks ?? "") + $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢{file.FullName}寮傚父锛岃鏁颁笉鏄�2琛�";
}
+
+
+ //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+ info.OP80NewCode = wplog.OP80NewCode;//鏇存柊鎴愬搧鍚�
+
+ info.QualityState = (int)((wplog.QualityStateStr.Equals("OK") || wplog.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
+ wplog.QualityState = info.QualityState;
+ info.QualityStateUpdateUser = wplog.UpdatedUserName;
+ info.QualityStateUpdateTime = wplog.UpdatedTime.Value.LocalDateTime;
+ info.QualityStateUpdateMode = QualityStateUpdateMode.Auto.ToString();
+
+ //var qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == wplog.WorkPieceID).FirstOrDefault();
+ //if (qualityData == null || qualityData.WorkPieceID.Length < 1 || qualityData.WorkingProcedure.Length < 1)
+ //{//鎻掑叆QualityDataInfo琛�
+ // qualityData = EntityPropHelper.Mapper<QualityDataInfo, WorkPieceLog>(wplog);
+ // db.QualityDataInfo.Add(GetAddQualityDataInfo(qualityData));
+ //}
+ //淇敼QualityDataInfo琛� //閲嶅鏀跺埌璐ㄩ噺淇℃伅锛屼細瑕嗙洊涔嬪墠鐨�
+ EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(wplog, qualityData, WorkPieceInfoManager.GetQualityDataInfoUpdate(wplog.WorkingProcedure, wplog.MonitoringPoint));//鎸囧畾淇敼瀛楁
+
+ qualityData.QualityStateUpdateUser = info.UpdatedUserName;
+ qualityData.QualityReceiveTime = info.UpdatedTime.Value.LocalDateTime;
+ qualityData.QualityStateUpdateMode = info.QualityStateUpdateMode;
+ qualityData.OP80QualityState = wplog.QualityState.HasValue ? wplog.QualityState.Value.ToString() : "3";
+ qualityData.OP80QualityReceiveTime = DateTimeHelper.GetDateTime();
+ qualityData.OP80QualityFilePath = wplog.OP80QualityFilePath;
+ long op80id = qualityData.Id;
+ if (op80id > 0)
+ {
+ pieceProcess.QualityDataInfoID = op80id;
+ }
+ loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"璐ㄩ噺锛歿wplog.QualityStateStr ?? "绌�"}";
+ if (!info.QualityState.Equals(((int)QualityState.OK).ToString()))
+ {
+ info.QualityErrorInfo = $"{wplog.WorkingProcedure}宸ュ簭璐ㄩ噺閲囬泦鏁版嵁涓嶅悎鏍�";
+ }
+ else
+ {
+ info.QualityErrorInfo = "";
+ }
+
+ pieceProcess.GetQcDataCount = (pieceProcess.GetQcDataCount ?? 0) + 1;
+ pieceProcess.GetQcDataFlag_Remark = "鎵惧埌鏂囦欢";
+ pieceProcess.GetQcDataFlag = 1;
+ pieceProcess.QualityState = info.QualityState.HasValue ? info.QualityState.Value : (int)QualityState.OK;
+
+ db.WorkPieceLog.Add(WorkPieceInfoManager.GetAddWorkPieceLog(loginfo2));//鎻掑叆宸ヤ欢閲囬泦鏃ュ織琛�
+
+ db.QualityDataInfoLog.Add(WorkPieceInfoManager.GetAddQualityDataInfoLog(qualityData));//鎻掑叆璐ㄩ噺鏃ュ織
+
+ //杞Щ鏂囦欢
+ foreach (var item in findFiles)
+ {
+ var toPath = item.FullName.Replace("CA4GC20TD", "CA4GC20TD_COPY");
+ File.Move(item.FullName, toPath);//绉诲姩
+ }
+
+ db.SaveChanges();
+
+ isGetQcSuccess = true;
+ Log4NetHelper.WriteInfoLog(logType, $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢锛屾垚鍔熷鐞嗕簡鎸囧畾宸ヤ欢{info.WorkPieceID}鐨勬枃浠�");
}
+
if (isGetQcSuccess == false)
{
pieceProcess.GetQcDataCount = (pieceProcess.GetQcDataCount ?? 0) + 1;
--
Gitblit v1.9.3