diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml
index c8b3d6e4..18dbe687 100644
--- a/Admin.Core.Api/Admin.Core.Model.xml
+++ b/Admin.Core.Api/Admin.Core.Model.xml
@@ -3236,6 +3236,11 @@
创建时间
+
+
+ bom设置
+
+
产品型号编码——主键产品型号
diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props
index 15920027..a5a55588 100644
--- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props
+++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props
@@ -5,20 +5,18 @@
NuGet
$(MSBuildThisFileDirectory)project.assets.json
$(UserProfile)\.nuget\packages\
- C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder
+ C:\Users\admin\.nuget\packages\
PackageReference
- 6.5.0
+ 6.7.0
-
-
-
+
- C:\Users\Lenovo\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0
+ C:\Users\admin\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0
\ No newline at end of file
diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig
index d1d06cea..601c80d9 100644
--- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig
@@ -9,9 +9,9 @@ build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
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.SupportLocalizedComponentNames =
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 =
diff --git a/Admin.Core.Api/obj/project.assets.json b/Admin.Core.Api/obj/project.assets.json
index abdbbbf7..0b70ebdd 100644
--- a/Admin.Core.Api/obj/project.assets.json
+++ b/Admin.Core.Api/obj/project.assets.json
@@ -7067,11 +7067,12 @@
]
},
"System.Collections.NonGeneric/4.3.0": {
- "sha512": "LE/oChpRvkSi3U25u0KnJcI44JeDZ1QJCyN4qFDx2uusEypdqR24w7lKYw21eYe5esuCBuc862wRmpF63Yy1KQ==",
+ "sha512": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==",
"type": "package",
"path": "system.collections.nongeneric/4.3.0",
"files": [
".nupkg.metadata",
+ ".signature.p7s",
"ThirdPartyNotices.txt",
"dotnet_library_license.txt",
"lib/MonoAndroid10/_._",
@@ -9804,11 +9805,12 @@
]
},
"System.Runtime.Serialization.Primitives/4.3.0": {
- "sha512": "2Z5t70a2SwMsfQDp9KOclaZNyQhfIga2gppq9lIUDM1A4ohTshn4JqT7ir8bvIhXgorWKYDAr6rPzEbi/nTGKg==",
+ "sha512": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==",
"type": "package",
"path": "system.runtime.serialization.primitives/4.3.0",
"files": [
".nupkg.metadata",
+ ".signature.p7s",
"ThirdPartyNotices.txt",
"dotnet_library_license.txt",
"lib/MonoAndroid10/_._",
@@ -11275,47 +11277,40 @@
]
},
"packageFolders": {
- "C:\\Users\\Lenovo\\.nuget\\packages\\": {},
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {},
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
+ "C:\\Users\\admin\\.nuget\\packages\\": {}
},
"project": {
"version": "1.0.0",
"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",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj"
+ "D:\\Project\\gitea\\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": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
+ "D:\\Project\\gitea\\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": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
+ "D:\\Project\\gitea\\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"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig
index 1fdeb046..2ffa7b25 100644
--- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
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\
diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
index 5decb385..34f11e1e 100644
--- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
@@ -1,3 +1,3 @@
is_global = true
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\
diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig
index 968ed779..2b7e2280 100644
--- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
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\
diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig
index 1e7c9f10..ba998751 100644
--- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
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\
diff --git a/Admin.Core.Model/Model_New/SmSyncModelSub.cs b/Admin.Core.Model/Model_New/SmSyncModelSub.cs
index 8f69cfb9..57b515f1 100644
--- a/Admin.Core.Model/Model_New/SmSyncModelSub.cs
+++ b/Admin.Core.Model/Model_New/SmSyncModelSub.cs
@@ -7,6 +7,9 @@ using System.Threading.Tasks;
namespace Admin.Core.Model
{
+ ///
+ /// bom设置
+ ///
[SugarTable("SM_SYNCMODELSUB", "AUCMA_SCADA")]
public class SmSyncModelSub
{
diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig
index 173f98e4..f17e3fdc 100644
--- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
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\
diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
index abc27d01..ce84cb9f 100644
--- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
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\
diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig
index 67886d71..41538400 100644
--- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
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\
diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig
index 9c6bffa2..19486c3e 100644
--- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
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\
diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig
index 48679c0e..d114eba8 100644
--- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
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\
diff --git a/Aucma.Core.HwPLc/Impl/MelsecPlc.cs b/Aucma.Core.HwPLc/Impl/MelsecPlc.cs
index 56d02cef..3ecc1b3e 100644
--- a/Aucma.Core.HwPLc/Impl/MelsecPlc.cs
+++ b/Aucma.Core.HwPLc/Impl/MelsecPlc.cs
@@ -81,7 +81,7 @@ namespace Aucma.Core.HwPLc
///
public bool Connect(string iP, int port)
{
- melsecMcNet.IpAddress = iP;//正式环境开启
+ //melsecMcNet.IpAddress = iP;//正式环境开启
melsecMcNet.Port = port;
// 如果网络不太理想，配置了两个端口，一个有问题，立即切换另一个的话，可以配置如下的代码
diff --git a/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj b/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj
index 0db7c9a2..012acd71 100644
--- a/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj
+++ b/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj
@@ -58,6 +58,9 @@
PreserveNewest
+
+ PreserveNewest
+
diff --git a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs
index 617bb78d..759aea7d 100644
--- a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs
+++ b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs
@@ -39,7 +39,7 @@ namespace Aucma.Core.PrintTo.ViewModels
PrintIsEnabled = "True";
WeakReferenceMessenger.Default.Register(this, Recive);
-
+ PrintAmount = 0;
LoadData();
}
@@ -200,7 +200,7 @@ namespace Aucma.Core.PrintTo.ViewModels
string product_name = SelectedCells.ProductName;
//string material_code = SelectedCells.MaterialCode;
//string material_name = SelectedCells.MaterialName;
- int standard_amount = SelectedCells.PlanAmount;
+ int standard_amount = PrintAmount;
string printName = SelectedCells.PrintName;
PrintIsEnabled = "False";
@@ -326,6 +326,19 @@ namespace Aucma.Core.PrintTo.ViewModels
}
#endregion
+ #region 打印数量
+ private int printAmount;
+ public int PrintAmount
+ {
+ get { return printAmount; }
+ set
+ {
+ printAmount = value;
+ SetProperty(ref printAmount, value);
+ }
+ }
+ #endregion
+
#region 常规打印按钮状态
private string _printIsEnabled;
public string PrintIsEnabled
diff --git a/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs b/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs
index aa239d2f..fc798eb9 100644
--- a/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs
+++ b/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs
@@ -270,7 +270,7 @@ namespace Aucma.Core.PrintTo.ViewModels
MessageBox.Show("无法查询打印条码数据", "系统提醒");
return;
}
- baseBomInfo= tmpList.FirstOrDefault(d=>d.MaterialType== "600");
+ baseBomInfo= tmpList.FirstOrDefault(d=>d.MaterialType== "400");
}
if (printType == 500)//内胆
{
diff --git a/Aucma.Core.PrintTo/Views/IndexPageView.xaml b/Aucma.Core.PrintTo/Views/IndexPageView.xaml
index d9bb08c6..dfd4695a 100644
--- a/Aucma.Core.PrintTo/Views/IndexPageView.xaml
+++ b/Aucma.Core.PrintTo/Views/IndexPageView.xaml
@@ -233,7 +233,7 @@
-
diff --git a/Aucma.Core.SheetMetal/Startup.cs b/Aucma.Core.SheetMetal/Startup.cs
index 081102f2..2388c44f 100644
--- a/Aucma.Core.SheetMetal/Startup.cs
+++ b/Aucma.Core.SheetMetal/Startup.cs
@@ -9,6 +9,7 @@ using Admin.Core.Repository;
using Admin.Core.Service;
using Admin.Core.Tasks;
using Aucma.Core.RunPlc;
+using Aucma.Core.ScannerGun;
using Aucma.Core.SheetMetalTasks;
using Autofac;
using Microsoft.AspNetCore.Builder;
@@ -67,6 +68,7 @@ namespace Aucma.Core.SheetMetal
//PLC
services.AddPlcSetup();
services.AddAucmaSheetMetalTaskSetup();
+ //services.AddScannerGunSetup();
//ֱ֧ȫ :֧ System.Text.Encoding.GetEncoding("GB2312") System.Text.Encoding.GetEncoding("GB18030")
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
}
@@ -87,7 +89,7 @@ namespace Aucma.Core.SheetMetal
///
///
///
- public void Configure(IApplicationBuilder app, IRunPlcService runPlcService, IAucamSheetMetalTaskService aucamSheetMetalTaskService )
+ public void Configure(IApplicationBuilder app, IRunPlcService runPlcService, IAucamSheetMetalTaskService aucamSheetMetalTaskService)
{
// ʹþ̬ļ
app.UseStaticFiles();
@@ -97,6 +99,7 @@ namespace Aucma.Core.SheetMetal
app.UsePlcMildd(runPlcService);
//Ŀм
app.UseAucamSheetMetalTaskMildds(aucamSheetMetalTaskService);
+ //app.UseScannerGunMildd(scannerGun);// IScannerGunService scannerGun,
}
#region ע
diff --git a/Aucma.Core.SheetMetal/ViewModels/BomMaintenancePageViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/BomMaintenancePageViewModel.cs
index abf1e6cd..00a83ead 100644
--- a/Aucma.Core.SheetMetal/ViewModels/BomMaintenancePageViewModel.cs
+++ b/Aucma.Core.SheetMetal/ViewModels/BomMaintenancePageViewModel.cs
@@ -35,6 +35,7 @@ namespace Aucma.Core.SheetMetal.ViewModels
public void OnLoadData()
{
var list = _smSyncModelServices.QueryAsync().Result;
+ if (list == null || list.Count() == 0) return;
foreach (var item in list)
{
SmSyncModelDataGrid.Add(item);
diff --git a/Aucma.Core.SheetMetal/appsettings.json b/Aucma.Core.SheetMetal/appsettings.json
index 5bea7fe8..5ed8b23b 100644
--- a/Aucma.Core.SheetMetal/appsettings.json
+++ b/Aucma.Core.SheetMetal/appsettings.json
@@ -109,6 +109,9 @@
"QuartzNetJob": {
"Enabled": false
},
+ "ScannerGun": {
+ "Enabled": true
+ },
"Plc": {
"Enabled": true
},
diff --git a/Aucma.Core.SheetMetalTasks/AucamSheetMetalTaskService.cs b/Aucma.Core.SheetMetalTasks/AucamSheetMetalTaskService.cs
index d305ff1c..c6a953dd 100644
--- a/Aucma.Core.SheetMetalTasks/AucamSheetMetalTaskService.cs
+++ b/Aucma.Core.SheetMetalTasks/AucamSheetMetalTaskService.cs
@@ -7,6 +7,7 @@ using Admin.Core.Model.ViewModels;
using System.Text;
using System.Timers;
using Aucma.Core.HwPLc;
+using log4net;
namespace Aucma.Core.SheetMetalTasks
{
@@ -15,6 +16,8 @@ namespace Aucma.Core.SheetMetalTasks
///
public class AucamSheetMetalTaskService : IAucamSheetMetalTaskService
{
+ private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(AucamSheetMetalTaskService));
+
#region 刷新创建计划
///
/// 刷新创建计划
@@ -140,34 +143,41 @@ namespace Aucma.Core.SheetMetalTasks
await Task.CompletedTask;
while (true)
{
- 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)
+ try
{
- 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 (planInfo == null) continue;
- if (planInfo.PlanType == 3 || planInfo.PlanType == 1)//如果为3或者为1 后板计划单独下发 以前板完成为主
+ if (planInfos.Count > 0)
{
- //获取设置的型号查询对应的型号，下发计划
+ 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
- {
- Console.WriteLine("未获取到需要下发的任务");
- }
+ Thread.Sleep(3000);
+ }
+ catch (Exception ex)
+ {
+ logHelper.Error(ex.Message);
}
- Thread.Sleep(3000);
}
}
diff --git a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs
index 57f88858..36288f46 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs
+++ b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs
@@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace {
/// GeneratedInternalTypeHelper
///
[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)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
index 54fddce2..a4db58d9 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = HwControlLib
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\HwControlLib\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\HwControlLib\
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache
index decde3af..a056af0d 100644
Binary files a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache and b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache differ
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
index eeabcb64..303b31a5 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
@@ -4,7 +4,7 @@
library
C#
.cs
-E:\桌面\AUCMA_SCADA\HwControlLib\obj\Debug\net6.0-windows\
+D:\Project\gitea\AUCMA\SCADA\HwControlLib\obj\Debug\net6.0-windows\
HwControlLib
none
false
@@ -13,7 +13,7 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP
1204305769
71208292394
-194-1617825143
+194-2067936865
Themes\Generic.xaml;
False
diff --git a/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json b/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json
index 7ff994f6..8d86e7ef 100644
--- a/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json
+++ b/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json
@@ -1,33 +1,28 @@
{
"format": 1,
"restore": {
- "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": {}
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj": {}
},
"projects": {
- "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
"projectName": "HwControlLib",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0-windows"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0-windows7.0": {
@@ -63,7 +58,7 @@
"privateAssets": "none"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/HwControlLib/obj/HwControlLib.csproj.nuget.g.props b/HwControlLib/obj/HwControlLib.csproj.nuget.g.props
index 7eb906eb..d4531802 100644
--- a/HwControlLib/obj/HwControlLib.csproj.nuget.g.props
+++ b/HwControlLib/obj/HwControlLib.csproj.nuget.g.props
@@ -5,13 +5,11 @@
NuGet
$(MSBuildThisFileDirectory)project.assets.json
$(UserProfile)\.nuget\packages\
- C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder
+ C:\Users\admin\.nuget\packages\
PackageReference
- 6.5.0
+ 6.7.0
-
-
-
+
\ No newline at end of file
diff --git a/HwControlLib/obj/project.assets.json b/HwControlLib/obj/project.assets.json
index 1558f2be..57c51ab1 100644
--- a/HwControlLib/obj/project.assets.json
+++ b/HwControlLib/obj/project.assets.json
@@ -8,34 +8,27 @@
"net6.0-windows7.0": []
},
"packageFolders": {
- "C:\\Users\\Lenovo\\.nuget\\packages\\": {},
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {},
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
+ "C:\\Users\\admin\\.nuget\\packages\\": {}
},
"project": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
"projectName": "HwControlLib",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0-windows"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0-windows7.0": {
@@ -71,7 +64,7 @@
"privateAssets": "none"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/HwControlLib/obj/project.nuget.cache b/HwControlLib/obj/project.nuget.cache
index 248dc48c..7ca2e0be 100644
--- a/HwControlLib/obj/project.nuget.cache
+++ b/HwControlLib/obj/project.nuget.cache
@@ -1,8 +1,8 @@
{
"version": 2,
- "dgSpecHash": "ybnvfUshvvKIc46usGVB7kox/SCKkseLBijIGbMXdvJYCOdNE/0WN/DZO6u3XNrg5fccw9Qd0IkJ00WdmrPlEg==",
+ "dgSpecHash": "vdyWe2SVons+Y6get5R5Z1bsudk/C2JG+/yY8r3PrvTCQlFwmP/yYc/iedeQUqhixJt2UKO0GhNSvd1iLTRIlw==",
"success": true,
- "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
+ "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
"expectedPackageFiles": [],
"logs": []
}
\ No newline at end of file