liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://175.27.215.92:3000/liulb/AUCMA_SCADA

Browse Source
dev
wenjy 1 year ago
parent 2f73fcd228 7122fe8117
commit 08191a8bfd
31 changed files with 129 additions and 109 deletions
Show Stats Download Patch File Download Diff File

5
Admin.Core.Api/Admin.Core.Model.xml
Unescape Escape View File

@ -3236,6 +3236,11 @@
创建时间 创建时间
</summary> </summary>
</member> </member>
<member name="T:Admin.Core.Model.SmSyncModelSub">
<summary>
bom设置
</summary>
</member>
<member name="P:Admin.Core.Model.SmSyncModelSub.SmProductId"> <member name="P:Admin.Core.Model.SmSyncModelSub.SmProductId">
<summary> <summary>
产品型号编码——主键产品型号 产品型号编码——主键产品型号

10
Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props
Unescape Escape View File

@ -5,20 +5,18 @@
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool> <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile> <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot> <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders> <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\admin\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle> <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.5.0</NuGetToolVersion> <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\Lenovo\.nuget\packages\" /> <SourceRoot Include="C:\Users\admin\.nuget\packages\" />
<SourceRoot Include="D:\开发工具\Visual Studio 2019\Shared\NuGetPackages\" />
<SourceRoot Include="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\" />
</ItemGroup> </ItemGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\3.0.0\build\Microsoft.Extensions.ApiDescription.Server.props" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\3.0.0\build\Microsoft.Extensions.ApiDescription.Server.props')" /> <Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\3.0.0\build\Microsoft.Extensions.ApiDescription.Server.props" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\3.0.0\build\Microsoft.Extensions.ApiDescription.Server.props')" />
<Import Project="$(NuGetPackageRoot)swashbuckle.aspnetcore\5.6.3\build\Swashbuckle.AspNetCore.props" Condition="Exists('$(NuGetPackageRoot)swashbuckle.aspnetcore\5.6.3\build\Swashbuckle.AspNetCore.props')" /> <Import Project="$(NuGetPackageRoot)swashbuckle.aspnetcore\5.6.3\build\Swashbuckle.AspNetCore.props" Condition="Exists('$(NuGetPackageRoot)swashbuckle.aspnetcore\5.6.3\build\Swashbuckle.AspNetCore.props')" />
</ImportGroup> </ImportGroup>
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\Lenovo\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0</PkgMicrosoft_Extensions_ApiDescription_Server> <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\admin\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0</PkgMicrosoft_Extensions_ApiDescription_Server>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

4
Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -9,9 +9,9 @@ build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Api build_property.RootNamespace = Admin.Core.Api
build_property.RootNamespace = Admin.Core.Api build_property.RootNamespace = Admin.Core.Api
build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Api\ build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api\
build_property.RazorLangVersion = 6.0 build_property.RazorLangVersion = 6.0
build_property.SupportLocalizedComponentNames = build_property.SupportLocalizedComponentNames =
build_property.GenerateRazorMetadataSourceChecksumAttributes = build_property.GenerateRazorMetadataSourceChecksumAttributes =
build_property.MSBuildProjectDirectory = E:\桌面\AUCMA_SCADA\Admin.Core.Api build_property.MSBuildProjectDirectory = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api
build_property._RazorSourceGeneratorDebug = build_property._RazorSourceGeneratorDebug =

43
Admin.Core.Api/obj/project.assets.json
Unescape Escape View File

