wenjy
/
Aucma.Scada
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add-添加登录

Browse Source
foamRearStore
liuwf 8 months ago
parent a64d7a5273
commit 97ab6ed5e3
625 changed files with 134878 additions and 2083 deletions
Show Stats Download Patch File Download Diff File

BIN
.vs/HighWayIot/FileContentIndex/966fe1f6-5497-41d2-b99a-85049a9af870.vsidx
View File

Binary file not shown.

BIN
.vs/HighWayIot/FileContentIndex/f123cae1-1786-4fc6-ba15-3cee0de1c8aa.vsidx
View File

Binary file not shown.

1029
.vs/HighWayIot/config/applicationhost.config
View File

File diff suppressed because it is too large Load Diff

BIN
.vs/HighWayIot/v16/.suo
View File

Binary file not shown.

BIN
.vs/HighWayIot/v17/.suo
View File

Binary file not shown.

BIN
.vs/HighWayIot/v17/TestStore/0/000.testlog
View File

Binary file not shown.

BIN
.vs/HighWayIot/v17/TestStore/0/testlog.manifest
View File

Binary file not shown.

1
Aucma.Scada.Business/AssemblyPlanBusiness.cs
Unescape Escape View File

@ -5,7 +5,6 @@ using HighWayIot.Repository.service;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
namespace Aucma.Scada.Business
{

2
Aucma.Scada.Business/Aucma.Scada.Business.csproj
Unescape Escape View File

@ -111,7 +111,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />

14
Aucma.Scada.Business/InStoreBusiness.cs
Unescape Escape View File

@ -1,20 +1,14 @@
using Aucma.Core.Scanner;
using Aucma.Scada.HikRobot;
using Aucma.Scada.Model.domain;
using Aucma.Scada.Model.domain;
using Aucma.Scada.Model.dto;
using HighWayIot.Config;
using HighWayIot.Log4net;
using HighWayIot.Repository.service;
using HighWayIot.TouchSocket;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Timers;
using static Aucma.Core.Scanner.MvCodeHelper;
using static Aucma.Scada.Business.InStoreTaskHandle;
namespace Aucma.Scada.Business
{
@ -175,7 +169,8 @@ namespace Aucma.Scada.Business
_isBlocked = true;
}
}catch(Exception ex)
}
catch (Exception ex)
{
Console.WriteLine(ex.ToString());
}
@ -582,7 +577,8 @@ namespace Aucma.Scada.Business
{
groups = info.GroupBy(x => x.materialType).Select(y => new FoamStoreStockDto() { materialType = y.Key, storeStock = y.Sum(bs => bs.spaceStock) }).ToList();
}
}catch(Exception ex)
}
catch (Exception ex)
{
PrintLogErrorMessage("库存统计异常", ex);
}

7
Aucma.Scada.Business/MainBusiness.cs
Unescape Escape View File

@ -1,11 +1,6 @@
using Aucma.Core.Scanner;
using Aucma.Scada.HikRobot;
using HighWayIot.Config;
using HighWayIot.Log4net;
using HighWayIot.Config;
using HighWayIot.Plc;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace Aucma.Scada.Business
{

8
Aucma.Scada.Business/OutStoreBusiness.cs
Unescape Escape View File

@ -1,5 +1,4 @@
using Aucma.Core.Scanner;
using Aucma.Scada.Model.domain;
using Aucma.Scada.Model.domain;
using HighWayIot.Config;
using HighWayIot.Log4net;
using HighWayIot.Repository.service;
@ -9,8 +8,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using static Aucma.Scada.Business.OutStoreTaskHandle;
namespace Aucma.Scada.Business
{
@ -888,5 +885,6 @@ namespace Aucma.Scada.Business
return result;
}
} }
}
}

4
Aucma.Scada.Business/RegisterServices.cs
Unescape Escape View File

