From 5573ddf8f8b977d25561529b1ee912aca9b93801 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 13 9月 2024 09:49:45 +0800
Subject: [PATCH] 1
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs
index 39894ab..40c5128 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs
@@ -199,7 +199,8 @@
var start = Convert.ToDateTime(str_start);
var end = Convert.ToDateTime(str_end);
- int allPlacesCount = 0;
+ int allNum = 0;
+ int allPlaces_QueShi_Count = 0;
List<WorkPieceProcess> workPieceProcessList = new List<WorkPieceProcess>();
List<string> js_strList = new List<string>();
List<string> strList = new List<string>() {
@@ -207,7 +208,7 @@
};
var q_strList = string.Join(",", strList);
var str = "";
- str += "鏃堕棿鑼冨洿: " + str_start + "鑷�" + str_end + " \r\n";
+
using (DbModel edm = new DbModel())
{
var pieces = edm.WorkPieceInfo.AsNoTracking().Where(x =>
@@ -216,6 +217,7 @@
var queryIds = pieces.Select(x => x.WorkPieceID).ToList();
var allPlaces = edm.WorkPieceProcess.AsNoTracking().Where(x => queryIds.Contains(x.WorkPieceID)).ToList();
+ allNum = allPlaces.Count();
var groups = allPlaces.GroupBy(x => x.WorkPieceID).OrderBy(x => x.Key);
foreach (var gg in groups)
@@ -267,7 +269,7 @@
WorkPieceID = _key
});
js_strList.Add(item);
- allPlacesCount++;
+ allPlaces_QueShi_Count++;
}
@@ -283,19 +285,30 @@
hzStr += $"宸ュ簭缂哄け{gg.Key} 鍏眥gg.ToList().Count()}涓�" + "\r\n";
}
- var total = $"鎬昏缂哄け:{allPlacesCount}銆�";
+ var total = $"鎬昏缂哄け:{allPlaces_QueShi_Count}銆�";
total += "\r\n";
+ //姹囨�绘暟鎹�
+ //璁＄畻鏈夋晥鏁版嵁鐜�
+
+ total += $"鎬诲伐搴忔暟閲�:{allNum},鏈夊伐搴忔暟鎹畕(allNum - allPlaces_QueShi_Count)};";
+ total += "\r\n";
+ total += $"鏈夋晥鏁版嵁鐜�:{((double)(allNum - allPlaces_QueShi_Count) / (double)allNum * 100).ToString("0.0")}%";
+ total += "\r\n";
+ total += "鏃堕棿鑼冨洿: " + str_start + "鑷�" + str_end + " \r\n";
total += hzStr;
total += "\r\n";
//澶勭悊
- workPieceProcessList = workPieceProcessList.OrderBy(x => x.WorkingProcedureCurrent).ThenBy(x=>x.WorkPieceID).ToList();
+ workPieceProcessList = workPieceProcessList.OrderBy(x => x.WorkingProcedureCurrent).ThenBy(x => x.WorkPieceID).ToList();
foreach (var item in workPieceProcessList)
{
str += $"缂哄皯{item.WorkingProcedureCurrent}宸ュ簭锛學orkPieceID: {item.WorkPieceID} \r\n";
}
str += "\r\n";
+
+
+
this.tb_TongJi.Text = total + str;
}
--
Gitblit v1.9.3