change - PLC加载修改

foamRearStore
wenjy 1 year ago
parent 7482ecd3fb
commit 1b65145396

Binary file not shown.

@ -16,7 +16,7 @@ namespace Aucma.Scada.Business
public class MainBusiness
{
private static readonly Lazy<MainBusiness> lazy = new Lazy<MainBusiness>(() => new MainBusiness());
public static MainBusiness Instance
{
get
@ -35,13 +35,27 @@ namespace Aucma.Scada.Business
{
//初始化扫码器
//初始化货道信息,保证系统内的库存信息与实物一致
}
/// <summary>
/// 初始化PLC
/// </summary>
public void InitPlc()
{
//初始化Plc
plcPool.InitPlc("MelsecBinaryPlc", plcConfig.shell_Plc_Ip, plcConfig.shell_Plc_Port, appConfig.shellStoreCode);
plcPool.InitPlc("MelsecBinaryPlc", plcConfig.liner_Plc_Ip, plcConfig.liner_Plc_Port, appConfig.linerStoreCode);
}
//初始化货道信息,保证系统内的库存信息与实物一致
/// <summary>
/// 关闭PLC
/// </summary>
public void DisConnectPlc()
{
plcPool.disConnectAll();
}
}
}

@ -39,13 +39,6 @@ namespace Aucma.Scada.Business
private TaskHandleBusiness taskHandleBusiness = TaskHandleBusiness.Instance;
/// <summary>
/// 出库任务等待反馈信号量
/// </summary>
private Semaphore m_ShellTaskSem = new Semaphore(0, 1);
private Semaphore m_LinerTaskSem = new Semaphore(0, 1);
/// <summary>
/// 初始化出库任务
/// </summary>

@ -45,10 +45,6 @@ namespace Aucma.Scada.Business
private TaskHandleBusiness()
{
//_plcDictionary.Add(appConfig.shellStoreCode, new MelsecBinaryPlc());
//_plcDictionary.Add(appConfig.linerStoreCode, new MelsecBinaryPlc());
//var shellPlc = _plcDictionary[appConfig.shellStoreCode].Connect(plcConfig.shell_Plc_Ip, plcConfig.shell_Plc_Port);
//var linerPlc = _plcDictionary[appConfig.linerStoreCode].Connect(plcConfig.liner_Plc_Ip, plcConfig.liner_Plc_Port);
_plcDictionary = _pool.GetAll();
}

@ -1 +1 @@
6f8f174c1998f3e18f51aa62ab8adfdb2b77f9e3
e95491ca2dbbb0933e831785e126e790f729e224

@ -44,3 +44,26 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\obj\D
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.dll
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HighWayIot.Common.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HighWayIot.Config.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HighWayIot.Log4net.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HighWayIot.Plc.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HighWayIot.Repository.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Newtonsoft.Json.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\log4net.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HslCommunication.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\SqlSugar.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HighWayIot.Common.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HighWayIot.Config.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HighWayIot.Log4net.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HighWayIot.Plc.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HighWayIot.Repository.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\HighWayIot.Repository.dll.config
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Newtonsoft.Json.xml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.AssemblyReference.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CoreCompileInputs.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.pdb

@ -1,4 +1,5 @@
using HighWayIot.Log4net;
using Aucma.Scada.Business;
using HighWayIot.Log4net;
using Lierda.WPFHelper;
using System;
using System.Collections.Generic;
@ -22,6 +23,8 @@ namespace Aucma.Scada.UI
LierdaCracker cracker = new LierdaCracker();
private MainBusiness mainBusiness = MainBusiness.Instance;
public App()
{
this.Startup += new StartupEventHandler(App_StartUp);
@ -38,9 +41,14 @@ namespace Aucma.Scada.UI
MessageBox.Show("应用程序已开启,禁止重复运行");
Environment.Exit(0);
}
else
{
mainBusiness.InitPlc();
}
}
private void Application_Exit(object sender, ExitEventArgs e)
{
mainBusiness.DisConnectPlc();
logHelper.Info("程序退出");
}

@ -1 +1 @@
cd393e5b290f961aeba8a0437c48de7ae1995f92
972145d32fb577cf15f13c2f976113859b9cacdd

@ -241,3 +241,91 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\A
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe.config
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\CommonServiceLocator.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Common.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Config.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Log4net.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Lierda.WPFHelper.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\MySql.Data.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Oracle.ManagedDataAccess.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\SqlSugar.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\System.Data.SQLite.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\System.Windows.Interactivity.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Plc.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\log4net.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\System.Memory.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\System.Threading.Tasks.Extensions.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HslCommunication.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\System.Numerics.Vectors.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\System.Buffers.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Common.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Config.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Log4net.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.dll.config
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.xml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.xml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.xml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.xml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.xml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Plc.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.xml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.AssemblyReference.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.SuggestedBindingRedirects.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe.config
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.g.cs
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\PlanInfoEditWindow.g.cs
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.g.cs
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\LogInfoControl.g.cs
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\MainWindow.g.cs
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.g.cs
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.g.cs
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.g.cs
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceDetailWindow.g.cs
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.g.cs
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.g.cs
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.g.cs
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\RecordControl.g.cs
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\App.g.cs
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.lref
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\App.baml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.baml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\PlanInfoEditWindow.baml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.baml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\LogInfoControl.baml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\MainWindow.baml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.baml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.baml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.baml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceDetailWindow.baml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.baml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.baml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.baml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\RecordControl.baml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\templates\style\resourceStyle.baml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.g.resources
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.Properties.Resources.resources
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.GenerateResource.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.CoreCompileInputs.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.pdb

