From f0826424c58f3e925a77437111a2e06808bfff26 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 9月 2024 17:48:25 +0800
Subject: [PATCH] //处理OP30的数据
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs | 30 ++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.Designer.cs | 17 ++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DeleteDataHandler.cs | 28 ++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs | 37 +++++-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs | 36 ++++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs | 178 ++++++++++++++--------------
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs | 4
7 files changed, 231 insertions(+), 99 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
index 481e4fd..20da427 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
@@ -271,7 +271,9 @@
//鑾峰彇鏂囦欢澶瑰悕绉�
List<string> directorylist = new List<string>();
string directory = time.ToString("yyyy-MM-dd_HH");
- string directoryOther = time.AddSeconds(-30).ToString("yyyy-MM-dd_HH");
+ //string directoryOther = time.AddSeconds(-30).ToString("yyyy-MM-dd_HH");
+ //鏀逛负璋冩暣30鍒嗛挓鍓嶇殑鏂囦欢澶� 銆怑ditby shaocx,2024-09-02銆�
+ string directoryOther = time.AddMinutes(-30).ToString("yyyy-MM-dd_HH");
directorylist.Add(directory);
if (!directory.Equals(directoryOther))
{//濡傛灉30绉掑墠鏄彟涓�涓枃浠跺す
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DeleteDataHandler.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DeleteDataHandler.cs
index 75eab02..8cf6b36 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DeleteDataHandler.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DeleteDataHandler.cs
@@ -135,6 +135,34 @@
Log4NetHelper.WriteErrorLog(logType, $"澶勭悊OP80鐨勬暟鎹�(X:\\CA4GC20TD_NoNum)-瀹氭椂鍒犻櫎鏁版嵁寮傚父锛�", ex);
}
+ //澶勭悊OP30鐨勬暟鎹�
+ try
+ {
+ LogTextHelper.BatchDeleteLog(@"U:\NutrunnerData\FO\SEQ_24", 20);
+ Log4NetHelper.WriteInfoLog(logType, $"澶勭悊OP30鐨勬暟鎹�(U:\\NutrunnerData\\FO\\SEQ_24)-瀹氭椂鍒犻櫎鏁版嵁锛�");
+ }
+ catch (Exception ex)
+ {
+ Log4NetHelper.WriteErrorLog(logType, $"澶勭悊OP30鐨勬暟鎹�(U:\\NutrunnerData\\FO\\SEQ_24锛�-瀹氭椂鍒犻櫎鏁版嵁寮傚父锛�", ex);
+ }
+ try
+ {
+ LogTextHelper.BatchDeleteLog(@"U:\NutrunnerData\FO\SEQ_04", 20);
+ Log4NetHelper.WriteInfoLog(logType, $"澶勭悊OP30鐨勬暟鎹�(U:\\NutrunnerData\\FO\\SEQ_04)-瀹氭椂鍒犻櫎鏁版嵁锛�");
+ }
+ catch (Exception ex)
+ {
+ Log4NetHelper.WriteErrorLog(logType, $"澶勭悊OP30鐨勬暟鎹�(U:\\NutrunnerData\\FO\\SEQ_04锛�-瀹氭椂鍒犻櫎鏁版嵁寮傚父锛�", ex);
+ }
+ try
+ {
+ LogTextHelper.BatchDeleteLog(@"Z:\kistler_crack", 20);
+ Log4NetHelper.WriteInfoLog(logType, $"澶勭悊OP30鐨勬暟鎹�(Z:\\kistler_crack)-瀹氭椂鍒犻櫎鏁版嵁锛�");
+ }
+ catch (Exception ex)
+ {
+ Log4NetHelper.WriteErrorLog(logType, $"澶勭悊OP30鐨勬暟鎹�(Z:\\kistler_crack锛�-瀹氭椂鍒犻櫎鏁版嵁寮傚父锛�", ex);
+ }
try
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs
index b5120fc..854b9bb 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs
@@ -3,8 +3,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
using System.Text;
using System.Threading.Tasks;
+using System.Web.UI.WebControls;
namespace iWare_SCADA_BusinessLogical.Utils
{
@@ -13,6 +15,40 @@
/// </summary>
public class SystemBussinessHelper
{
+
+ /// <summary>
+ /// 鏍￠獙璇诲彇鐨勪簩缁寸爜鏄惁姝ｇ‘
+ /// </summary>
+ /// <param name="workPieceID"></param>
+ /// <returns></returns>
+ public static bool ValidateIsRightWorkPieceID(string workPieceID)
+ {
+ if (string.IsNullOrEmpty(workPieceID))
+ {
+ return false;
+ }
+ if (workPieceID.Length == 22)
+ {
+ var n_workPieceID = workPieceID.Trim();
+ if (n_workPieceID.Length == 22)
+ {
+ if (n_workPieceID.IndexOf("ERROR") > -1)
+ {
+ return false;
+ }
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
+
/// <summary>
/// 璁剧疆 WorkPieceInfo 鐨凞ataCapturePointCname
/// </summary>
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
index f2d3302..0316d96 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
@@ -1991,98 +1991,98 @@
}
- public WorkPieceLogMiddle GetCH5Info(string FullName, WorkPieceLogMiddle wplog)
- {
- try
- {
- string fileContent = File.ReadAllText(FullName);
- string[] lines2 = fileContent.Split('\n');
- bool IDCodeIndex = false;
- int Mcount = 0;
- int i = 0;
- int count = 0;
- foreach (string line in lines2)
- {
- count++;
- if (count == 4)
- {//鑾峰彇璐ㄩ噺缁撴灉
- var list = line.Split(' ');
- if (list.Count() > 0)
- {
- var str = list[list.Count() - 1].ToString().Trim();
- wplog.QualityStateStr = str.Equals("OK") ? "OK" : "NG";
- }
- }
- // 澶勭悊姣忎竴琛岀殑閫昏緫
- if (line.Contains("ID-Code"))//涓や釜鎷х揣锛屾瘡涓墠闈㈤兘鏈塈D-Code
- {
- i++;
- IDCodeIndex = true;
- Mcount = 0;
- }
- if (IDCodeIndex)
- {
- if (line.Contains(" M "))//绗笁涓狹琛屾槸鎷х揣鏁版嵁
- {//鏈�缁堝姏鐭�
- Mcount++;
- if (Mcount == 3)
- {
- var str = line.Replace("+", "").Replace("-", "");
- var list = str.Split('M');
- if (list.Count() == 4)
- {
- if (i == 1)
- {//CH3
- wplog.QualityOP30To3 = list[2].ToString().Trim();
- }
- else
- {//CH4
- wplog.QualityOP30To9 = list[2].ToString().Trim();
- }
- }
- IDCodeIndex = false;
- }
- }
+ //public WorkPieceLogMiddle GetCH5Info(string FullName, WorkPieceLogMiddle wplog)
+ //{
+ // try
+ // {
+ // string fileContent = File.ReadAllText(FullName);
+ // string[] lines2 = fileContent.Split('\n');
+ // bool IDCodeIndex = false;
+ // int Mcount = 0;
+ // int i = 0;
+ // int count = 0;
+ // foreach (string line in lines2)
+ // {
+ // count++;
+ // if (count == 4)
+ // {//鑾峰彇璐ㄩ噺缁撴灉
+ // var list = line.Split(' ');
+ // if (list.Count() > 0)
+ // {
+ // var str = list[list.Count() - 1].ToString().Trim();
+ // wplog.QualityStateStr = str.Equals("OK") ? "OK" : "NG";
+ // }
+ // }
+ // // 澶勭悊姣忎竴琛岀殑閫昏緫
+ // if (line.Contains("ID-Code"))//涓や釜鎷х揣锛屾瘡涓墠闈㈤兘鏈塈D-Code
+ // {
+ // i++;
+ // IDCodeIndex = true;
+ // Mcount = 0;
+ // }
+ // if (IDCodeIndex)
+ // {
+ // if (line.Contains(" M "))//绗笁涓狹琛屾槸鎷х揣鏁版嵁
+ // {//鏈�缁堝姏鐭�
+ // Mcount++;
+ // if (Mcount == 3)
+ // {
+ // var str = line.Replace("+", "").Replace("-", "");
+ // var list = str.Split('M');
+ // if (list.Count() == 4)
+ // {
+ // if (i == 1)
+ // {//CH3
+ // wplog.QualityOP30To3 = list[2].ToString().Trim();
+ // }
+ // else
+ // {//CH4
+ // wplog.QualityOP30To9 = list[2].ToString().Trim();
+ // }
+ // }
+ // IDCodeIndex = false;
+ // }
+ // }
- }
- if (line.Contains(" MWSP "))
- {//缁堟嫥绱у姏鐭� 缁堟嫥绱ц搴�
- var list = line.Split(new String[] { " MWS " }, StringSplitOptions.None);
- if (list.Count() == 2)
- {
- if (i == 1)
- {//CH3
- wplog.QualityOP30To4 = list[1].ToString().Trim();
- }
- else
- {//CH4
- wplog.QualityOP30To10 = list[1].ToString().Trim();
- }
- var list2 = list[0].Split(new String[] { " W " }, StringSplitOptions.None);
- if (list2.Count() == 2)
- {
- var str = list2[1].ToString();
- if (i == 1)
- {//CH3
- wplog.QualityOP30To5 = str.Substring(0, str.IndexOf("MWSP")).Trim();
- }
- else
- {//CH4
- wplog.QualityOP30To11 = str.Substring(0, str.IndexOf("MWSP")).Trim();
- }
- }
- }
+ // }
+ // if (line.Contains(" MWSP "))
+ // {//缁堟嫥绱у姏鐭� 缁堟嫥绱ц搴�
+ // var list = line.Split(new String[] { " MWS " }, StringSplitOptions.None);
+ // if (list.Count() == 2)
+ // {
+ // if (i == 1)
+ // {//CH3
+ // wplog.QualityOP30To4 = list[1].ToString().Trim();
+ // }
+ // else
+ // {//CH4
+ // wplog.QualityOP30To10 = list[1].ToString().Trim();
+ // }
+ // var list2 = list[0].Split(new String[] { " W " }, StringSplitOptions.None);
+ // if (list2.Count() == 2)
+ // {
+ // var str = list2[1].ToString();
+ // if (i == 1)
+ // {//CH3
+ // wplog.QualityOP30To5 = str.Substring(0, str.IndexOf("MWSP")).Trim();
+ // }
+ // else
+ // {//CH4
+ // wplog.QualityOP30To11 = str.Substring(0, str.IndexOf("MWSP")).Trim();
+ // }
+ // }
+ // }
- }
- }
- }
- catch (Exception ex)
- {
- //Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}CH5宸ヤ綅璐ㄩ噺鏁版嵁寮傚父宸ヤ欢鍙凤細{(wplog.WorkPieceID == null ? "" : wplog.WorkPieceID)} 鏂囦欢鍚嶏細{FullName}锛�", ex);
- }
- return wplog;
+ // }
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // //Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}CH5宸ヤ綅璐ㄩ噺鏁版嵁寮傚父宸ヤ欢鍙凤細{(wplog.WorkPieceID == null ? "" : wplog.WorkPieceID)} 鏂囦欢鍚嶏細{FullName}锛�", ex);
+ // }
+ // return wplog;
- }
+ //}
private void button27_Click(object sender, EventArgs e)
{
try
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.Designer.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.Designer.cs
index cf82524..8196f7d 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.Designer.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.Designer.cs
@@ -39,6 +39,7 @@
this.dateTimePicker_Start = new System.Windows.Forms.DateTimePicker();
this.btn_TongJi = new System.Windows.Forms.Button();
this.button5 = new System.Windows.Forms.Button();
+ this.button6 = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// button1
@@ -73,11 +74,11 @@
//
// button4
//
- this.button4.Location = new System.Drawing.Point(76, 335);
+ this.button4.Location = new System.Drawing.Point(76, 461);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(244, 54);
this.button4.TabIndex = 3;
- this.button4.Text = "缁熻鍒嗘瀽";
+ this.button4.Text = "璇诲彇OP30鐨勮川閲弔xt鏂囦欢";
this.button4.UseVisualStyleBackColor = true;
this.button4.Click += new System.EventHandler(this.button4_Click);
//
@@ -150,11 +151,22 @@
this.button5.UseVisualStyleBackColor = false;
this.button5.Click += new System.EventHandler(this.button5_Click);
//
+ // button6
+ //
+ this.button6.Location = new System.Drawing.Point(76, 329);
+ this.button6.Name = "button6";
+ this.button6.Size = new System.Drawing.Size(244, 54);
+ this.button6.TabIndex = 21;
+ this.button6.Text = "OP30娴嬭瘯鍒犻櫎鏂囦欢";
+ this.button6.UseVisualStyleBackColor = true;
+ this.button6.Click += new System.EventHandler(this.button6_Click);
+ //
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1307, 688);
+ this.Controls.Add(this.button6);
this.Controls.Add(this.button5);
this.Controls.Add(this.tb_TongJi);
this.Controls.Add(this.checkBox_NowDay);
@@ -186,6 +198,7 @@
private System.Windows.Forms.DateTimePicker dateTimePicker_Start;
private System.Windows.Forms.Button btn_TongJi;
private System.Windows.Forms.Button button5;
+ private System.Windows.Forms.Button button6;
}
}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_FormTest/Form1.cs
index 5d77545..39894ab 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)
@@ -313,5 +317,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);
+ }
+ }
}
}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
index b24fd30..0f3ac9a 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
@@ -211,29 +211,54 @@
public string QualityOP20To1 { get; set; }
-
+ /// <summary>
+ /// 娑ㄦ柇鍔涚煩
+ /// </summary>
public string QualityOP30To1 { get; set; }
-
+ /// <summary>
+ /// 棰勬嫥绱у姏鐭�(CH1)
+ /// </summary>
public string QualityOP30To2 { get; set; }
-
+ /// <summary>
+ /// 鏈�缁堝姏鐭�(CH3)
+ /// </summary>
public string QualityOP30To3 { get; set; }
-
+ /// <summary>
+ /// 缁堟嫥绱у姏鐭�(CH3)
+ /// </summary>
public string QualityOP30To4 { get; set; }
-
+ /// <summary>
+ /// 缁堟嫥绱ц搴�(CH3)
+ /// </summary>
public string QualityOP30To5 { get; set; }
-
+ /// <summary>
+ /// 琛鍘嬭鍔涚煩
+ /// </summary>
public string QualityOP30To6 { get; set; }
public string QualityOP30To7 { get; set; }
+ /// <summary>
+ /// 棰勬嫥绱у姏鐭�(CH2)
+ /// </summary>
public string QualityOP30To8 { get; set; }
+
+ /// <summary>
+ /// 鏈�缁堝姏鐭�(CH4)
+ /// </summary>
public string QualityOP30To9 { get; set; }
+ /// <summary>
+ /// 缁堟嫥绱у姏鐭�(CH4)
+ /// </summary>
public string QualityOP30To10 { get; set; }
+ /// <summary>
+ /// 缁堟嫥绱ц搴�(CH4)
+ /// </summary>
public string QualityOP30To11 { get; set; }
/// <summary>
--
Gitblit v1.9.3