@ -7067,11 +7067,12 @@
] ]
}, },
"System.Collections.NonGeneric/4.3.0": { "System.Collections.NonGeneric/4.3.0": {
"sha512": "LE/oChpRvkSi3U25u0KnJcI44JeDZ1QJCyN4qFDx2uusEypdqR24w7lKYw21eYe5esuCBuc862wRmpF63Yy1KQ==", "sha512": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==",
"type": "package", "type": "package",
"path": "system.collections.nongeneric/4.3.0", "path": "system.collections.nongeneric/4.3.0",
"files": [ "files": [
".nupkg.metadata", ".nupkg.metadata",
".signature.p7s",
"ThirdPartyNotices.txt", "ThirdPartyNotices.txt",
"dotnet_library_license.txt", "dotnet_library_license.txt",
"lib/MonoAndroid10/_._", "lib/MonoAndroid10/_._",
@ -9804,11 +9805,12 @@
] ]
}, },
"System.Runtime.Serialization.Primitives/4.3.0": { "System.Runtime.Serialization.Primitives/4.3.0": {
"sha512": "2Z5t70a2SwMsfQDp9KOclaZNyQhfIga2gppq9lIUDM1A4ohTshn4JqT7ir8bvIhXgorWKYDAr6rPzEbi/nTGKg==", "sha512": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==",
"type": "package", "type": "package",
"path": "system.runtime.serialization.primitives/4.3.0", "path": "system.runtime.serialization.primitives/4.3.0",
"files": [ "files": [
".nupkg.metadata", ".nupkg.metadata",
".signature.p7s",
"ThirdPartyNotices.txt", "ThirdPartyNotices.txt",
"dotnet_library_license.txt", "dotnet_library_license.txt",
"lib/MonoAndroid10/_._", "lib/MonoAndroid10/_._",
@ -11275,47 +11277,40 @@
] ]
}, },
"packageFolders": { "packageFolders": {
"C:\\Users\\Lenovo\\.nuget\\packages\\": {}, "C:\\Users\\admin\\.nuget\\packages\\": {}
"D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {},
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
}, },
"project": { "project": {
"version": "1.0.0", "version": "1.0.0",
"restore": { "restore": {
"projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
"projectName": "Admin.Core.Api", "projectName": "Admin.Core.Api",
"projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
"packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
"outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\obj\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\",
"projectStyle": "PackageReference", "projectStyle": "PackageReference",
"fallbackFolders": [
"D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [ "configFilePaths": [
"C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
], ],
"originalTargetFrameworks": [ "originalTargetFrameworks": [
"net6.0" "net6.0"
], ],
"sources": { "sources": {
"https://api.nuget.org/v3/index.json": {}, "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://nuget.cnblogs.com/v3/index.json": {} "https://api.nuget.org/v3/index.json": {}
}, },
"frameworks": { "frameworks": {
"net6.0": { "net6.0": {
"targetAlias": "net6.0", "targetAlias": "net6.0",
"projectReferences": { "projectReferences": {
"E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": { "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
"projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj" "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj"
}, },
"E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
"projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
}, },
"E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": { "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
"projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj" "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
} }
} }
} }
@ -11358,7 +11353,7 @@
"privateAssets": "all" "privateAssets": "all"
} }
}, },
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
} }
} }
} }

2
Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Extensions build_property.RootNamespace = Admin.Core.Extensions
build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Extensions\ build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\

2
Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -1,3 +1,3 @@
is_global = true is_global = true
build_property.RootNamespace = Admin.Core.FrameWork build_property.RootNamespace = Admin.Core.FrameWork
build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.FrameWork\ build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.FrameWork\

2
Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.IRepository build_property.RootNamespace = Admin.Core.IRepository
build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IRepository\ build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IRepository\

2
Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.IService build_property.RootNamespace = Admin.Core.IService
build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IService\ build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IService\

3
Admin.Core.Model/Model_New/SmSyncModelSub.cs
Unescape Escape View File