@ -61,9 +61,11 @@ namespace Aucma.Scada.Business
services.AddSingleton<IRecordInStoreService, RecordInStoreServiceImpl>();
services.AddSingleton<IRecordOutStoreService, RecordOutStoreServiceImpl>();
services.AddSingleton<IRecordProductfinishService, RecordProductfinishServiceImpl>();
services.AddSingleton<IPrintBarCodeServices, PrintBarCodeServicesImpl>();
services.AddSingleton<IMaterialCompletionServices, MaterialCompletionServiceImpl>();
services.AddSingleton<IBaseMaterialInfoService, BaseMaterialInfoServiceImpl>();
services.AddSingleton<IBaseTeamMembersServices, BaseTeamMembersServiceImpl>();
}
public T GetService<T>()

BIN
Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/Aucma.Scada.HikRobot.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/Aucma.Scada.HikRobot.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Common.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Common.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.TouchSocket.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.TouchSocket.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
fc3d09b7d5a7b7e0dc9fb01d4cdd7deca8d1e7c3
516fbde1671d57c1c728c6069525b853ce724988

49
Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -181,3 +181,52 @@ E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\obj\Debug\Auc
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CopyComplete
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.dll.config
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.HikRobot.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Model.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Common.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Config.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Log4net.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Plc.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Repository.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.TouchSocket.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Reactive.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Reactive.Windows.Threading.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Threading.Tasks.Extensions.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\MvCodeReaderSDK.Net.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\SqlSugar.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\Newtonsoft.Json.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\log4net.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\HslCommunication.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.Core.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.HikRobot.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Model.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Common.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Config.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Log4net.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Plc.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Repository.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Repository.dll.config
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.TouchSocket.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.xml
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.xml
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Reactive.xml
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Reactive.Windows.Threading.xml
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Threading.Tasks.Extensions.xml
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\Newtonsoft.Json.xml
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.xml
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.Core.xml
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.AssemblyReference.cache
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CoreCompileInputs.cache
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CopyComplete
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml

BIN
Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Aucma.Scada.Business/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

5
Aucma.Scada.HikRobot/GrabImage.cs
Unescape Escape View File

@ -3,8 +3,6 @@ using HighWayIot.Log4net;
using MvCodeReaderSDKNet;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
@ -215,7 +213,8 @@ namespace Aucma.Scada.HikRobot
}
} while (false);
});
}catch(Exception ex)
}
catch (Exception ex)
{
logHelper.Error("扫码异常", ex);
}

11
Aucma.Scada.HikRobot/MvCodeHelper.cs
Unescape Escape View File

