liulb@mesnac.com 10 months ago
parent e91f8b2004
commit 1e31e27cac

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [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.AssemblyProductAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
87b97d6c98969839e436c60fdc3421de8c552f08c2560e1a3506756349f059ca 90a370cc974de1bdee98d887ba6b315bf06d7e4d322315cd16b7867f86e138dc

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [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.AssemblyProductAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
94521fa37ccae9da584ae5e86109853076c87d0aaf3b728988e51b5bc39def10 781dcd74ea155fef98b500f20a30f4414c645ba0b238c48e6a29fd001cadca67

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [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.AssemblyProductAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
1a85c36c93195e02d5a49ae941a1820e517b1c55eb7754d95d708227a011967f d8777c7d8396cd55c797a7a8b6cf7a44c84deeaae01b1b1a44cfd03e311109be

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [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.AssemblyProductAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
6afd04c8bfb0e354b0543d656eed46dacc31648edd00c8f90420884218ca8f4a 08f46fd48331b424068d97b9277ac1b7d2cbb31921ed57d76ebe475140591c05

@ -38,8 +38,4 @@
<ProjectReference Include="..\Aucma.Core.Tasks\Aucma.Core.Tasks.csproj" /> <ProjectReference Include="..\Aucma.Core.Tasks\Aucma.Core.Tasks.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Log\" />
</ItemGroup>
</Project> </Project>

@ -57,11 +57,7 @@ namespace Admin.Core.RealTimeService
//AutoMapper //AutoMapper
services.AddAutoMapperSetup(); services.AddAutoMapperSetup();
//PLC //PLC
//services.AddPlcSetup(); services.AddPlcSetup();
//ÈÎÎñµ÷¶È
//services.AddJobSetup();
//ÈÎÎñ
services.AddTouchSocketSetup();
//支持编码大全 例如:支持 System.Text.Encoding.GetEncoding("GB2312") System.Text.Encoding.GetEncoding("GB18030") //支持编码大全 例如:支持 System.Text.Encoding.GetEncoding("GB2312") System.Text.Encoding.GetEncoding("GB18030")
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
} }
@ -82,11 +78,12 @@ namespace Admin.Core.RealTimeService
/// </summary> /// </summary>
/// <param name="app"></param> /// <param name="app"></param>
/// <param name="env"></param> /// <param name="env"></param>
public void Configure(IApplicationBuilder app, ITouchSocketService socket) public void Configure(IApplicationBuilder app, IRunPlcService runPlcService, ITouchSocketService socket)
{ {
// 使用静态文件 // 使用静态文件
app.UseStaticFiles(); app.UseStaticFiles();
app.UseTouchSocketMildd(socket); //PLC
app.UsePlcMildd(runPlcService);
} }
#region 注册服务 #region 注册服务

@ -181,27 +181,19 @@
"PLCServer": [ "PLCServer": [
{ {
"Id": 1, "Id": 1,
"EquipName": "MCPlc1", "EquipName": "foamLine1Plc",
"IP": "10.10.93.151", "PlcType": "Siemens",
"Port": 5002 "Enabled": true,
}, "IP": "10.10.93.21",
{ "Port": 102
"Id": 1,
"EquipName": "MCPlc2",
"IP": "10.10.93.152",
"Port": 5002
},
{
"Id": 1,
"EquipName": "MCPlc3",
"IP": "10.10.93.153",
"Port": 5002
}, },
{ {
"Id": 1, "Id": 2,
"EquipName": "MCPlc4", "EquipName": "foamLine2Plc",
"IP": "10.10.93.154", "PlcType": "Siemens",
"Port": 5002 "Enabled": true,
"IP": "10.10.93.1",
"Port": 102
} }
], ],
"IpRateLimiting": { "IpRateLimiting": {

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [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.AssemblyProductAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
9771f5d2dc632a8ee6d657205f28805a84fffd7a1dfc02caabb7880fd5fd37bb 9ef000f17777fd04c207cd2437080f9e80486ec6c652631c3e1101dd913b82ed

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [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.AssemblyProductAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
a13c5b5d999a9ffa4524dd8112071bede87cef1ae9dde3b78e3bcdd650215a21 ee077623d88afa85aef92a6526979d41f5a99182b34497c1b5cb74bdfa6bf479

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [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.AssemblyProductAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
2c398f4612cf5ebc7de26de93992260233e8a8d28cdca2fdf898eb08e59778c6 118b3a57d7aadfd0f48d6702e6405a6be2f76faccc9997e50bea4312bf45acf7

@ -18,6 +18,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Threading; using System.Windows.Threading;
using static ICSharpCode.SharpZipLib.Zip.ExtendedUnixData;
namespace Aucma.Core.BoxFoam.ViewModels namespace Aucma.Core.BoxFoam.ViewModels
{ {
@ -35,6 +36,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
MonitorPageView monitorPage = new MonitorPageView();//任务监控 MonitorPageView monitorPage = new MonitorPageView();//任务监控
FoamMachinesPageView foamMachinesPageView = new FoamMachinesPageView(); FoamMachinesPageView foamMachinesPageView = new FoamMachinesPageView();
bool startflag = true; bool startflag = true;
bool flag2 = true;
public MainWindowViewModel() public MainWindowViewModel()
{ {
UserContent = firstPage; UserContent = firstPage;
@ -46,6 +48,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
{ {
await init(); await init();
await RefreshTeamTime();//班组时间 await RefreshTeamTime();//班组时间
await ClearProduct();
}); });
TeamSwitchBusiness teamSwitchBusiness = new TeamSwitchBusiness(); TeamSwitchBusiness teamSwitchBusiness = new TeamSwitchBusiness();
@ -496,66 +499,6 @@ namespace Aucma.Core.BoxFoam.ViewModels
{ {
DateTime now = DateTime.Now; DateTime now = DateTime.Now;
CurrentDateTime = now.ToString("yyyy-MM-dd HH:mm:ss"); 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) catch (Exception ex)
{ {
@ -572,23 +515,90 @@ namespace Aucma.Core.BoxFoam.ViewModels
} }
#endregion #endregion
#region MyRegion #region 定时清除产量
//private void Timer_Tick(object sender, EventArgs e) private Task ClearProduct()
//{ {
// DateTime now = DateTime.Now; while (true)
{
// // 判断当前是否是白班时间段 if (flag2)
// if (now.Hour >= 8 && now.Hour < 20) {
// { flag2 = false;
// ShiftStr = $"白班 08点-20点"; try
// } {
// else 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);
// ShiftStr = $"夜班 20点-08点"; string sTime = scheduledTime.ToString("yyyy-MM-dd HH:mm:ss");
// } Console.WriteLine($"定时班组切换清空产量时间夜班:{sTime.Equals(date)}");
// CurrentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); 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 #endregion
} }
} }

Loading…
Cancel
Save