@ -7,6 +7,9 @@ using System.Threading.Tasks;
namespace Admin.Core.Model namespace Admin.Core.Model
{ {
/// <summary>
/// bom设置
/// </summary>
[SugarTable("SM_SYNCMODELSUB", "AUCMA_SCADA")] [SugarTable("SM_SYNCMODELSUB", "AUCMA_SCADA")]
public class SmSyncModelSub public class SmSyncModelSub
{ {

2
Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Model build_property.RootNamespace = Admin.Core.Model
build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Model\ build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Model\

2
Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.RealTimeService build_property.RootNamespace = Admin.Core.RealTimeService
build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.RealTimeService\ build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.RealTimeService\

2
Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Repository build_property.RootNamespace = Admin.Core.Repository
build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Repository\ build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Repository\

2
Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Service build_property.RootNamespace = Admin.Core.Service
build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Service\ build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Service\

2
Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Tasks build_property.RootNamespace = Admin.Core.Tasks
build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Tasks\ build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\

2
Aucma.Core.HwPLc/Impl/MelsecPlc.cs
Unescape Escape View File

@ -81,7 +81,7 @@ namespace Aucma.Core.HwPLc
/// <returns></returns> /// <returns></returns>
public bool Connect(string iP, int port) public bool Connect(string iP, int port)
{ {
melsecMcNet.IpAddress = iP;//正式环境开启 //melsecMcNet.IpAddress = iP;//正式环境开启
melsecMcNet.Port = port; melsecMcNet.Port = port;
// 如果网络不太理想，配置了两个端口，一个有问题，立即切换另一个的话，可以配置如下的代码 // 如果网络不太理想，配置了两个端口，一个有问题，立即切换另一个的话，可以配置如下的代码

3
Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj
Unescape Escape View File

@ -58,6 +58,9 @@
<None Update="Log4net.config"> <None Update="Log4net.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Update="Report\MaterialBar.frx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup> </ItemGroup>
</Project> </Project>

17
Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs
Unescape Escape View File

@ -39,7 +39,7 @@ namespace Aucma.Core.PrintTo.ViewModels
PrintIsEnabled = "True"; PrintIsEnabled = "True";
WeakReferenceMessenger.Default.Register<string>(this, Recive); WeakReferenceMessenger.Default.Register<string>(this, Recive);
PrintAmount = 0;
LoadData(); LoadData();
} }
@ -200,7 +200,7 @@ namespace Aucma.Core.PrintTo.ViewModels
string product_name = SelectedCells.ProductName; string product_name = SelectedCells.ProductName;
//string material_code = SelectedCells.MaterialCode; //string material_code = SelectedCells.MaterialCode;
//string material_name = SelectedCells.MaterialName; //string material_name = SelectedCells.MaterialName;
int standard_amount = SelectedCells.PlanAmount; int standard_amount = PrintAmount;
string printName = SelectedCells.PrintName; string printName = SelectedCells.PrintName;
PrintIsEnabled = "False"; PrintIsEnabled = "False";
@ -326,6 +326,19 @@ namespace Aucma.Core.PrintTo.ViewModels
} }
#endregion #endregion
#region 打印数量
private int printAmount;
public int PrintAmount
{
get { return printAmount; }
set
{
printAmount = value;
SetProperty(ref printAmount, value);
}
}
#endregion
#region 常规打印按钮状态 #region 常规打印按钮状态
private string _printIsEnabled; private string _printIsEnabled;
public string PrintIsEnabled public string PrintIsEnabled

2
Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs
Unescape Escape View File

@ -270,7 +270,7 @@ namespace Aucma.Core.PrintTo.ViewModels
MessageBox.Show("无法查询打印条码数据", "系统提醒"); MessageBox.Show("无法查询打印条码数据", "系统提醒");
return; return;
} }
baseBomInfo= tmpList.FirstOrDefault(d=>d.MaterialType== "600"); baseBomInfo= tmpList.FirstOrDefault(d=>d.MaterialType== "400");
} }
if (printType == 500)//内胆 if (printType == 500)//内胆
{ {

2
Aucma.Core.PrintTo/Views/IndexPageView.xaml
Unescape Escape View File

@ -233,7 +233,7 @@
</WrapPanel> </WrapPanel>
<WrapPanel Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15"> <WrapPanel Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
<TextBlock Text="&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;打印数量" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" /> <TextBlock Text="&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;打印数量" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
<Slider x:Name="PlanAmount" FontSize="18" Minimum="0" Maximum="500" BorderBrush="White" Value="{Binding SelectedItem.CompleteAmount, ElementName=dgvMH}" Foreground="White" Height="30" VerticalContentAlignment="Center" <Slider x:Name="PlanAmount" FontSize="18" Minimum="0" Maximum="500" BorderBrush="White" Value="{Binding PrintAmount,Mode=TwoWay}" Foreground="White" Height="30" VerticalContentAlignment="Center"
HorizontalContentAlignment="Left" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15 0 0 0" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"/> HorizontalContentAlignment="Left" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15 0 0 0" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"/>
<!--<TextBlock Text="1~500" Width="60" Margin="10 0 0 0" Foreground="White" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />--> <!--<TextBlock Text="1~500" Width="60" Margin="10 0 0 0" Foreground="White" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />-->
</WrapPanel> </WrapPanel>

5
Aucma.Core.SheetMetal/Startup.cs
Unescape Escape View File

@ -9,6 +9,7 @@ using Admin.Core.Repository;
using Admin.Core.Service; using Admin.Core.Service;
using Admin.Core.Tasks; using Admin.Core.Tasks;
using Aucma.Core.RunPlc; using Aucma.Core.RunPlc;
using Aucma.Core.ScannerGun;
using Aucma.Core.SheetMetalTasks; using Aucma.Core.SheetMetalTasks;
using Autofac; using Autofac;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
@ -67,6 +68,7 @@ namespace Aucma.Core.SheetMetal
//PLC //PLC
services.AddPlcSetup(); services.AddPlcSetup();
services.AddAucmaSheetMetalTaskSetup(); services.AddAucmaSheetMetalTaskSetup();
//services.AddScannerGunSetup();
//支持编码大全 例如:支持 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);
} }
@ -87,7 +89,7 @@ namespace Aucma.Core.SheetMetal
/// </summary> /// </summary>
/// <param name="app"></param> /// <param name="app"></param>
/// <param name="env"></param> /// <param name="env"></param>
public void Configure(IApplicationBuilder app, IRunPlcService runPlcService, IAucamSheetMetalTaskService aucamSheetMetalTaskService ) public void Configure(IApplicationBuilder app, IRunPlcService runPlcService, IAucamSheetMetalTaskService aucamSheetMetalTaskService)
{ {
// 使用静态文件 // 使用静态文件
app.UseStaticFiles(); app.UseStaticFiles();
@ -97,6 +99,7 @@ namespace Aucma.Core.SheetMetal
app.UsePlcMildd(runPlcService); app.UsePlcMildd(runPlcService);
//澳柯玛任务处理中间件 //澳柯玛任务处理中间件
app.UseAucamSheetMetalTaskMildds(aucamSheetMetalTaskService); app.UseAucamSheetMetalTaskMildds(aucamSheetMetalTaskService);
//app.UseScannerGunMildd(scannerGun);// IScannerGunService scannerGun,
} }
#region 注册服务 #region 注册服务

