diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs
index c469efc7..ab59423a 100644
--- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs
+++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e91f8b200486506872ced9b30e77dede81256b2a")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache
index ab4ea7e3..c83da896 100644
--- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache
+++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache
@@ -1 +1 @@
-87b97d6c98969839e436c60fdc3421de8c552f08c2560e1a3506756349f059ca
+90a370cc974de1bdee98d887ba6b315bf06d7e4d322315cd16b7867f86e138dc
diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs
index 0182450b..e32c423e 100644
--- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs
+++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e91f8b200486506872ced9b30e77dede81256b2a")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache
index 8d094174..2c989f67 100644
--- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache
+++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache
@@ -1 +1 @@
-94521fa37ccae9da584ae5e86109853076c87d0aaf3b728988e51b5bc39def10
+781dcd74ea155fef98b500f20a30f4414c645ba0b238c48e6a29fd001cadca67
diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs
index 552756dc..4b1f9788 100644
--- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs
+++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e91f8b200486506872ced9b30e77dede81256b2a")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache
index 6088a9dd..a6a939d6 100644
--- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache
+++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache
@@ -1 +1 @@
-1a85c36c93195e02d5a49ae941a1820e517b1c55eb7754d95d708227a011967f
+d8777c7d8396cd55c797a7a8b6cf7a44c84deeaae01b1b1a44cfd03e311109be
diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs
index e7224d28..8fa821d9 100644
--- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs
+++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e91f8b200486506872ced9b30e77dede81256b2a")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache
index d48891dd..98b7628a 100644
--- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache
+++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache
@@ -1 +1 @@
-6afd04c8bfb0e354b0543d656eed46dacc31648edd00c8f90420884218ca8f4a
+08f46fd48331b424068d97b9277ac1b7d2cbb31921ed57d76ebe475140591c05
diff --git a/Admin.Core.RealTimeService/Admin.Core.RealTimeService.csproj b/Admin.Core.RealTimeService/Admin.Core.RealTimeService.csproj
index 0289941a..3d3e5455 100644
--- a/Admin.Core.RealTimeService/Admin.Core.RealTimeService.csproj
+++ b/Admin.Core.RealTimeService/Admin.Core.RealTimeService.csproj
@@ -38,8 +38,4 @@
-
-
-
-
diff --git a/Admin.Core.RealTimeService/Startup.cs b/Admin.Core.RealTimeService/Startup.cs
index cad00ac8..6aa8ee29 100644
--- a/Admin.Core.RealTimeService/Startup.cs
+++ b/Admin.Core.RealTimeService/Startup.cs
@@ -57,11 +57,7 @@ namespace Admin.Core.RealTimeService
//AutoMapper
services.AddAutoMapperSetup();
//PLC
- //services.AddPlcSetup();
- //任务调度
- //services.AddJobSetup();
- //任务
- services.AddTouchSocketSetup();
+ services.AddPlcSetup();
//支持编码大全 例如:支持 System.Text.Encoding.GetEncoding("GB2312") System.Text.Encoding.GetEncoding("GB18030")
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
}
@@ -82,11 +78,12 @@ namespace Admin.Core.RealTimeService
///
///
///
- public void Configure(IApplicationBuilder app, ITouchSocketService socket)
+ public void Configure(IApplicationBuilder app, IRunPlcService runPlcService, ITouchSocketService socket)
{
// 使用静态文件
app.UseStaticFiles();
- app.UseTouchSocketMildd(socket);
+ //PLC
+ app.UsePlcMildd(runPlcService);
}
#region 注册服务
diff --git a/Admin.Core.RealTimeService/appsettings.json b/Admin.Core.RealTimeService/appsettings.json
index 84b656bb..0f17711a 100644
--- a/Admin.Core.RealTimeService/appsettings.json
+++ b/Admin.Core.RealTimeService/appsettings.json
@@ -181,27 +181,19 @@
"PLCServer": [
{
"Id": 1,
- "EquipName": "MCPlc1",
- "IP": "10.10.93.151",
- "Port": 5002
- },
- {
- "Id": 1,
- "EquipName": "MCPlc2",
- "IP": "10.10.93.152",
- "Port": 5002
- },
- {
- "Id": 1,
- "EquipName": "MCPlc3",
- "IP": "10.10.93.153",
- "Port": 5002
+ "EquipName": "foamLine1Plc",
+ "PlcType": "Siemens",
+ "Enabled": true,
+ "IP": "10.10.93.21",
+ "Port": 102
},
{
- "Id": 1,
- "EquipName": "MCPlc4",
- "IP": "10.10.93.154",
- "Port": 5002
+ "Id": 2,
+ "EquipName": "foamLine2Plc",
+ "PlcType": "Siemens",
+ "Enabled": true,
+ "IP": "10.10.93.1",
+ "Port": 102
}
],
"IpRateLimiting": {
diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
index b19792b5..60e7c817 100644
--- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
+++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e91f8b200486506872ced9b30e77dede81256b2a")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
index 0242da79..651c4663 100644
--- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
+++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
@@ -1 +1 @@
-9771f5d2dc632a8ee6d657205f28805a84fffd7a1dfc02caabb7880fd5fd37bb
+9ef000f17777fd04c207cd2437080f9e80486ec6c652631c3e1101dd913b82ed
diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs
index 9afc9455..c9cd54c0 100644
--- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs
+++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e91f8b200486506872ced9b30e77dede81256b2a")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache
index c5b86619..7797f867 100644
--- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache
+++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache
@@ -1 +1 @@
-a13c5b5d999a9ffa4524dd8112071bede87cef1ae9dde3b78e3bcdd650215a21
+ee077623d88afa85aef92a6526979d41f5a99182b34497c1b5cb74bdfa6bf479
diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs
index 844e06d4..806c842b 100644
--- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs
+++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cdd424583775fb2b688fe0d97585da2be8a6b929")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e91f8b200486506872ced9b30e77dede81256b2a")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache
index 99922c5d..0f82e68e 100644
--- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache
+++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache
@@ -1 +1 @@
-2c398f4612cf5ebc7de26de93992260233e8a8d28cdca2fdf898eb08e59778c6
+118b3a57d7aadfd0f48d6702e6405a6be2f76faccc9997e50bea4312bf45acf7
diff --git a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs
index aa44db6c..a10e728d 100644
--- a/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.BoxFoam/ViewModels/MainWindowViewModel.cs
@@ -18,6 +18,7 @@ using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Threading;
+using static ICSharpCode.SharpZipLib.Zip.ExtendedUnixData;
namespace Aucma.Core.BoxFoam.ViewModels
{
@@ -35,6 +36,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
MonitorPageView monitorPage = new MonitorPageView();//浠诲姟鐩戞帶
FoamMachinesPageView foamMachinesPageView = new FoamMachinesPageView();
bool startflag = true;
+ bool flag2 = true;
public MainWindowViewModel()
{
UserContent = firstPage;
@@ -46,6 +48,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
{
await init();
await RefreshTeamTime();//鐝粍鏃堕棿
+ await ClearProduct();
});
TeamSwitchBusiness teamSwitchBusiness = new TeamSwitchBusiness();
@@ -496,66 +499,6 @@ namespace Aucma.Core.BoxFoam.ViewModels
{
DateTime now = DateTime.Now;
CurrentDateTime = now.ToString("yyyy-MM-dd HH:mm:ss");
- //DateTime scheduledTime = new DateTime(now.Year, now.Month, now.Day, 20, 00, 00);
- //string date = scheduledTime.ToString("yyyy-MM-dd HH:mm:ss");
- //Console.WriteLine($"鐝粍鍒囨崲娓呯┖浜ч噺鏃堕棿澶滅彮锛歿CurrentDateTime.Equals(date)}");
- //if (CurrentDateTime.Equals(date))
- //{
- // var obj1 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc"));
- // if (obj1 != null)
- // {
- // if (obj1.plc.IsConnected)
- // {
- // var flag = obj1.plc.WriteBool("M6.0", true);//鎹㈢彮 鏁版嵁娓呯┖
- // Thread.Sleep(500);
- // obj1.plc.WriteBool("M6.0", false);//鎹㈢彮 鏁版嵁娓呯┖
- // Console.WriteLine($"鐝粍鍒囨崲娓呯┖1~6鍖轰骇閲忔暟鎹細{(flag == true ? "鎴愬姛" : "澶辫触")}");
- // log.Warn($"鐝粍鍒囨崲娓呯┖1~6鍖轰骇閲忔暟鎹細{(flag == true ? "鎴愬姛" : "澶辫触")}");
- // }
- // }
- // var obj2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine2Plc"));
- // if (obj2 != null)
- // {
- // if (obj2.plc.IsConnected)
- // {
- // bool flag = obj2.plc.WriteBool("M6.0", true);//鎹㈢彮 鏁版嵁娓呯┖
- // Thread.Sleep(500);
- // obj2.plc.WriteBool("M6.0", false);//鎹㈢彮 鏁版嵁娓呯┖
- // Console.WriteLine($"鐝粍鍒囨崲娓呯┖7~12鍖轰骇閲忔暟鎹細{(flag == true ? "鎴愬姛" : "澶辫触")}");
- // log.Warn($"鐝粍鍒囨崲娓呯┖7~12鍖轰骇閲忔暟鎹細{(flag == true ? "鎴愬姛" : "澶辫触")}");
- // }
- // }
- //}
- //DateTime scheduledTime2 = new DateTime(now.Year, now.Month, now.Day, 8, 00, 00);
- //string date2 = scheduledTime2.ToString("yyyy-MM-dd HH:mm:ss");
- //Console.WriteLine($"鐝粍鍒囨崲娓呯┖浜ч噺鏃堕棿鐧界彮锛歿CurrentDateTime.Equals(date2)}");
- //if (CurrentDateTime.Equals(date2))
- //{
- // var obj1 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc"));
- // if (obj1 != null)
- // {
- // if (obj1.plc.IsConnected)
- // {
- // var flag = obj1.plc.WriteBool("M6.0", true);//鎹㈢彮 鏁版嵁娓呯┖
- // Thread.Sleep(500);
- // obj1.plc.WriteBool("M6.0", false);//鎹㈢彮 鏁版嵁娓呯┖
- // Console.WriteLine($"鐝粍鍒囨崲娓呯┖浜ч噺鏃堕棿澶滅彮锛歿(flag == true ? "鎴愬姛" : "澶辫触")}");
- // log.Warn($"鐝粍鍒囨崲娓呯┖1~6鍖轰骇閲忔暟鎹細{(flag == true ? "鎴愬姛" : "澶辫触")}");
- // }
- // }
- // var obj2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine2Plc"));
- // if (obj2 != null)
- // {
- // if (obj2.plc.IsConnected)
- // {
- // bool flag = obj2.plc.WriteBool("M6.0", true);//鎹㈢彮 鏁版嵁娓呯┖
- // Thread.Sleep(500);
- // obj2.plc.WriteBool("M6.0", false);//鎹㈢彮 鏁版嵁娓呯┖
- // Console.WriteLine($"鐝粍鍒囨崲娓呯┖浜ч噺鏃堕棿澶滅彮锛歿(flag == true ? "鎴愬姛" : "澶辫触")}");
- // log.Warn($"鐝粍鍒囨崲娓呯┖7~12鍖轰骇閲忔暟鎹細{(flag == true ? "鎴愬姛" : "澶辫触")}");
- // }
- // }
- //}
}
catch (Exception ex)
{
@@ -572,23 +515,90 @@ namespace Aucma.Core.BoxFoam.ViewModels
}
#endregion
- #region MyRegion
- //private void Timer_Tick(object sender, EventArgs e)
- //{
- // DateTime now = DateTime.Now;
-
- // // 鍒ゆ柇褰撳墠鏄惁鏄櫧鐝椂闂存
- // if (now.Hour >= 8 && now.Hour < 20)
- // {
- // ShiftStr = $"鐧界彮 08鐐-20鐐";
- // }
- // else
- // {
-
- // ShiftStr = $"澶滅彮 20鐐-08鐐";
- // }
- // CurrentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- //}
+ #region 瀹氭椂娓呴櫎浜ч噺
+ private Task ClearProduct()
+ {
+ while (true)
+ {
+ if (flag2)
+ {
+ flag2 = false;
+ try
+ {
+ DateTime now = DateTime.Now;
+ string date = now.ToString("yyyy-MM-dd HH:mm:ss");
+ DateTime scheduledTime = new DateTime(now.Year, now.Month, now.Day, 20, 00, 00);
+ string sTime = scheduledTime.ToString("yyyy-MM-dd HH:mm:ss");
+ Console.WriteLine($"瀹氭椂鐝粍鍒囨崲娓呯┖浜ч噺鏃堕棿澶滅彮锛歿sTime.Equals(date)}");
+ if (sTime.Equals(date))
+ {
+ var obj1 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc"));
+ if (obj1 != null)
+ {
+ if (obj1.plc.IsConnected)
+ {
+ bool flag = obj1.plc.WriteBool("M6.0", true);//鎹㈢彮 鏁版嵁娓呯┖
+ Thread.Sleep(500);
+ bool flag1 = obj1.plc.WriteBool("M6.0", false);//鎹㈢彮 鏁版嵁娓呯┖
+ Console.WriteLine($"鐝粍鍒囨崲娓呯┖1~6鍖轰骇閲忔暟鎹細锛歿flag}:{flag1}");
+ log.Warn($"瀹氭椂鐝粍鍒囨崲娓呯┖1~6鍖轰骇閲忔暟鎹細{(flag == true ? "鎴愬姛" : "澶辫触")}");
+ }
+ }
+ var obj2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine2Plc"));
+ if (obj2 != null)
+ {
+ if (obj2.plc.IsConnected)
+ {
+ bool flag = obj2.plc.WriteBool("M6.0", true);//鎹㈢彮 鏁版嵁娓呯┖
+ Thread.Sleep(500);
+ bool flag1 = obj2.plc.WriteBool("M6.0", false);//鎹㈢彮 鏁版嵁娓呯┖
+ Console.WriteLine($"鐝粍鍒囨崲娓呯┖7~12鍖轰骇閲忔暟鎹細{flag}:{flag1}");
+ log.Warn($"瀹氭椂鐝粍鍒囨崲娓呯┖7~12鍖轰骇閲忔暟鎹細{(flag == true ? "鎴愬姛" : "澶辫触")}");
+ }
+ }
+ }
+ DateTime scheduledTime2 = new DateTime(now.Year, now.Month, now.Day, 8, 00, 00);
+ string date2 = scheduledTime2.ToString("yyyy-MM-dd HH:mm:ss");
+ Console.WriteLine($"瀹氭椂鐝粍鍒囨崲娓呯┖浜ч噺鏃堕棿鐧界彮锛歿sTime.Equals(date2)}");
+ if (sTime.Equals(date2))
+ {
+ var obj1 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc"));
+ if (obj1 != null)
+ {
+ if (obj1.plc.IsConnected)
+ {
+ var flag = obj1.plc.WriteBool("M6.0", true);//鎹㈢彮 鏁版嵁娓呯┖
+ Thread.Sleep(500);
+ var flag1 = obj1.plc.WriteBool("M6.0", false);//鎹㈢彮 鏁版嵁娓呯┖
+ Console.WriteLine($"鐝粍鍒囨崲娓呯┖浜ч噺鏃堕棿澶滅彮锛歿flag}:{flag1}");
+ log.Warn($"瀹氭椂鐝粍鍒囨崲娓呯┖1~6鍖轰骇閲忔暟鎹細{(flag1 == true ? "鎴愬姛" : "澶辫触")}");
+ }
+ }
+ var obj2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine2Plc"));
+ if (obj2 != null)
+ {
+ if (obj2.plc.IsConnected)
+ {
+ bool flag = obj2.plc.WriteBool("M6.0", true);//鎹㈢彮 鏁版嵁娓呯┖
+ Thread.Sleep(500);
+ bool flag2 = obj2.plc.WriteBool("M6.0", false);//鎹㈢彮 鏁版嵁娓呯┖
+ Console.WriteLine($"鐝粍鍒囨崲娓呯┖浜ч噺鏃堕棿澶滅彮锛歿flag}:{flag2}");
+ log.Warn($"瀹氭椂鐝粍鍒囨崲娓呯┖7~12鍖轰骇閲忔暟鎹細{(flag == true ? "鎴愬姛" : "澶辫触")}");
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ }
+ finally
+ {
+ startflag = true;
+ }
+ }
+ }
+ }
#endregion
}
}