From b2ab77f93465d960bd59c349efc5fc69dd4a659a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 11 9月 2024 15:31:18 +0800
Subject: [PATCH] 删除其他电脑的数据
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DeleteDataHandler.cs | 95 -------------------
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs | 6 +
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs | 5 +
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DeleteDataOtherHandler.cs | 170 ++++++++++++++++++++++++++++++++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs | 15 +-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs | 1
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj | 1
7 files changed, 192 insertions(+), 101 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 e15ec32..fc64e9d 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
@@ -504,6 +504,7 @@
SystemValue.OP20_Side_Value = sideValue;
}
logMiddle.MonitoringPoint += SystemValue.OP20_Side_Value;
+ //logMiddle.JiaJuGongWei
//logMiddle.CreatedUserName = logMiddle.MonitoringPoint;
SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref logMiddle, logMiddle.MonitoringPoint, DataCapturePointCname);
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 6c77f3e..ebbefc1 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DeleteDataHandler.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DeleteDataHandler.cs
@@ -103,101 +103,6 @@
}
- //澶勭悊OP60鐨勬暟鎹�
- try
- {
- LogTextHelper.BatchDeleteLog(@"Q:\Measuring_Data_df_Copy", 20);
- Log4NetHelper.WriteInfoLog(logType, $"澶勭悊OP60鐨勬暟鎹�(Q:\\Measuring_Data_df_Copy)-瀹氭椂鍒犻櫎鏁版嵁鎴愬姛锛�");
- }
- catch (Exception ex)
- {
- Log4NetHelper.WriteErrorLog(logType, $"澶勭悊OP60鐨勬暟鎹�(Q:\\Measuring_Data_df_Copy)-瀹氭椂鍒犻櫎鏁版嵁寮傚父锛�", ex);
- }
-
- try
- {
- LogTextHelper.BatchDeleteLog(@"Q:\Measuring_Data_dfq", 20);
- Log4NetHelper.WriteInfoLog(logType, $"澶勭悊OP60鐨勬暟鎹�(Q:\\Measuring_Data_dfq)-瀹氭椂鍒犻櫎鏁版嵁");
- }
- catch (Exception ex)
- {
- Log4NetHelper.WriteErrorLog(logType, $"澶勭悊OP60鐨勬暟鎹�(Q:\\Measuring_Data_dfq)-瀹氭椂鍒犻櫎鏁版嵁寮傚父锛�", ex);
- }
-
-
- //澶勭悊OP80鐨勬暟鎹�
- try
- {
- LogTextHelper.BatchDeleteLog(@"X:\CA4GC20TD_COPY", 20);
- Log4NetHelper.WriteInfoLog(logType, $"澶勭悊OP80鐨勬暟鎹�(X:\\CA4GC20TD_COPY)-瀹氭椂鍒犻櫎鏁版嵁锛�");
- }
- catch (Exception ex)
- {
- Log4NetHelper.WriteErrorLog(logType, $"澶勭悊OP80鐨勬暟鎹�(X:\\CA4GC20TD_COPY)-瀹氭椂鍒犻櫎鏁版嵁寮傚父锛�", ex);
- }
-
- try
- {
- LogTextHelper.BatchDeleteLog(@"X:\CA4GC20TD_Error", 60);
- Log4NetHelper.WriteInfoLog(logType, $"澶勭悊OP80鐨勬暟鎹�(X:\\CA4GC20TD_Error)-瀹氭椂鍒犻櫎鏁版嵁锛�");
- }
- catch (Exception ex)
- {
- Log4NetHelper.WriteErrorLog(logType, $"澶勭悊OP80鐨勬暟鎹�(X:\\CA4GC20TD_Error)-瀹氭椂鍒犻櫎鏁版嵁寮傚父锛�", ex);
- }
-
- try
- {
- LogTextHelper.BatchDeleteLog(@"X:\CA4GC20TD_NoNum", 60);
- Log4NetHelper.WriteInfoLog(logType, $"澶勭悊OP80鐨勬暟鎹�(X:\\CA4GC20TD_NoNum)-瀹氭椂鍒犻櫎鏁版嵁");
- }
- catch (Exception ex)
- {
- 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
- {
- //澶勭悊OP20鐨勬暟鎹�
- LogTextHelper.BatchDeleteLog(@"W:\", 20);
- Log4NetHelper.WriteInfoLog(logType, $"澶勭悊OP20鐨勬暟鎹�-瀹氭椂鍒犻櫎鏁版嵁锛�");
- }
- catch (Exception ex)
- {
- Log4NetHelper.WriteErrorLog(logType, $"澶勭悊OP20鐨勬暟鎹�-瀹氭椂鍒犻櫎鏁版嵁寮傚父锛�", ex);
- }
-
-
}
catch (Exception ex)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DeleteDataOtherHandler.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DeleteDataOtherHandler.cs
new file mode 100644
index 0000000..1ae08e8
--- /dev/null
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DeleteDataOtherHandler.cs
@@ -0,0 +1,170 @@
+锘縰sing iWare_SCADA_BusinessLogical.BLL;
+using iWare_SCADA_BusinessLogical.Utils;
+using iWare_SCADA_Model;
+using iWare_SCADA_Model.MiddleModel;
+using log4net;
+using System;
+using System.Collections.Generic;
+using System.Data.Entity.Core.Common.CommandTrees;
+using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
+using System.Data.Entity.Validation;
+using System.Data.SqlTypes;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web.UI.WebControls;
+using System.Windows.Forms;
+
+namespace iWare_SCADA_BusinessLogical
+{
+ /// <summary>
+ /// 瀹氭椂鍒犻櫎鏁版嵁(鍏朵粬鐢佃剳鐨勬枃浠�)
+ /// </summary>
+ public class DeleteDataOtherHandler : DataCaptureHandler
+ {
+ public static readonly DeleteDataOtherHandler Instance = new DeleteDataOtherHandler();
+
+ public static readonly LogType logType = LogType.DeleteData;
+
+ public DeleteDataOtherHandler()
+ {
+ }
+
+ public override string WorkingProcedure
+ {
+ get { return _dataCaptureConfig.WorkingProcedure; }
+ }
+
+ public override string DataCapturePointCode
+ {
+ get { return _dataCaptureConfig.DataCapturePointCode; }
+ }
+ public override string DataCapturePointCname
+ {
+ get { return _dataCaptureConfig.DataCapturePointCname; }
+ }
+
+
+ public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+ {
+ }
+
+ public override void DataCaptureStart()
+ {
+ while (true)
+ {
+ try
+ {
+
+ //澶勭悊OP60鐨勬暟鎹�
+ try
+ {
+ LogTextHelper.BatchDeleteLog(@"Q:\Measuring_Data_df_Copy", 20);
+ Log4NetHelper.WriteInfoLog(logType, $"澶勭悊OP60鐨勬暟鎹�(Q:\\Measuring_Data_df_Copy)-瀹氭椂鍒犻櫎鏁版嵁鎴愬姛锛�");
+ }
+ catch (Exception ex)
+ {
+ Log4NetHelper.WriteErrorLog(logType, $"澶勭悊OP60鐨勬暟鎹�(Q:\\Measuring_Data_df_Copy)-瀹氭椂鍒犻櫎鏁版嵁寮傚父锛�", ex);
+ }
+
+ try
+ {
+ LogTextHelper.BatchDeleteLog(@"Q:\Measuring_Data_dfq", 20);
+ Log4NetHelper.WriteInfoLog(logType, $"澶勭悊OP60鐨勬暟鎹�(Q:\\Measuring_Data_dfq)-瀹氭椂鍒犻櫎鏁版嵁");
+ }
+ catch (Exception ex)
+ {
+ Log4NetHelper.WriteErrorLog(logType, $"澶勭悊OP60鐨勬暟鎹�(Q:\\Measuring_Data_dfq)-瀹氭椂鍒犻櫎鏁版嵁寮傚父锛�", ex);
+ }
+
+
+ //澶勭悊OP80鐨勬暟鎹�
+ try
+ {
+ LogTextHelper.BatchDeleteLog(@"X:\CA4GC20TD_COPY", 20);
+ Log4NetHelper.WriteInfoLog(logType, $"澶勭悊OP80鐨勬暟鎹�(X:\\CA4GC20TD_COPY)-瀹氭椂鍒犻櫎鏁版嵁锛�");
+ }
+ catch (Exception ex)
+ {
+ Log4NetHelper.WriteErrorLog(logType, $"澶勭悊OP80鐨勬暟鎹�(X:\\CA4GC20TD_COPY)-瀹氭椂鍒犻櫎鏁版嵁寮傚父锛�", ex);
+ }
+
+ try
+ {
+ LogTextHelper.BatchDeleteLog(@"X:\CA4GC20TD_Error", 60);
+ Log4NetHelper.WriteInfoLog(logType, $"澶勭悊OP80鐨勬暟鎹�(X:\\CA4GC20TD_Error)-瀹氭椂鍒犻櫎鏁版嵁锛�");
+ }
+ catch (Exception ex)
+ {
+ Log4NetHelper.WriteErrorLog(logType, $"澶勭悊OP80鐨勬暟鎹�(X:\\CA4GC20TD_Error)-瀹氭椂鍒犻櫎鏁版嵁寮傚父锛�", ex);
+ }
+
+ try
+ {
+ LogTextHelper.BatchDeleteLog(@"X:\CA4GC20TD_NoNum", 60);
+ Log4NetHelper.WriteInfoLog(logType, $"澶勭悊OP80鐨勬暟鎹�(X:\\CA4GC20TD_NoNum)-瀹氭椂鍒犻櫎鏁版嵁");
+ }
+ catch (Exception ex)
+ {
+ 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
+ {
+ //澶勭悊OP20鐨勬暟鎹�
+ LogTextHelper.BatchDeleteLog(@"W:\", 20);
+ Log4NetHelper.WriteInfoLog(logType, $"澶勭悊OP20鐨勬暟鎹�-瀹氭椂鍒犻櫎鏁版嵁锛�");
+ }
+ catch (Exception ex)
+ {
+ Log4NetHelper.WriteErrorLog(logType, $"澶勭悊OP20鐨勬暟鎹�-瀹氭椂鍒犻櫎鏁版嵁寮傚父锛�", ex);
+ }
+
+ Thread.Sleep(8 * 60 * 60 * 1000);//姣忓ぉ8灏忔椂涓�娆�
+
+ }
+ catch (Exception ex)
+ {
+ Log4NetHelper.WriteErrorLog(logType, $"瀹氭椂鍒犻櫎鏁版嵁寮傚父锛�", ex);
+ }
+ finally
+ {
+ }
+ }
+ }
+
+ }
+}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
index 8bf2460..5afd7e1 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
@@ -90,6 +90,7 @@
<Compile Include="BLL\WorkPieceLogManager.cs" />
<Compile Include="DataCaptureHandlerV2\DataCaptureHandler_OP0501 - 鏂扮増.cs" />
<Compile Include="DataCaptureHandlerV2\DataCaptureHandler_OP0501 - 鑰佺増.cs" />
+ <Compile Include="DataCaptureHandlerV2\DeleteDataOtherHandler.cs" />
<Compile Include="DataCaptureHandlerV2\DeleteDataHandler.cs" />
<Compile Include="DataCaptureHandlerV2\OP80QualityDataHandler.cs" />
<Compile Include="DataCaptureHandlerV2\DataCaptureHandler_01.cs" />
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
index 285e60c..3104246 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
@@ -1560,6 +1560,9 @@
DeleteDataHandler _deleteDataHandler = new DeleteDataHandler();
_dataCaptureHandler.Add(_deleteDataHandler);
+ DeleteDataOtherHandler _deleteDataOtherHandler = new DeleteDataOtherHandler();
+ _dataCaptureHandler.Add(_deleteDataOtherHandler);
+
#endregion
try
@@ -1904,12 +1907,12 @@
//#region 01 浜岀淮鐮佽鍙�
case "OP3001":
- //case "OP3501":
- //case "OP5001A":
- //case "OP5001B":
- //case "OP6001":
- //case "OP7001":
- //case "OP8001":
+ //case "OP3501":
+ //case "OP5001A":
+ //case "OP5001B":
+ //case "OP6001":
+ //case "OP7001":
+ //case "OP8001":
DataCaptureHandler_01 dc01 = new DataCaptureHandler_01();
dc01._dataCaptureConfig = config;
_dataCaptureHandler.Add(dc01);
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 0f3ac9a..a948eb0 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
@@ -17,6 +17,11 @@
/// </summary>
public int? GetQcDataFlag { get; set; }
+ /// <summary>
+ /// 澶瑰叿宸ヤ綅
+ /// </summary>
+ public string JiaJuGongWei { get; set;}
+
#region SPC,NOOK 鎺ㄥ嚭澶氫欢 OP20锛孫P50锛孫P60
public string WorkPieceIDA { get; set; }
public string WorkPieceIDB { get; set; }
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs
index a74c122..5760337 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs
@@ -98,5 +98,11 @@
/// 需要更新70质量数据的标记 （ 1：需要更新 2：不需要更新）
/// </summary>
public int? Update70Flag { get; set; }
+
+
+ /// <summary>
+ /// 夹具工位 [Editby shaocx,2024-09-11]
+ /// </summary>
+ public string JiaJuGongWei { get; set; }
}
}
--
Gitblit v1.9.3