1
Aucma.Core.SheetMetal/ViewModels/BomMaintenancePageViewModel.cs
Unescape Escape View File

@ -35,6 +35,7 @@ namespace Aucma.Core.SheetMetal.ViewModels
public void OnLoadData() public void OnLoadData()
{ {
var list = _smSyncModelServices.QueryAsync().Result; var list = _smSyncModelServices.QueryAsync().Result;
if (list == null || list.Count() == 0) return;
foreach (var item in list) foreach (var item in list)
{ {
SmSyncModelDataGrid.Add(item); SmSyncModelDataGrid.Add(item);

3
Aucma.Core.SheetMetal/appsettings.json
Unescape Escape View File

@ -109,6 +109,9 @@
"QuartzNetJob": { "QuartzNetJob": {
"Enabled": false "Enabled": false
}, },
"ScannerGun": {
"Enabled": true
},
"Plc": { "Plc": {
"Enabled": true "Enabled": true
}, },

50
Aucma.Core.SheetMetalTasks/AucamSheetMetalTaskService.cs
Unescape Escape View File

@ -7,6 +7,7 @@ using Admin.Core.Model.ViewModels;
using System.Text; using System.Text;
using System.Timers; using System.Timers;
using Aucma.Core.HwPLc; using Aucma.Core.HwPLc;
using log4net;
namespace Aucma.Core.SheetMetalTasks namespace Aucma.Core.SheetMetalTasks
{ {
@ -15,6 +16,8 @@ namespace Aucma.Core.SheetMetalTasks
/// </summary> /// </summary>
public class AucamSheetMetalTaskService : IAucamSheetMetalTaskService public class AucamSheetMetalTaskService : IAucamSheetMetalTaskService
{ {
private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(AucamSheetMetalTaskService));
#region 刷新创建计划 #region 刷新创建计划
/// <summary> /// <summary>
/// 刷新创建计划 /// 刷新创建计划
@ -140,34 +143,41 @@ namespace Aucma.Core.SheetMetalTasks
await Task.CompletedTask; await Task.CompletedTask;
while (true) while (true)
{ {
var planInfoList = await _executePlanInfoServices.QuerySheetMetalSendPlanData("1001"); try
if (planInfoList == null || planInfoList.Count == 0) continue;
planInfoList = planInfoList.Where(d => d.PlanAmount > d.SidePanelAmount).ToList();
if (planInfoList == null || planInfoList.Count == 0) continue;
planInfoList = planInfoList.Where(d => d.ExecuteStatus == 1 || d.ExecuteStatus == 2).ToList();
if (planInfoList == null || planInfoList.Count == 0) continue;
var planInfos = planInfoList.Where(d => d.PlanType == 3 || d.PlanType == 1).ToList();
if (planInfos != null)
{ {
if (planInfos.Count > 0) var planInfoList = await _executePlanInfoServices.QuerySheetMetalSendPlanData("1001");
if (planInfoList == null || planInfoList.Count == 0) continue;
planInfoList = planInfoList.Where(d => d.PlanAmount > d.SidePanelAmount).ToList();
if (planInfoList == null || planInfoList.Count == 0) continue;
planInfoList = planInfoList.Where(d => d.ExecuteStatus == 1 || d.ExecuteStatus == 2).ToList();
if (planInfoList == null || planInfoList.Count == 0) continue;
var planInfos = planInfoList.Where(d => d.PlanType == 3 || d.PlanType == 1).ToList();
if (planInfos != null)
{ {
SheetMetaSendPlanInfoView planInfo = planInfos.FirstOrDefault(d => d.BackPanelAmount != d.PlanAmount); if (planInfos.Count > 0)
if (planInfo == null) continue;
if (planInfo.PlanType == 3 || planInfo.PlanType == 1)//如果为3或者为1 后板计划单独下发 以前板完成为主
{ {
//获取设置的型号查询对应的型号，下发计划 SheetMetaSendPlanInfoView planInfo = planInfos.FirstOrDefault(d => d.BackPanelAmount != d.PlanAmount);
if (planInfo == null) continue;
if (planInfo.PlanType == 3 || planInfo.PlanType == 1)//如果为3或者为1 后板计划单独下发 以前板完成为主
{
//获取设置的型号查询对应的型号，下发计划
SendPlanTaskToBackPanel(planInfo, obj_backPanel); SendPlanTaskToBackPanel(planInfo, obj_backPanel);
UpdateBackPanelPlanTaskByComplate(planInfo); UpdateBackPanelPlanTaskByComplate(planInfo);
}
}
else
{
Console.WriteLine("未获取到需要下发的任务");
} }
} }
else Thread.Sleep(3000);
{ }
Console.WriteLine("未获取到需要下发的任务"); catch (Exception ex)
} {
logHelper.Error(ex.Message);
} }
Thread.Sleep(3000);
} }
} }

2
HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs
Unescape Escape View File

@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace {
/// GeneratedInternalTypeHelper /// GeneratedInternalTypeHelper
/// </summary> /// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.4.0")] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {

2
HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = HwControlLib build_property.RootNamespace = HwControlLib
build_property.ProjectDir = E:\桌面\AUCMA_SCADA\HwControlLib\ build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\HwControlLib\

BIN
HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache
View File

Binary file not shown.

4
HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
Unescape Escape View File

@ -4,7 +4,7 @@
library library
C# C#
.cs .cs
E:\桌面\AUCMA_SCADA\HwControlLib\obj\Debug\net6.0-windows\ D:\Project\gitea\AUCMA\SCADA\HwControlLib\obj\Debug\net6.0-windows\
HwControlLib HwControlLib
none none
false false
@ -13,7 +13,7 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP
1204305769 1204305769
71208292394 71208292394
194-1617825143 194-2067936865
Themes\Generic.xaml; Themes\Generic.xaml;
False False

25
HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json
Unescape Escape View File

@ -1,33 +1,28 @@
{ {
"format": 1, "format": 1,
"restore": { "restore": {
"E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": {} "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj": {}
}, },
"projects": { "projects": {
"E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": { "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj": {
"version": "1.0.0", "version": "1.0.0",
"restore": { "restore": {
"projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
"projectName": "HwControlLib", "projectName": "HwControlLib",
"projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
"packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
"outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\",
"projectStyle": "PackageReference", "projectStyle": "PackageReference",
"fallbackFolders": [
"D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [ "configFilePaths": [
"C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
], ],
"originalTargetFrameworks": [ "originalTargetFrameworks": [
"net6.0-windows" "net6.0-windows"
], ],
"sources": { "sources": {
"https://api.nuget.org/v3/index.json": {}, "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://nuget.cnblogs.com/v3/index.json": {} "https://api.nuget.org/v3/index.json": {}
}, },
"frameworks": { "frameworks": {
"net6.0-windows7.0": { "net6.0-windows7.0": {
@ -63,7 +58,7 @@
"privateAssets": "none" "privateAssets": "none"
} }
}, },
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
} }
} }
} }

8
HwControlLib/obj/HwControlLib.csproj.nuget.g.props
Unescape Escape View File

@ -5,13 +5,11 @@
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool> <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile> <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot> <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders> <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\admin\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle> <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.5.0</NuGetToolVersion> <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\Lenovo\.nuget\packages\" /> <SourceRoot Include="C:\Users\admin\.nuget\packages\" />
<SourceRoot Include="D:\开发工具\Visual Studio 2019\Shared\NuGetPackages\" />
<SourceRoot Include="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\" />
</ItemGroup> </ItemGroup>
</Project> </Project>

25
HwControlLib/obj/project.assets.json
Unescape Escape View File

@ -8,34 +8,27 @@
"net6.0-windows7.0": [] "net6.0-windows7.0": []
}, },
"packageFolders": { "packageFolders": {
"C:\\Users\\Lenovo\\.nuget\\packages\\": {}, "C:\\Users\\admin\\.nuget\\packages\\": {}
"D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {},
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
}, },
"project": { "project": {
"version": "1.0.0", "version": "1.0.0",
"restore": { "restore": {
"projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
"projectName": "HwControlLib", "projectName": "HwControlLib",
"projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
"packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\", "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
"outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\", "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\",
"projectStyle": "PackageReference", "projectStyle": "PackageReference",
"fallbackFolders": [
"D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [ "configFilePaths": [
"C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
], ],
"originalTargetFrameworks": [ "originalTargetFrameworks": [
"net6.0-windows" "net6.0-windows"
], ],
"sources": { "sources": {
"https://api.nuget.org/v3/index.json": {}, "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://nuget.cnblogs.com/v3/index.json": {} "https://api.nuget.org/v3/index.json": {}
}, },
"frameworks": { "frameworks": {
"net6.0-windows7.0": { "net6.0-windows7.0": {
@ -71,7 +64,7 @@
"privateAssets": "none" "privateAssets": "none"
} }
}, },
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json" "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
} }
} }
} }

4
HwControlLib/obj/project.nuget.cache
Unescape Escape View File

@ -1,8 +1,8 @@
{ {
"version": 2, "version": 2,
"dgSpecHash": "ybnvfUshvvKIc46usGVB7kox/SCKkseLBijIGbMXdvJYCOdNE/0WN/DZO6u3XNrg5fccw9Qd0IkJ00WdmrPlEg==", "dgSpecHash": "vdyWe2SVons+Y6get5R5Z1bsudk/C2JG+/yY8r3PrvTCQlFwmP/yYc/iedeQUqhixJt2UKO0GhNSvd1iLTRIlw==",
"success": true, "success": true,
"projectFilePath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj", "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
"expectedPackageFiles": [], "expectedPackageFiles": [],
"logs": [] "logs": []
} }
Write Preview
Loading…
Cancel
Save