@ -1,15 +1,10 @@
using MvCodeReaderSDKNet;
using HighWayIot.Config;
using HighWayIot.Log4net;
using MvCodeReaderSDKNet;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
using System.Threading;
using static System.Runtime.CompilerServices.RuntimeHelpers;
using HighWayIot.Log4net;
using HighWayIot.Config;
using System.Security.Policy;
namespace Aucma.Core.Scanner
{
public class MvCodeHelper

1
Aucma.Scada.HikRobot/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// 有关程序集的一般信息由以下

BIN
Aucma.Scada.HikRobot/bin/Debug/Aucma.Scada.HikRobot.dll
View File

Binary file not shown.

BIN
Aucma.Scada.HikRobot/bin/Debug/Aucma.Scada.HikRobot.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Common.dll
View File

Binary file not shown.

BIN
Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Common.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.dll
View File

Binary file not shown.

BIN
Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Log4net.dll
View File

Binary file not shown.

BIN
Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Log4net.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
3eb32e1004be51a33739d5edaf789c03063b8825
065b42af0f016c8371a20da874f175173870f8c3

17
Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -49,3 +49,20 @@ E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Auc
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CopyComplete
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\Aucma.Scada.HikRobot.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\Aucma.Scada.HikRobot.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Config.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Log4net.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\MvCodeReaderSDK.Net.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Common.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\log4net.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\Newtonsoft.Json.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Config.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Log4net.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Common.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\Newtonsoft.Json.xml
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.AssemblyReference.cache
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CoreCompileInputs.cache
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CopyComplete
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.pdb

BIN
Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.dll
View File

Binary file not shown.

BIN
Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.HikRobot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

1
Aucma.Scada.Model/Aucma.Scada.Model.csproj
Unescape Escape View File

@ -44,6 +44,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="domain\BaseTeamMembers.cs" />
<Compile Include="domain\BaseMaterialInfo.cs" />
<Compile Include="domain\MaterialCompletion.cs" />
<Compile Include="domain\PrintBarCode.cs" />

BIN
Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb
View File

Binary file not shown.

87
Aucma.Scada.Model/domain/BaseTeamMembers.cs
Unescape Escape View File

@ -0,0 +1,87 @@
using SqlSugar;
namespace Aucma.Scada.Model.domain
{
/// <summary>
/// 班组信息
/// </summary>
[SugarTable("BASE_TEAMMEMBERS", "AUCMA_MES")]
public class BaseTeamMembers
{
/// <summary>
/// 主键标识
///</summary>
[SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, IsIdentity = true)]
public int ObjId { get; set; }
/// <summary>
/// 班组编号
/// </summary>
[SugarColumn(ColumnName = "TEAM_CODE")]
public string TeamCode { get; set; }
/// <summary>
/// 班组名称
/// </summary>
[SugarColumn(ColumnName = "TEAM_NAME")]
public string TeamName { get; set; }
/// <summary>
/// 班组负责人
/// </summary>
[SugarColumn(ColumnName = "TEAM_HEAD")]
public string TeamHead { get; set; }
/// <summary>
/// 所属产线/工位
/// </summary>
[SugarColumn(ColumnName = "PRODUCT_LINE_CODE")]
public string ProductLineCode { get; set; }
/// <summary>
/// 是否标识
/// </summary>
[SugarColumn(ColumnName = "IS_FLAG")]
public int IsFlag { get; set; }
/// <summary>
/// 创建人
/// </summary>
[SugarColumn(ColumnName = "CREATED_BY")]
public string CreatedBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[SugarColumn(ColumnName = "CREATED_TIME")]
public string CreatedTime { get; set; }
/// <summary>
/// 更新人
/// </summary>
[SugarColumn(ColumnName = "UPDATED_BY")]
public string UpdatedBy { get; set; }
/// <summary>
/// 更新时间
/// </summary>
[SugarColumn(ColumnName = "UPDATED_TIME")]
public string UpdatedTime { get; set; }
/// <summary>
/// 开始时间
/// </summary>
[SugarColumn(ColumnName = "START_TIME")]
public string StartTime { get; set; }
/// <summary>
/// 结束时间
/// </summary>
[SugarColumn(ColumnName = "END_TIME")]
public string EndTime { get; set; }
/// <summary>
/// 吃饭时间
/// </summary>
[SugarColumn(ColumnName = "DINE_TIME")]
public string DingTime { get; set; }
}
}

6
Aucma.Scada.Model/domain/RecordInstore.cs
Unescape Escape View File

