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_FormTest/Form1.cs | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs
index a06b941..40c5128 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs
@@ -1,4 +1,5 @@
-锘縰sing iWare_SCADA_BusinessLogical.Utils;
+锘縰sing iWare_SCADA_BusinessLogical;
+using iWare_SCADA_BusinessLogical.Utils;
using iWare_SCADA_Model;
using System;
using System.Collections.Generic;
@@ -102,7 +103,10 @@
private void button4_Click(object sender, EventArgs e)
{
+ string paht = "C:\\Users\\Administrator\\Desktop\\涓存椂\\aa\\FO_000006966558.txt";
+ DataCaptureHandler_02 dataCaptureHandler_02 = new DataCaptureHandler_02();
+ dataCaptureHandler_02.GetCH5InfoForOP30(paht, new WorkPieceLogMiddle());
}
private void btn_TongJi_Click(object sender, EventArgs e)
@@ -195,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>() {
@@ -203,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 =>
@@ -212,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)
@@ -263,7 +269,7 @@
WorkPieceID = _key
});
js_strList.Add(item);
- allPlacesCount++;
+ allPlaces_QueShi_Count++;
}
@@ -279,18 +285,29 @@
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).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;
}
@@ -313,5 +330,29 @@
}
return new_strList;
}
+
+ private void button6_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ string path = @"U:\\NutrunnerData\\FO\\SEQ_24";
+
+ var newFiles = FileHelper.DetectNewFiles(path, "*.dfq", 300, DateTime.Now.AddDays(-100), DateTime.Now.AddDays(1));
+
+ foreach (System.IO.FileInfo file in newFiles)
+ {
+ //MessageBox.Show("鎵惧埌鏂囦欢:" + file.FullName);
+ var toPath = file.FullName.Replace("Measuring_Data_df_Test", "Measuring_Data_df_Copy");
+ //MessageBox.Show("瑕佺Щ鍔ㄥ埌:" + file.FullName);
+ File.Move(file.FullName, toPath);//绉诲姩
+ }
+
+ MessageBox.Show("鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show("寮傚父:" + ex.Message);
+ }
+ }
}
}
--
Gitblit v1.9.3