@ -4,16 +4,16 @@
winexe
C#
.cs
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\
Aucma.Scada.UI
none
false
DEBUG;TRACE
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml
14-1433675110
34-1467425882
1341664322203
134-180737408
Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceDetailWindow.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
False

@ -4,16 +4,16 @@
winexe
C#
.cs
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\
Aucma.Scada.UI
none
false
DEBUG;TRACE
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml
14-1433675110
35454352239
1341664322203
134-180737408
Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceDetailWindow.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
True

@ -1,17 +1,17 @@
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.i.cs
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\LogInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\RecordControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\templates\style\resourceStyle.xaml;;
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.i.cs
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\LogInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\RecordControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\templates\style\resourceStyle.xaml;;

@ -1,17 +1,17 @@
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\LogInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\RecordControl.xaml;;
FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\templates\style\resourceStyle.xaml;;
E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\LogInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\RecordControl.xaml;;
FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\templates\style\resourceStyle.xaml;;

@ -27,8 +27,6 @@ namespace Aucma.Scada.UI.viewModel
private readonly InventoryInfoControl inventoryInfoControl = new InventoryInfoControl();
private readonly AssemblyPlanControl assemblyPlanControl = new AssemblyPlanControl();
private MainBusiness mainBusiness = MainBusiness.Instance;
public MainViewModel()
{
ControlOnClickCommand = new RelayCommand<object>(obj => ControlOnClick(obj));

@ -1 +1 @@
5946610343a3730e363647ba2151707ce22f641a
97b22d61f5b9f8ac62a0d2434158bb8b0652a556

@ -58,3 +58,15 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Common\obj\Debu
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.dll
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\bin\Debug\HighWayIot.Common.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\bin\Debug\HighWayIot.Common.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\bin\Debug\HighWayIot.Log4net.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\bin\Debug\Newtonsoft.Json.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\bin\Debug\log4net.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\bin\Debug\HighWayIot.Log4net.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\bin\Debug\Newtonsoft.Json.xml
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.AssemblyReference.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CoreCompileInputs.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.pdb

@ -1 +1 @@
498314701cc69a2bb9a908cd676c2b8fb46f08d1
a04e0be7d1e79646ce25b6b3a341ce2d83c7daee

@ -26,3 +26,17 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Config\obj\Debu
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.dll
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\HighWayIot.Config.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\HighWayIot.Config.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\HighWayIot.Common.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\HighWayIot.Log4net.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\Newtonsoft.Json.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\log4net.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\HighWayIot.Common.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\HighWayIot.Log4net.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\bin\Debug\Newtonsoft.Json.xml
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.AssemblyReference.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.CoreCompileInputs.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Config\obj\Debug\HighWayIot.Config.pdb

@ -1 +1 @@
43e80bf4253d29bfb56c975da1d9e6f2b7003ba1
ccc70b43df5202fccb93898c5d75ec44374c5a76

@ -36,3 +36,11 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Log4net\obj\Deb
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\bin\Debug\HighWayIot.Log4net.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\bin\Debug\HighWayIot.Log4net.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\bin\Debug\log4net.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.AssemblyReference.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CoreCompileInputs.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb

@ -1 +1 @@
63f35217a3bd32baa297f5f53a70ab9ca4787be9
d44a9ac3646bf68d2fcb1acc7a52a223a88c9ff0

@ -43,3 +43,12 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.dll
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\bin\Debug\HighWayIot.Mqtt.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\bin\Debug\HighWayIot.Mqtt.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\bin\Debug\log4net.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\bin\Debug\MQTTnet.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.AssemblyReference.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CoreCompileInputs.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.pdb

@ -44,7 +44,7 @@ namespace HighWayIot.Plc.Impl
/// <returns></returns>
public bool Connect(string IP, int port)
{
log.PlcLog("欧姆龙NJ系列PLC连接开始");
log.PlcLog("三菱Q系列PLC连接开始");
melsec_net.IpAddress = IP;
melsec_net.Port = port;
try
@ -53,20 +53,20 @@ namespace HighWayIot.Plc.Impl
if (connect.IsSuccess)
{
this.IsConnected = true;
log.PlcLog("欧姆龙NJ系列PLC建立连接成功");
log.PlcLog("三菱Q系列PLC建立连接成功");
return true;
}
else
{
this.IsConnected = false;
log.PlcLog("欧姆龙NJ系列PLC建立连接失败");
log.PlcLog("三菱Q系列PLC建立连接失败");
return false;
}
}
catch (Exception ex)
{
this.IsConnected = false;
log.Error("欧姆龙NJ系列PLC建立连接异常", ex);
log.Error("三菱Q系列PLC建立连接异常", ex);
return false;
}
}

@ -1 +1 @@
f80abeff4f54f6d92641a5ca021a378fc773b991
220bec985ab0e453942bcf4ed7bbc64b855bcf64

@ -73,3 +73,18 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Plc\obj\Debug\H
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.dll
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Plc\bin\Debug\HighWayIot.Plc.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Plc\bin\Debug\HighWayIot.Plc.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Plc\bin\Debug\HighWayIot.Common.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Plc\bin\Debug\HighWayIot.Log4net.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Plc\bin\Debug\HslCommunication.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Plc\bin\Debug\Newtonsoft.Json.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Plc\bin\Debug\log4net.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Plc\bin\Debug\HighWayIot.Common.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Plc\bin\Debug\HighWayIot.Log4net.pdb
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Plc\bin\Debug\Newtonsoft.Json.xml
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.csproj.AssemblyReference.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.csproj.CoreCompileInputs.cache
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.dll
E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.pdb

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save