@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
using SqlSugar;
using System;
namespace Aucma.Scada.Model.domain
{
/// <summary>

6
Aucma.Scada.Model/domain/RecordOutstore.cs
Unescape Escape View File

@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
using SqlSugar;
using System;
namespace Aucma.Scada.Model.domain
{
/// <summary>

6
Aucma.Scada.Model/domain/RecordProductfinish.cs
Unescape Escape View File

@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
using SqlSugar;
using System;
namespace Aucma.Scada.Model.domain
{
/// <summary>

4
Aucma.Scada.Model/domain/WorkTime.cs
Unescape Escape View File

@ -1,9 +1,5 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Scada.Model.domain
{

8
Aucma.Scada.Model/dto/FoamStoreStockDto.cs
Unescape Escape View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Scada.Model.dto
namespace Aucma.Scada.Model.dto
{
public class FoamStoreStockDto
{

BIN
Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
c1df4a405465ec99296e7191ac19178349a56569
60e1a3b4d3e1418dd026799d4bbe00624d5973b6

8
Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -22,3 +22,11 @@ E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.CopyComplete
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Model\bin\Debug\Aucma.Scada.Model.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Model\bin\Debug\Aucma.Scada.Model.pdb
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Model\bin\Debug\SqlSugar.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.AssemblyReference.cache
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.CoreCompileInputs.cache
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.CopyComplete
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.dll
E:\c#\AUCMA\最新代码整合\登录版\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.pdb

BIN
Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

20
Aucma.Scada.UI/App.config
Unescape Escape View File

@ -21,6 +21,26 @@
<assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.122.21.1" newVersion="4.122.21.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.4" newVersion="7.0.0.4" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
<!--<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>-->
<dependentAssembly>
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

16
Aucma.Scada.UI/App.xaml
Unescape Escape View File

@ -2,10 +2,18 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Aucma.Scada.UI"
StartupUri="MainWindow.xaml">
StartupUri="LoginPageView.xaml">
<Application.Resources>
<!--Button样式-->
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="templates/style/resourceStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Defaults.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.DeepPurple.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Secondary/MaterialDesignColor.Lime.xaml" />
</ResourceDictionary.MergedDictionaries>
<!--Button样式-->
<Style x:Key="TextBoxStyle" TargetType="TextBox">
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="BorderBrush" Value="Transparent"/>
@ -20,10 +28,6 @@
</Setter.Value>
</Setter>
</Style>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="templates/style/resourceStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>

51
Aucma.Scada.UI/Aucma.Scada.UI.csproj
Unescape Escape View File

@ -14,6 +14,8 @@
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@ -59,6 +61,18 @@
<Reference Include="LiveCharts.Wpf, Version=0.9.7.0, Culture=neutral, PublicKeyToken=0bc1f845d1ebb8df, processorArchitecture=MSIL">
<HintPath>..\packages\LiveCharts.Wpf.0.9.7\lib\net45\LiveCharts.Wpf.dll</HintPath>
</Reference>
<Reference Include="MaterialDesignColors, Version=3.0.0.0, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
<HintPath>..\packages\MaterialDesignColors.3.0.0\lib\net462\MaterialDesignColors.dll</HintPath>
</Reference>
<Reference Include="MaterialDesignThemes.Wpf, Version=5.0.0.0, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
<HintPath>..\packages\MaterialDesignThemes.5.0.0\lib\net462\MaterialDesignThemes.Wpf.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.39\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
</Reference>
<Reference Include="MySql.Data">
<HintPath>..\HighWayIot.Library\MySql.Data.dll</HintPath>
</Reference>
@ -69,10 +83,29 @@
<HintPath>..\HighWayIot.Library\SqlSugar.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Data.SQLite">
<HintPath>..\HighWayIot.Library\System.Data.SQLite.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=7.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.7.0.4\lib\net462\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
</Reference>
@ -99,6 +132,7 @@
<Compile Include="Converter\ShellInventory\StatusLabelConverter.cs" />
<Compile Include="Converter\TaskInfo\TaskStatusConverter.cs" />
<Compile Include="Converter\TaskInfo\TaskTypeConverter.cs" />
<Compile Include="Model\Result.cs" />
<Compile Include="Model\typeGridModel.cs" />
<Compile Include="Page\AssemblyPlan\AssemblyPlanControl.xaml.cs">
<DependentUpon>AssemblyPlanControl.xaml</DependentUpon>
@ -148,6 +182,9 @@
<Compile Include="Page\TaskInfo\TaskInfoControl.xaml.cs">
<DependentUpon>TaskInfoControl.xaml</DependentUpon>
</Compile>
<Compile Include="LoginPageView.xaml.cs">
<DependentUpon>LoginPageView.xaml</DependentUpon>
</Compile>
<Compile Include="RecordControl.xaml.cs">
<DependentUpon>RecordControl.xaml</DependentUpon>
</Compile>
@ -165,6 +202,7 @@
<Compile Include="viewModel\LogInfoViewModel.cs" />
<Compile Include="viewModel\MainViewModel.cs" />
<Compile Include="viewModel\OutStoreInfo\OutStoreInfoViewModel.cs" />
<Compile Include="viewModel\LoginPageViewModel.cs" />
<Compile Include="viewModel\RecordViewModel.cs" />
<Compile Include="viewModel\InventoryInfo\ShellInventoryViewModel.cs" />
<Compile Include="viewModel\TaskInfo\TaskInfoViewModel.cs" />
@ -244,6 +282,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="LoginPageView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="RecordControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@ -267,6 +309,8 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<Resource Include="templates\image\Newlog.png" />
<Resource Include="templates\image\login-background.png" />
<Resource Include="templates\image\Green.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
@ -335,4 +379,11 @@
<Resource Include="templates\image\background.jpg" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\MaterialDesignThemes.5.0.0\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.5.0.0\build\MaterialDesignThemes.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\MaterialDesignThemes.5.0.0\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MaterialDesignThemes.5.0.0\build\MaterialDesignThemes.targets'))" />
</Target>
</Project>

73
Aucma.Scada.UI/LoginPageView.xaml
Unescape Escape View File

@ -0,0 +1,73 @@
<Window x:Class="Aucma.Scada.UI.LoginPageView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:local="clr-namespace:Aucma.Scada.UI"
mc:Ignorable="d"
Title="登录"
x:Name="MainWindow"
FontFamily="Microsoft YaHei"
WindowStartupLocation="CenterScreen"
WindowState="Maximized" d:DesignWidth="1200" d:DesignHeight="900"
>
<Window.Background>
<ImageBrush ImageSource="/templates/image/login-background.png" />
</Window.Background>
<Border Margin="5" Background="Transparent">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="2*"/>
<RowDefinition/>
</Grid.RowDefinitions>
<UniformGrid Grid.Row="0">
<StackPanel HorizontalAlignment="Left">
<!--<Image Source="/Assets/Images/Newlog.png" Width="100" />-->
</StackPanel>
</UniformGrid>
<UniformGrid Grid.Row="1" Margin="0 10">
<Border BorderThickness="4" CornerRadius="5" x:Name="DialogHost" Width="400" Height="350" VerticalAlignment="Center" HorizontalAlignment="Center" >
<StackPanel Background="White">
<ComboBox Margin="0 50 0 0" BorderThickness="1" FontSize="18"
x:Name="selectTeamComboBox" ItemsSource="{Binding TeamMembersList}"
Width="300"
materialDesign:HintAssist.Hint="班组"
SelectedValuePath="TeamCode"
DisplayMemberPath="TeamName"
BorderBrush="#DCDCDC"
Style="{StaticResource MaterialDesignOutlinedComboBox}">
</ComboBox>
<TextBox Margin="0 10 0 0"
x:Name="txtUserName"
Width="300"
FontSize="18"
BorderBrush="#DCDCDC"
materialDesign:HintAssist.Hint="用户名"
BorderThickness="1"
Style="{StaticResource MaterialDesignOutlinedTextBox}" />
<PasswordBox Margin="0 10 0 0" Width="300" FontSize="18" x:Name="txtPassword"
materialDesign:HintAssist.Hint="密码" BorderThickness="1" BorderBrush="#DCDCDC"
Style="{StaticResource MaterialDesignOutlinedPasswordBox}" />
<Button Margin="0 20 0 0"
x:Name="loginBtn"
Width="300"
Height="53"
BorderBrush="Transparent"
Command="{Binding LoginCommand}" Click="loginBtn_Click"
materialDesign:ButtonAssist.CornerRadius="10" Background="#4285DE" Foreground="#DDFFFFFF"
Content="登录" />
</StackPanel>
</Border>
</UniformGrid>
<UniformGrid Grid.Row="2">
</UniformGrid>
</Grid>
</Border>
</Window>

72
Aucma.Scada.UI/LoginPageView.xaml.cs
Unescape Escape View File

@ -0,0 +1,72 @@
using Aucma.Scada.Model.domain;
using Aucma.Scada.UI.viewModel;
using HighWayIot.Common;
using System;
using System.Windows;
namespace Aucma.Scada.UI
{
/// <summary>
/// MainWindow.xaml 的交互逻辑
/// </summary>
public partial class LoginPageView : Window
{
private static readonly Lazy<LoginPageView> _instance = new Lazy<LoginPageView>(() => new LoginPageView());
public static LoginPageView Instance => _instance.Value;
LoginPageViewModel loginViewModel = new LoginPageViewModel();
public LoginPageView()
{
InitializeComponent();
this.DataContext = loginViewModel;
Closing += LoginPageView_Closing; // 订阅窗口关闭事件
}
private void LoginPageView_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
System.Environment.Exit(0);
}
private void loginBtn_Click(object sender, RoutedEventArgs e)
{
string userName = txtUserName.Text;
string passWord = txtPassword.Password;
BaseTeamMembers teamMembers = (BaseTeamMembers)this.selectTeamComboBox.SelectedItem;
if (teamMembers == null)
{
MessageBox.Show("请选择班组！", "系统提醒");
return;
}
// 非空校验,账号密码正则校验
if (string.IsNullOrWhiteSpace(userName))
{
MessageBox.Show("用户名不可为空！", "系统提醒");
return;
}
if (string.IsNullOrWhiteSpace(passWord))
{
MessageBox.Show("密码不可为空！", "系统提醒");
return;
}
// 登录校验
txtUserName.Text = "";
txtPassword.Password = "";
loginViewModel.Login(teamMembers, userName, passWord, this);
}
private void TextBox_GotFocus(object sender, RoutedEventArgs e)
{
// 弹出系统键盘
OSKHelper.OpenOsk();
}
private void TextBox_LostFocus(object sender, RoutedEventArgs e)
{
// 隐藏系统键盘
OSKHelper.CloseOsk();
}
}
}

28
Aucma.Scada.UI/MainWindow.xaml
Unescape Escape View File

@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Scada.UI" FontFamily="Microsoft YaHei"
WindowStartupLocation="CenterScreen"
mc:Ignorable="d"
mc:Ignorable="d" Name="window"
Title="SCADA" Height="1080" Width="1920" Icon="Icon.png"
WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize">
<Window.Background>
@ -29,7 +29,7 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="7*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="3*"/>
</Grid.ColumnDefinitions>
<!--<StackPanel Grid.Row="0" >
-->
@ -54,21 +54,17 @@
<TextBlock Text="澳柯玛生产控制系统" FontSize="42" Foreground="White" FontWeight="Bold"/>
</StackPanel>
<StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right">
<StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0 20 0 0" >
<Grid>
<!--<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>-->
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Text="{Binding ShiftStr}" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,30,0"/>
<TextBlock Grid.Row="1" Text="{Binding CurrentDateTime}" FontSize="20" Foreground="White" FontWeight="Bold" Margin="0,0,30,0"/>
<!--<TextBlock Grid.Column="1" Text="|" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,30,0"/>
<TextBlock Grid.Column="2" Text="SCADA" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,10,0"/>-->
<StackPanel Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Grid.Column="0" Text="{Binding TeamName}" FontSize="20" Foreground="White" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Right"/>
<TextBlock Grid.Column="1" Text="{Binding CurrentDateTime}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Right"/>
</StackPanel>
</Grid>
</StackPanel>
</Grid>
@ -92,8 +88,8 @@
<!--<Button Content="日 志" x:Name="logInfo" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=logInfo}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>-->
<!--<Button Content="记 录" x:Name="record" Command="{Binding ControlOnClickCommand}" CommandParameter="{Binding Name,ElementName=record}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>-->
<Button Content="键 盘" Command="{Binding OpenSystemKeyboardCommand}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#4285DE" BorderBrush="#FF36B5C1" Margin="5 0" FontSize="17"/>
<Button Content="最小化" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#FF9900" BorderBrush="#FF9900" Margin="5 0" FontSize="17"/>
<Button Content="退 出" x:Name="Exit" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#FF0033" BorderBrush="#FF0033" Margin="5 0" FontSize="17"/>
<Button Content="最小化" x:Name="Minimized" Command="{Binding MinCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#FF9900" BorderBrush="#FF9900" Margin="5 0" FontSize="17"/>
<Button Content="退 出" x:Name="Exit" Command="{Binding CloseCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource BUTTON_AGREE}" Width="80" Height="40" Background="#FF0033" BorderBrush="#FF0033" Margin="5 0" FontSize="17"/>
</StackPanel>
<StackPanel Height="50" Orientation="Horizontal" HorizontalAlignment="Right">

11
Aucma.Scada.UI/MainWindow.xaml.cs
Unescape Escape View File

@ -1,19 +1,22 @@
using Aucma.Scada.UI.viewModel;
using System.Windows;
using System;
namespace Aucma.Scada.UI
{
/// <summary>
/// MainWindow.xaml 的交互逻辑
/// </summary>
public partial class MainWindow : Window
public partial class MainWindow
{
public MainWindow()
private static readonly Lazy<MainWindow> _instance = new Lazy<MainWindow>(() => new MainWindow());
public static MainWindow Instance => _instance.Value;
private MainWindow()
{
InitializeComponent();
MainViewModel mainViewModel = new MainViewModel();
this.DataContext = mainViewModel;
}
}
}

21
Aucma.Scada.UI/Model/Result.cs
Unescape Escape View File

@ -0,0 +1,21 @@
namespace Aucma.Scada.UI.Model
{
/**
* 登录返回结果
* */
public class Result
{
/// <summary>
/// 返回结果
/// </summary>
public string msg { get; set; }
/// <summary>
/// 返回状态
/// </summary>
public int code { get; set; }
/// <summary>
/// 返回令牌
/// </summary>
public string token { get; set; }
}
}

8
Aucma.Scada.UI/Model/typeGridModel.cs
Unescape Escape View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Scada.UI.Model
namespace Aucma.Scada.UI.Model
{
public class typeGridModel
{

12
Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml.cs
Unescape Escape View File

@ -1,18 +1,6 @@
using Aucma.Scada.Model.domain;
using Aucma.Scada.UI.viewModel.AssemblyPlan;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace Aucma.Scada.UI.Page.AssemblyPlan
{

13
Aucma.Scada.UI/Page/AssemblyPlan/SearchCriteriaWindow.xaml.cs
Unescape Escape View File

@ -1,18 +1,5 @@
using Aucma.Scada.UI.viewModel.AssemblyPlan;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace Aucma.Scada.UI.Page.AssemblyPlan
{

4
Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml.cs
Unescape Escape View File

@ -1,6 +1,5 @@
using Aucma.Scada.Business;
using Aucma.Scada.UI.viewModel.InStoreInfo;
using HighWayIot.Config;
using System;
using System.Text.RegularExpressions;
using System.Windows;
@ -59,7 +58,8 @@ namespace Aucma.Scada.UI.Page.InStoreInfo
MessageBox.Show("请输入1-9的货道编号!");
}
}
}catch (Exception ex)
}
catch (Exception ex)
{
}

16
Aucma.Scada.UI/Page/InventoryInfo/BomFoamRearInventory.xaml.cs
Unescape Escape View File

@ -1,19 +1,5 @@
using Aucma.Scada.UI.viewModel;
using Aucma.Scada.UI.viewModel.InventoryInfo;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using Aucma.Scada.UI.viewModel.InventoryInfo;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace Aucma.Scada.UI.Page.InventoryInfo
{

12
Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml.cs
Unescape Escape View File

@ -1,17 +1,5 @@
using Aucma.Scada.UI.viewModel.InventoryInfo;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace Aucma.Scada.UI.Page.InventoryInfo
{

15
Aucma.Scada.UI/Page/InventoryInfo/SelectType.xaml.cs
Unescape Escape View File

@ -1,19 +1,6 @@
using Aucma.Scada.UI.viewModel.AssemblyPlan;
using Aucma.Scada.UI.viewModel.InventoryInfo;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Aucma.Scada.UI.viewModel.InventoryInfo;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace Aucma.Scada.UI.Page.InventoryInfo
{

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.HikRobot.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.HikRobot.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe
View File

Binary file not shown.

24
Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe.config
Unescape Escape View File

@ -21,12 +21,32 @@
<assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.122.21.1" newVersion="4.122.21.1" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.4" newVersion="7.0.0.4" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
<!--<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>-->
<dependentAssembly>
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Common.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Common.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.pdb
View File

Binary file not shown.

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

Write Preview
Loading…
Cancel
Save