diff --git a/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 b/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 index 047738c9..e792210f 100644 Binary files a/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 and b/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/Admin.Core/FileContentIndex/00640bb7-01a9-4b77-959c-7e0fb7ffc104.vsidx b/.vs/Admin.Core/FileContentIndex/00640bb7-01a9-4b77-959c-7e0fb7ffc104.vsidx new file mode 100644 index 00000000..4b21bf6a Binary files /dev/null and b/.vs/Admin.Core/FileContentIndex/00640bb7-01a9-4b77-959c-7e0fb7ffc104.vsidx differ diff --git a/.vs/Admin.Core/FileContentIndex/56484ae0-bdd6-4249-a0a4-c2fbd710553a.vsidx b/.vs/Admin.Core/FileContentIndex/56484ae0-bdd6-4249-a0a4-c2fbd710553a.vsidx deleted file mode 100644 index 94a35106..00000000 Binary files a/.vs/Admin.Core/FileContentIndex/56484ae0-bdd6-4249-a0a4-c2fbd710553a.vsidx and /dev/null differ diff --git a/.vs/Admin.Core/FileContentIndex/6d36340a-3244-4c60-9960-43288a2d97ce.vsidx b/.vs/Admin.Core/FileContentIndex/6d36340a-3244-4c60-9960-43288a2d97ce.vsidx new file mode 100644 index 00000000..55098bd5 Binary files /dev/null and b/.vs/Admin.Core/FileContentIndex/6d36340a-3244-4c60-9960-43288a2d97ce.vsidx differ diff --git a/.vs/Admin.Core/FileContentIndex/93797082-907d-4d85-8091-906c85faf530.vsidx b/.vs/Admin.Core/FileContentIndex/93797082-907d-4d85-8091-906c85faf530.vsidx deleted file mode 100644 index 8397290e..00000000 Binary files a/.vs/Admin.Core/FileContentIndex/93797082-907d-4d85-8091-906c85faf530.vsidx and /dev/null differ diff --git a/.vs/Admin.Core/FileContentIndex/aaf2feb6-4045-4586-bbc6-263c1f1cab9a.vsidx b/.vs/Admin.Core/FileContentIndex/aaf2feb6-4045-4586-bbc6-263c1f1cab9a.vsidx deleted file mode 100644 index b861a6b3..00000000 Binary files a/.vs/Admin.Core/FileContentIndex/aaf2feb6-4045-4586-bbc6-263c1f1cab9a.vsidx and /dev/null differ diff --git a/.vs/Admin.Core/FileContentIndex/b57cd85f-c57b-4e7a-a1b0-15a6bb728d8e.vsidx b/.vs/Admin.Core/FileContentIndex/b57cd85f-c57b-4e7a-a1b0-15a6bb728d8e.vsidx new file mode 100644 index 00000000..99c4bf56 Binary files /dev/null and b/.vs/Admin.Core/FileContentIndex/b57cd85f-c57b-4e7a-a1b0-15a6bb728d8e.vsidx differ diff --git a/.vs/Admin.Core/FileContentIndex/e925a2cf-66f6-4ffb-8591-45e577d2e9ff.vsidx b/.vs/Admin.Core/FileContentIndex/e925a2cf-66f6-4ffb-8591-45e577d2e9ff.vsidx deleted file mode 100644 index e45a7338..00000000 Binary files a/.vs/Admin.Core/FileContentIndex/e925a2cf-66f6-4ffb-8591-45e577d2e9ff.vsidx and /dev/null differ diff --git a/.vs/Admin.Core/v17/.suo b/.vs/Admin.Core/v17/.suo index 5639a606..56609d85 100644 Binary files a/.vs/Admin.Core/v17/.suo and b/.vs/Admin.Core/v17/.suo differ diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 3ce86d1c..11961370 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -731,77 +731,87 @@ 异常标识:1-正常货道；2-异常货道 - + + + 计划执行表 + + + 主键标识 - + 执行计划编号 - + 生产计划编号 - + 工单编号 - + 物料编码 - + 物料名称 - + 产线/工位 - + 计划数量 - + 完成数量 - + 开始时间 - + 结束时间 - + 是否标识 - + 执行顺序 - + - 执行状态 + 执行方式:1-手动；2-自动 + + + + + 执行状态：1-待执行；2-执行中；3-完成 - + 创建时间 diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.dll index 113e032e..767cdeb9 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.dll and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.dll differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.pdb b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.pdb index 07887675..a9e0b4c4 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.pdb and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Extensions.pdb differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.dll index a4d3fe8e..f4def134 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.pdb index e91978f9..94d7712f 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.dll index f87a9ef5..02f347fa 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.dll and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.dll differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.pdb b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.pdb index 417e657e..1598c8c8 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.pdb and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.IService.pdb differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.dll index 9f9df4c9..ad5961b2 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.pdb index 735cd808..2cfbdc83 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.xml index 3ce86d1c..11961370 100644 --- a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.xml @@ -731,77 +731,87 @@ 异常标识:1-正常货道；2-异常货道 - + + + 计划执行表 + + + 主键标识 - + 执行计划编号 - + 生产计划编号 - + 工单编号 - + 物料编码 - + 物料名称 - + 产线/工位 - + 计划数量 - + 完成数量 - + 开始时间 - + 结束时间 - + 是否标识 - + 执行顺序 - + - 执行状态 + 执行方式:1-手动；2-自动 + + + + + 执行状态：1-待执行；2-执行中；3-完成 - + 创建时间 diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.dll index 4c7ab718..8786e080 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.dll and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.dll differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.pdb b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.pdb index 06ccbd4f..78bbfe86 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.pdb and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Repository.pdb differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.dll index d49e37f7..228fe9ba 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.dll and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.dll differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.pdb b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.pdb index 9258494b..514f5565 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.pdb and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Service.pdb differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.dll b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.dll index 5235a0b8..9911ea15 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.dll and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.dll differ diff --git a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.pdb b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.pdb index 6d1eb235..512eea37 100644 Binary files a/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.pdb and b/Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Tasks.pdb differ diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache index 11d363c5..a0b5efc7 100644 Binary files a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache and b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.dll b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.dll index 113e032e..767cdeb9 100644 Binary files a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.dll and b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.dll differ diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.pdb b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.pdb index 07887675..a9e0b4c4 100644 Binary files a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.pdb and b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.pdb differ diff --git a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.dll index a4d3fe8e..f4def134 100644 Binary files a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.pdb index e91978f9..94d7712f 100644 Binary files a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.dll index 9f9df4c9..ad5961b2 100644 Binary files a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.pdb index 735cd808..2cfbdc83 100644 Binary files a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.xml index 3ce86d1c..11961370 100644 --- a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.xml @@ -731,77 +731,87 @@ 异常标识:1-正常货道；2-异常货道 - + + + 计划执行表 + + + 主键标识 - + 执行计划编号 - + 生产计划编号 - + 工单编号 - + 物料编码 - + 物料名称 - + 产线/工位 - + 计划数量 - + 完成数量 - + 开始时间 - + 结束时间 - + 是否标识 - + 执行顺序 - + - 执行状态 + 执行方式:1-手动；2-自动 + + + + + 执行状态：1-待执行；2-执行中；3-完成 - + 创建时间 diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache index baabab1b..978108cd 100644 Binary files a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache and b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.CoreCompileInputs.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.CoreCompileInputs.cache index 7f81e18e..bf7793b1 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.CoreCompileInputs.cache +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -5d5075261e039d50060f331463293a4a10e3780e +49c4153fbc442621b4de025c434593434269fd50 diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.dll index a4d3fe8e..f4def134 100644 Binary files a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.pdb index e91978f9..94d7712f 100644 Binary files a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/ref/Admin.Core.IRepository.dll b/Admin.Core.IRepository/obj/Debug/net6.0/ref/Admin.Core.IRepository.dll index 9084fa5e..7420c4bb 100644 Binary files a/Admin.Core.IRepository/obj/Debug/net6.0/ref/Admin.Core.IRepository.dll and b/Admin.Core.IRepository/obj/Debug/net6.0/ref/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/refint/Admin.Core.IRepository.dll b/Admin.Core.IRepository/obj/Debug/net6.0/refint/Admin.Core.IRepository.dll index 9084fa5e..7420c4bb 100644 Binary files a/Admin.Core.IRepository/obj/Debug/net6.0/refint/Admin.Core.IRepository.dll and b/Admin.Core.IRepository/obj/Debug/net6.0/refint/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs b/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs index c3060ba0..25b15d4d 100644 --- a/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs +++ b/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs @@ -1,6 +1,5 @@ -using Admin.Core.IService; -using Admin.Core.Model; -using Admin.Core.Model.Model_New; +using Admin.Core.Model; +using System.Threading.Tasks; namespace Admin.Core.IService { @@ -9,5 +8,9 @@ namespace Admin.Core.IService /// public interface IExecutePlanInfoServices : IBaseServices { + Task PlanMoveUp(string id,string station); + Task PlanMoveDown(string id, string station); + Task ExecPlanDelete(string id); + Task PlanNextPass(ExecutePlanInfo sm); } } \ No newline at end of file diff --git a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.dll b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.dll index f87a9ef5..02f347fa 100644 Binary files a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.dll and b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.dll differ diff --git a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.pdb b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.pdb index 417e657e..1598c8c8 100644 Binary files a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.pdb and b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.pdb differ diff --git a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.dll index 9f9df4c9..ad5961b2 100644 Binary files a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.pdb index 735cd808..2cfbdc83 100644 Binary files a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.xml index 3ce86d1c..11961370 100644 --- a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.xml @@ -731,77 +731,87 @@ 异常标识:1-正常货道；2-异常货道 - + + + 计划执行表 + + + 主键标识 - + 执行计划编号 - + 生产计划编号 - + 工单编号 - + 物料编码 - + 物料名称 - + 产线/工位 - + 计划数量 - + 完成数量 - + 开始时间 - + 结束时间 - + 是否标识 - + 执行顺序 - + - 执行状态 + 执行方式:1-手动；2-自动 + + + + + 执行状态：1-待执行；2-执行中；3-完成 - + 创建时间 diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache index baabab1b..978108cd 100644 Binary files a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache and b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.CoreCompileInputs.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.CoreCompileInputs.cache index 3d508c92..e7ea4352 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.CoreCompileInputs.cache +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -99fe8e7d22eaae441e4ddb1a972ccd89d0bbee6a +c32d564fd4ea407644bba3b1f47518b2a7c7af0d diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.dll b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.dll index f87a9ef5..02f347fa 100644 Binary files a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.dll and b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.dll differ diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.pdb b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.pdb index 417e657e..1598c8c8 100644 Binary files a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.pdb and b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.pdb differ diff --git a/Admin.Core.IService/obj/Debug/net6.0/ref/Admin.Core.IService.dll b/Admin.Core.IService/obj/Debug/net6.0/ref/Admin.Core.IService.dll index d9b37f06..25423e44 100644 Binary files a/Admin.Core.IService/obj/Debug/net6.0/ref/Admin.Core.IService.dll and b/Admin.Core.IService/obj/Debug/net6.0/ref/Admin.Core.IService.dll differ diff --git a/Admin.Core.IService/obj/Debug/net6.0/refint/Admin.Core.IService.dll b/Admin.Core.IService/obj/Debug/net6.0/refint/Admin.Core.IService.dll index d9b37f06..25423e44 100644 Binary files a/Admin.Core.IService/obj/Debug/net6.0/refint/Admin.Core.IService.dll and b/Admin.Core.IService/obj/Debug/net6.0/refint/Admin.Core.IService.dll differ diff --git a/Admin.Core.Model/Model_New/ExecutePlanInfo.cs b/Admin.Core.Model/Model_New/ExecutePlanInfo.cs index a8cc1948..c935e310 100644 --- a/Admin.Core.Model/Model_New/ExecutePlanInfo.cs +++ b/Admin.Core.Model/Model_New/ExecutePlanInfo.cs @@ -65,7 +65,7 @@ namespace Admin.Core.Model /// 完成数量 /// [SugarColumn(ColumnName = "COMPLETE_AMOUNT")] - public int PompleteAmount { get; set; } + public int CompleteAmount { get; set; } /// /// 开始时间 @@ -90,9 +90,13 @@ namespace Admin.Core.Model /// [SugarColumn(ColumnName = "EXECUTE_ORDER")] public int ExecuteOrder { get; set; } - /// - /// 执行状态 + /// 执行方式:1-手动；2-自动 + /// + [SugarColumn(ColumnName = "EXECUTE_METHOD")] + public int ExecuteMethod { get; set; } + /// + /// 执行状态：1-待执行；2-执行中；3-完成 /// [SugarColumn(ColumnName = "EXECUTE_STATUS")] public int ExecuteStatus { get; set; } diff --git a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.dll index 9f9df4c9..ad5961b2 100644 Binary files a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.pdb index 735cd808..2cfbdc83 100644 Binary files a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.xml index 3ce86d1c..11961370 100644 --- a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.xml @@ -731,77 +731,87 @@ 异常标识:1-正常货道；2-异常货道 - + + + 计划执行表 + + + 主键标识 - + 执行计划编号 - + 生产计划编号 - + 工单编号 - + 物料编码 - + 物料名称 - + 产线/工位 - + 计划数量 - + 完成数量 - + 开始时间 - + 结束时间 - + 是否标识 - + 执行顺序 - + - 执行状态 + 执行方式:1-手动；2-自动 + + + + + 执行状态：1-待执行；2-执行中；3-完成 - + 创建时间 diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.dll index 9f9df4c9..ad5961b2 100644 Binary files a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.pdb index 735cd808..2cfbdc83 100644 Binary files a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Model/obj/Debug/net6.0/ref/Admin.Core.Model.dll b/Admin.Core.Model/obj/Debug/net6.0/ref/Admin.Core.Model.dll index c86057e0..550ce9f1 100644 Binary files a/Admin.Core.Model/obj/Debug/net6.0/ref/Admin.Core.Model.dll and b/Admin.Core.Model/obj/Debug/net6.0/ref/Admin.Core.Model.dll differ diff --git a/Admin.Core.Model/obj/Debug/net6.0/refint/Admin.Core.Model.dll b/Admin.Core.Model/obj/Debug/net6.0/refint/Admin.Core.Model.dll index c86057e0..550ce9f1 100644 Binary files a/Admin.Core.Model/obj/Debug/net6.0/refint/Admin.Core.Model.dll and b/Admin.Core.Model/obj/Debug/net6.0/refint/Admin.Core.Model.dll differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.dll index a4d3fe8e..f4def134 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.pdb index e91978f9..94d7712f 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.dll index 9f9df4c9..ad5961b2 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.pdb index 735cd808..2cfbdc83 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.xml index 3ce86d1c..11961370 100644 --- a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.xml @@ -731,77 +731,87 @@ 异常标识:1-正常货道；2-异常货道 - + + + 计划执行表 + + + 主键标识 - + 执行计划编号 - + 生产计划编号 - + 工单编号 - + 物料编码 - + 物料名称 - + 产线/工位 - + 计划数量 - + 完成数量 - + 开始时间 - + 结束时间 - + 是否标识 - + 执行顺序 - + - 执行状态 + 执行方式:1-手动；2-自动 + + + + + 执行状态：1-待执行；2-执行中；3-完成 - + 创建时间 diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.dll b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.dll index 4c7ab718..8786e080 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.dll and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.dll differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.pdb b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.pdb index 06ccbd4f..78bbfe86 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.pdb and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.pdb differ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache index be8ea4d4..98be5ce4 100644 Binary files a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache and b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.CoreCompileInputs.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.CoreCompileInputs.cache index a58f6285..68545681 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.CoreCompileInputs.cache +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -2210f4b85005c89d5bb30f2abe2073faf150f5c3 +a532edabb8a07ce6b888a9633add57bf3b39b11a diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.dll b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.dll index 4c7ab718..8786e080 100644 Binary files a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.dll and b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.dll differ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.pdb b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.pdb index 06ccbd4f..78bbfe86 100644 Binary files a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.pdb and b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.pdb differ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/ref/Admin.Core.Repository.dll b/Admin.Core.Repository/obj/Debug/net6.0/ref/Admin.Core.Repository.dll index e2d58159..346502ce 100644 Binary files a/Admin.Core.Repository/obj/Debug/net6.0/ref/Admin.Core.Repository.dll and b/Admin.Core.Repository/obj/Debug/net6.0/ref/Admin.Core.Repository.dll differ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/refint/Admin.Core.Repository.dll b/Admin.Core.Repository/obj/Debug/net6.0/refint/Admin.Core.Repository.dll index e2d58159..346502ce 100644 Binary files a/Admin.Core.Repository/obj/Debug/net6.0/refint/Admin.Core.Repository.dll and b/Admin.Core.Repository/obj/Debug/net6.0/refint/Admin.Core.Repository.dll differ diff --git a/Admin.Core.Service/Service_New/BaseBomInfoServices.cs b/Admin.Core.Service/Service_New/BaseBomInfoServices.cs index 48bb8b0b..f0c3fd18 100644 --- a/Admin.Core.Service/Service_New/BaseBomInfoServices.cs +++ b/Admin.Core.Service/Service_New/BaseBomInfoServices.cs @@ -1,4 +1,5 @@ using Admin.Core.IRepository; +using Admin.Core.IService; using Admin.Core.Model; using Admin.Core.Model.Model_New; diff --git a/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs index 8f11bd74..0b41bceb 100644 --- a/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs +++ b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs @@ -1,5 +1,6 @@ using Admin.Core.Common; using Admin.Core.IRepository; +using Admin.Core.IService; using Admin.Core.Model; using Admin.Core.Model.Model_New; using Admin.Core.Model.ViewModels; diff --git a/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs b/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs index 640f6cb6..dcf7c0e5 100644 --- a/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs +++ b/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs @@ -1,15 +1,134 @@ using Admin.Core.IRepository; +using Admin.Core.IService; using Admin.Core.Model; +using Admin.Core.Model.Model_New; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using System; namespace Admin.Core.Service { - public class ExecutePlanInfoServices : BaseServices, IExecutePlanInfoServices + public class ExecutePlanInfoServices : BaseServices, IExecutePlanInfoServices { - private readonly IBaseRepository _dal; - public ExecutePlanInfoServices(IBaseRepository dal) + private readonly IBaseRepository _dal; + private readonly IProductOrderInfoServices _productOrderInfoServices; + public ExecutePlanInfoServices(IBaseRepository dal, IProductOrderInfoServices productOrderInfoServices) { this._dal = dal; base.BaseDal = dal; + _productOrderInfoServices = productOrderInfoServices; } + + #region 计划删除 + /// + /// 计划删除 + /// + /// + /// + public async Task ExecPlanDelete(string id) + { + return await _dal.DeleteByIdAsync(id); + } + #endregion + + #region 执行计划下移 + /// + /// 执行计划下移 + /// + /// + /// + /// + public async Task PlanMoveDown(string id,string station) + { + List execPlans = new List(); + var list = await _dal.QueryAsync(d=>d.ProductLineCode.Equals(station)); + List planInfos = (list.OrderBy(d => d.ExecuteOrder)).ToList(); + if (planInfos == null) return false; + + ExecutePlanInfo planInfo = planInfos.FirstOrDefault(x => x.ObjId == int.Parse(id)); + int executeOrder = planInfo.ExecuteOrder; + int planIndex = planInfos.IndexOf(planInfo); + if (planIndex == 0 && planInfos.Count == 0) return false; + if ((planInfos.Count - 1) == planIndex) return false; + + var lastPlanInfo = planInfos[planIndex + 1]; + planInfo.ExecuteOrder = lastPlanInfo.ExecuteOrder; + lastPlanInfo.ExecuteOrder = executeOrder; + execPlans.Add(planInfo); + execPlans.Add(lastPlanInfo); + var result = await _dal.UpdateAsync(execPlans); + if (result) + return true; + else + return false; + + + } + #endregion + + #region 计划上移 + /// + /// 计划上移 + /// + /// + /// + /// + /// + public async Task PlanMoveUp(string id, string station) + { + List execPlans = new List(); + + var list = await _dal.QueryAsync(d => d.ProductLineCode.Equals(station)); + List planInfos = (list.OrderBy(d => d.ExecuteOrder)).ToList(); + + if (planInfos == null) return false; + + ExecutePlanInfo planInfo = planInfos.FirstOrDefault(x => x.ObjId == int.Parse(id)); + int executeOrder = planInfo.ExecuteOrder; + int planIndex = planInfos.IndexOf(planInfo); + + if (planIndex == 0) return false; + + var lastPlanInfo = planInfos[planIndex - 1]; + planInfo.ExecuteOrder = lastPlanInfo.ExecuteOrder; + lastPlanInfo.ExecuteOrder = executeOrder; + execPlans.Add(planInfo); + execPlans.Add(lastPlanInfo); + var result = await _dal.UpdateAsync(execPlans); + if (result) + return true; + else + return false; + } + + #endregion + + #region 计划下达 + /// + /// 计划下达 + /// + /// + /// + /// + /// + public async Task PlanNextPass(ExecutePlanInfo sm) + { + ExecutePlanInfo planInfo = null; + try + { + List planInfos = new List(); + if (sm != null) + { + //下传计划到PLC,同时更改计划状态 + } + } + catch (Exception ex) + { + + } + return planInfo; + } + #endregion } } \ No newline at end of file diff --git a/Admin.Core.Service/Service_New/MaterialCompletionServices.cs b/Admin.Core.Service/Service_New/MaterialCompletionServices.cs index d3dc22c5..03bbfa84 100644 --- a/Admin.Core.Service/Service_New/MaterialCompletionServices.cs +++ b/Admin.Core.Service/Service_New/MaterialCompletionServices.cs @@ -1,4 +1,5 @@ using Admin.Core.IRepository; +using Admin.Core.IService; using Admin.Core.Model.Model_New; namespace Admin.Core.Service diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.dll index a4d3fe8e..f4def134 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.pdb index e91978f9..94d7712f 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.dll b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.dll index f87a9ef5..02f347fa 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.dll and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.dll differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.pdb b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.pdb index 417e657e..1598c8c8 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.pdb and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.pdb differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.dll index 9f9df4c9..ad5961b2 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.pdb index 735cd808..2cfbdc83 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.xml index 3ce86d1c..11961370 100644 --- a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.xml @@ -731,77 +731,87 @@ 异常标识:1-正常货道；2-异常货道 - + + + 计划执行表 + + + 主键标识 - + 执行计划编号 - + 生产计划编号 - + 工单编号 - + 物料编码 - + 物料名称 - + 产线/工位 - + 计划数量 - + 完成数量 - + 开始时间 - + 结束时间 - + 是否标识 - + 执行顺序 - + - 执行状态 + 执行方式:1-手动；2-自动 + + + + + 执行状态：1-待执行；2-执行中；3-完成 - + 创建时间 diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.dll b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.dll index d49e37f7..228fe9ba 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.dll and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.dll differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.pdb b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.pdb index 9258494b..514f5565 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.pdb and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.pdb differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache index aa40dbd4..ecd63a1c 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache and b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.CoreCompileInputs.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.CoreCompileInputs.cache index 11b5ba00..1c8b1d4b 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.CoreCompileInputs.cache +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -0631c1564ee587dfcb251dd4648e690ad352ce3f +cb3c2b852b350203a41567cd2b6a2fceabefdf81 diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.dll b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.dll index d49e37f7..228fe9ba 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.dll and b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.dll differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.pdb b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.pdb index 9258494b..514f5565 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.pdb and b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.pdb differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/ref/Admin.Core.Service.dll b/Admin.Core.Service/obj/Debug/net6.0/ref/Admin.Core.Service.dll index 1e66c120..94637ce9 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/ref/Admin.Core.Service.dll and b/Admin.Core.Service/obj/Debug/net6.0/ref/Admin.Core.Service.dll differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/refint/Admin.Core.Service.dll b/Admin.Core.Service/obj/Debug/net6.0/refint/Admin.Core.Service.dll index 1e66c120..94637ce9 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/refint/Admin.Core.Service.dll and b/Admin.Core.Service/obj/Debug/net6.0/refint/Admin.Core.Service.dll differ diff --git a/Admin.Core.Tasks/QuartzNet/Jobs/Job_Admin_Quartz.cs b/Admin.Core.Tasks/QuartzNet/Jobs/Job_Admin_Quartz.cs index 044b72aa..ca279aa6 100644 --- a/Admin.Core.Tasks/QuartzNet/Jobs/Job_Admin_Quartz.cs +++ b/Admin.Core.Tasks/QuartzNet/Jobs/Job_Admin_Quartz.cs @@ -2,7 +2,6 @@ using Admin.Core.IService; using Admin.Core.IService.ISys; using Admin.Core.Service; -using Admin.Core.Service.Service_New; using Quartz; using System; using System.Threading.Tasks; diff --git a/Admin.Core.Tasks/QuartzNet/Jobs/Job_SheetMetalTask_Quartz.cs b/Admin.Core.Tasks/QuartzNet/Jobs/Job_SheetMetalTask_Quartz.cs index f4bee885..e8b8fe5a 100644 --- a/Admin.Core.Tasks/QuartzNet/Jobs/Job_SheetMetalTask_Quartz.cs +++ b/Admin.Core.Tasks/QuartzNet/Jobs/Job_SheetMetalTask_Quartz.cs @@ -16,7 +16,7 @@ namespace Admin.Core.Tasks public class Job_SheetMetalTask_Quartz : JobBase, IJob { #region 钣金任务 - public delegate void SmDelegate(List sm); + public delegate void SmDelegate(); public static event SmDelegate SmDelegateEvent; #endregion @@ -34,8 +34,7 @@ namespace Admin.Core.Tasks } public async Task Run(IJobExecutionContext context) { - var smList =await _smTaskExecutionServices.QueryAsync(); - SmDelegateEvent?.Invoke(smList); + SmDelegateEvent?.Invoke(); } } } diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.dll index a4d3fe8e..f4def134 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.pdb index e91978f9..94d7712f 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.dll b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.dll index f87a9ef5..02f347fa 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.dll and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.dll differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.pdb b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.pdb index 417e657e..1598c8c8 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.pdb and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.IService.pdb differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.dll index 9f9df4c9..ad5961b2 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.pdb index 735cd808..2cfbdc83 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.xml index 3ce86d1c..11961370 100644 --- a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.xml @@ -731,77 +731,87 @@ 异常标识:1-正常货道；2-异常货道 - + + + 计划执行表 + + + 主键标识 - + 执行计划编号 - + 生产计划编号 - + 工单编号 - + 物料编码 - + 物料名称 - + 产线/工位 - + 计划数量 - + 完成数量 - + 开始时间 - + 结束时间 - + 是否标识 - + 执行顺序 - + - 执行状态 + 执行方式:1-手动；2-自动 + + + + + 执行状态：1-待执行；2-执行中；3-完成 - + 创建时间 diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.dll b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.dll index d49e37f7..228fe9ba 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.dll and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.dll differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.pdb b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.pdb index 9258494b..514f5565 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.pdb and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Service.pdb differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.dll b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.dll index 5235a0b8..9911ea15 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.dll and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.dll differ diff --git a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.pdb b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.pdb index 6d1eb235..512eea37 100644 Binary files a/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.pdb and b/Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Tasks.pdb differ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache index fe48afe2..7cc5d49b 100644 Binary files a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache and b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.dll b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.dll index 5235a0b8..9911ea15 100644 Binary files a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.dll and b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.dll differ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.pdb b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.pdb index 6d1eb235..512eea37 100644 Binary files a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.pdb and b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.pdb differ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/ref/Admin.Core.Tasks.dll b/Admin.Core.Tasks/obj/Debug/net6.0/ref/Admin.Core.Tasks.dll index 062c21fd..5171dde6 100644 Binary files a/Admin.Core.Tasks/obj/Debug/net6.0/ref/Admin.Core.Tasks.dll and b/Admin.Core.Tasks/obj/Debug/net6.0/ref/Admin.Core.Tasks.dll differ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/refint/Admin.Core.Tasks.dll b/Admin.Core.Tasks/obj/Debug/net6.0/refint/Admin.Core.Tasks.dll index 062c21fd..5171dde6 100644 Binary files a/Admin.Core.Tasks/obj/Debug/net6.0/refint/Admin.Core.Tasks.dll and b/Admin.Core.Tasks/obj/Debug/net6.0/refint/Admin.Core.Tasks.dll differ diff --git a/Aucma.Core.PrintTo/Log/GlobalInfoLogs_20231019.log b/Aucma.Core.PrintTo/Log/GlobalInfoLogs_20231019.log index e69de29b..5f282702 100644 --- a/Aucma.Core.PrintTo/Log/GlobalInfoLogs_20231019.log +++ b/Aucma.Core.PrintTo/Log/GlobalInfoLogs_20231019.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Common.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Common.dll index 5ba5491b..08a54599 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Common.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Common.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Common.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Common.pdb index d1abcdae..5af1da1b 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Common.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Common.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.EventBus.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.EventBus.dll index dbdd2dcf..4a839c70 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.EventBus.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.EventBus.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.EventBus.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.EventBus.pdb index 1dc9aa2f..4911701f 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.EventBus.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.EventBus.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll index 82c3aceb..767cdeb9 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb index 580933d8..a9e0b4c4 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Extensions.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll index 6d9308cf..f4def134 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb index 94b7ba88..94d7712f 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IRepository.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.dll index 11083b23..02f347fa 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.pdb index 23290391..1598c8c8 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.IService.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.dll index b212c32f..ad5961b2 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.pdb index 52eb71a6..2cfbdc83 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.xml b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.xml index 3ce86d1c..11961370 100644 --- a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.xml +++ b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Model.xml @@ -731,77 +731,87 @@ 异常标识:1-正常货道；2-异常货道 - + + + 计划执行表 + + + 主键标识 - + 执行计划编号 - + 生产计划编号 - + 工单编号 - + 物料编码 - + 物料名称 - + 产线/工位 - + 计划数量 - + 完成数量 - + 开始时间 - + 结束时间 - + 是否标识 - + 执行顺序 - + - 执行状态 + 执行方式:1-手动；2-自动 + + + + + 执行状态：1-待执行；2-执行中；3-完成 - + 创建时间 diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.dll index f40d8e30..8786e080 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb index a90b6220..78bbfe86 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Repository.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Serilog.Es.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Serilog.Es.dll index 027a4c03..3c7b2874 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Serilog.Es.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Serilog.Es.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Serilog.Es.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Serilog.Es.pdb index 5e29bdb0..94e53f59 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Serilog.Es.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Serilog.Es.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.dll index 72872d4a..228fe9ba 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.pdb index 323377e9..514f5565 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Service.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll index 23b6907a..9911ea15 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb index c7ac58ff..512eea37 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Admin.Core.Tasks.pdb differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.dll b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.dll index fc78ec0a..f867a37e 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.dll and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.dll differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.exe b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.exe index aca79e18..e49af99a 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.exe and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.exe differ diff --git a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb index 414ded52..699174d2 100644 Binary files a/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb and b/Aucma.Core.PrintTo/bin/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.cs index a848c1c1..0cbee99d 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.cs @@ -48,7 +48,7 @@ namespace Admin.Core.Wpf { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -68,7 +68,7 @@ namespace Admin.Core.Wpf { /// [System.STAThreadAttribute()] [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public static void Main() { Admin.Core.Wpf.App app = new Admin.Core.Wpf.App(); app.InitializeComponent(); diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.i.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.i.cs index 02e3a588..0cbee99d 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.i.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.g.i.cs @@ -54,7 +54,7 @@ namespace Admin.Core.Wpf { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/app.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/app.xaml", System.UriKind.Relative); #line 1 "..\..\..\App.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache index 7ac69bb0..e49bf2ab 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.CoreCompileInputs.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.CoreCompileInputs.cache index 6de87d7c..09b56370 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.CoreCompileInputs.cache +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -4cf4b30fa2a2c01fd406563bf80b344f37383528 +64c9c4403c17dd275d58feac7d55e1c00ba3bd1c diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.FileListAbsolute.txt b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.FileListAbsolute.txt index 9931e023..8678fc68 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.FileListAbsolute.txt +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.FileListAbsolute.txt @@ -368,3 +368,188 @@ D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\refint\Au D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.pdb D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.genruntimeconfig.cache D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\ref\Aucma.Core.PrintTo.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\appsettings.json +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Log4net.config +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.PrintTo.exe +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.PrintTo.deps.json +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.PrintTo.runtimeconfig.json +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.PrintTo.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.PrintTo.pdb +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\AspNetCoreRateLimit.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Autofac.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Autofac.Extensions.DependencyInjection.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Autofac.Extras.DynamicProxy.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\AutoMapper.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\AutoMapper.Extensions.Microsoft.DependencyInjection.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Castle.Core.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\CommunityToolkit.Mvvm.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Consul.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Elasticsearch.Net.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\InitQ.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\log4net.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\MaterialDesignColors.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\MaterialDesignThemes.Wpf.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.AspNetCore.Authentication.JwtBearer.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Data.SqlClient.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Data.Sqlite.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Configuration.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Configuration.Abstractions.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Configuration.Binder.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Configuration.FileExtensions.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Configuration.Json.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.DependencyInjection.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.DependencyInjection.Abstractions.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.DependencyModel.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.FileProviders.Abstractions.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.FileProviders.Physical.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.FileSystemGlobbing.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Logging.Log4Net.AspNetCore.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Options.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Options.ConfigurationExtensions.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Primitives.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Identity.Client.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.IdentityModel.JsonWebTokens.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.IdentityModel.Logging.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.IdentityModel.Protocols.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.IdentityModel.Tokens.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.OpenApi.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Xaml.Behaviors.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\MiniProfiler.AspNetCore.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\MiniProfiler.AspNetCore.Mvc.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\MiniProfiler.Shared.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\MySqlConnector.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Newtonsoft.Json.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Npgsql.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\NPOI.OOXML.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\NPOI.OpenXml4Net.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\NPOI.OpenXmlFormats.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\NPOI.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Oracle.ManagedDataAccess.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Pipelines.Sockets.Unofficial.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Polly.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\BouncyCastle.Crypto.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Quartz.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\RabbitMQ.Client.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Scrutor.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.AspNetCore.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Extensions.Hosting.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Extensions.Logging.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Formatting.Compact.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Formatting.Elasticsearch.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Settings.Configuration.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Sinks.Console.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Sinks.Debug.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Sinks.Elasticsearch.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Sinks.File.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Sinks.PeriodicBatching.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\ICSharpCode.SharpZipLib.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\SQLitePCLRaw.batteries_v2.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\SQLitePCLRaw.core.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\SQLitePCLRaw.provider.e_sqlite3.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\SqlSugar.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\DmProvider.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Kdbndp.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\StackExchange.Redis.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Swashbuckle.AspNetCore.Filters.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Swashbuckle.AspNetCore.Filters.Abstractions.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Swashbuckle.AspNetCore.Swagger.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Swashbuckle.AspNetCore.SwaggerGen.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Swashbuckle.AspNetCore.SwaggerUI.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\System.Diagnostics.PerformanceCounter.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\System.DirectoryServices.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\System.DirectoryServices.Protocols.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\System.IdentityModel.Tokens.Jwt.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\System.Runtime.Caching.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\System.Text.Encodings.Web.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\System.Text.Json.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\UAParser.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\unix\lib\netcoreapp3.1\Microsoft.Data.SqlClient.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win\lib\netcoreapp3.1\Microsoft.Data.SqlClient.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-arm\native\Microsoft.Data.SqlClient.SNI.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-arm64\native\Microsoft.Data.SqlClient.SNI.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-x64\native\Microsoft.Data.SqlClient.SNI.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-x86\native\Microsoft.Data.SqlClient.SNI.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\alpine-arm\native\libe_sqlite3.so +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\alpine-arm64\native\libe_sqlite3.so +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\alpine-x64\native\libe_sqlite3.so +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\browser-wasm\nativeassets\net6.0\e_sqlite3.a +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-arm\native\libe_sqlite3.so +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-arm64\native\libe_sqlite3.so +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-armel\native\libe_sqlite3.so +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-mips64\native\libe_sqlite3.so +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-musl-arm\native\libe_sqlite3.so +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-musl-arm64\native\libe_sqlite3.so +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-musl-x64\native\libe_sqlite3.so +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-ppc64le\native\libe_sqlite3.so +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-s390x\native\libe_sqlite3.so +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-x64\native\libe_sqlite3.so +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-x86\native\libe_sqlite3.so +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\maccatalyst-arm64\native\libe_sqlite3.dylib +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\maccatalyst-x64\native\libe_sqlite3.dylib +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\osx-arm64\native\libe_sqlite3.dylib +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\osx-x64\native\libe_sqlite3.dylib +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-arm\native\e_sqlite3.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-arm64\native\e_sqlite3.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-x64\native\e_sqlite3.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-x86\native\e_sqlite3.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win\lib\net6.0\System.Diagnostics.PerformanceCounter.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win\lib\net6.0\System.DirectoryServices.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux\lib\net6.0\System.DirectoryServices.Protocols.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\osx\lib\net6.0\System.DirectoryServices.Protocols.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win\lib\net6.0\System.DirectoryServices.Protocols.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win\lib\netstandard2.0\System.Runtime.Caching.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\browser\lib\net6.0\System.Text.Encodings.Web.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Common.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.EventBus.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Extensions.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.IRepository.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.IService.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Model.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Repository.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Serilog.Es.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Service.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Tasks.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Extensions.pdb +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Common.pdb +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.EventBus.pdb +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.IRepository.pdb +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.IService.pdb +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Model.pdb +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Model.xml +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Repository.pdb +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Serilog.Es.pdb +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Service.pdb +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Tasks.pdb +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.csproj.AssemblyReference.cache +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Assets\Styles\DefaultStyles.baml +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\MainWindow.baml +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\ButtomPageView.g.cs +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\HomeWindowView.g.cs +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\IndexPage.g.cs +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\MainWindow.g.cs +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\PrintToDevView.g.cs +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\SupplementPrintPageView.g.cs +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\App.g.cs +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo_Content.g.cs +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo_MarkupCompile.cache +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo_MarkupCompile.lref +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\App.baml +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\ButtomPageView.baml +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\HomeWindowView.baml +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\IndexPage.baml +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\PrintToDevView.baml +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\SupplementPrintPageView.baml +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.g.resources +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.GeneratedMSBuildEditorConfig.editorconfig +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.AssemblyInfoInputs.cache +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.AssemblyInfo.cs +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.csproj.CoreCompileInputs.cache +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.csproj.CopyComplete +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\refint\Aucma.Core.PrintTo.dll +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.pdb +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.genruntimeconfig.cache +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\ref\Aucma.Core.PrintTo.dll diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.designer.runtimeconfig.json b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.designer.runtimeconfig.json index 0571605e..1152362e 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.designer.runtimeconfig.json +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.designer.runtimeconfig.json @@ -16,8 +16,8 @@ } ], "additionalProbingPaths": [ - "C:\\Users\\Robin\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\Robin\\.nuget\\packages" + "C:\\Users\\admin\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\admin\\.nuget\\packages" ], "configProperties": { "Microsoft.NETCore.DotNetHostPolicy.SetAppPaths": true diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.dll b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.dll index fc78ec0a..f867a37e 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.dll and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.dll differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.g.resources b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.g.resources index af91e880..7afad8da 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.g.resources and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.g.resources differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.genruntimeconfig.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.genruntimeconfig.cache index ce4b4575..7a7b002e 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.genruntimeconfig.cache +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.genruntimeconfig.cache @@ -1 +1 @@ -33fc824eceaf895bcad3912eebebe7fc27ab1c3f +6bddcc3f78cef5730201d91284bdfe155bf308ec diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb index 414ded52..699174d2 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.pdb differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_2cxy4w1k_wpftmp.AssemblyInfo.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_2cxy4w1k_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..09700e39 --- /dev/null +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_2cxy4w1k_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.PrintTo")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.PrintTo")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.PrintTo")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_2cxy4w1k_wpftmp.AssemblyInfoInputs.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_2cxy4w1k_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..c6c0011d --- /dev/null +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_2cxy4w1k_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +bd8498adce299fe4d9fba9a89012729f53a012bb diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_2cxy4w1k_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_2cxy4w1k_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..81b6740e --- /dev/null +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_2cxy4w1k_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,17 @@ +is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.PrintTo_2cxy4w1k_wpftmp +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_2cxy4w1k_wpftmp.assets.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_2cxy4w1k_wpftmp.assets.cache new file mode 100644 index 00000000..7026daeb Binary files /dev/null and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_2cxy4w1k_wpftmp.assets.cache differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_2cxy4w1k_wpftmp.csproj.BuildWithSkipAnalyzers b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_2cxy4w1k_wpftmp.csproj.BuildWithSkipAnalyzers new file mode 100644 index 00000000..e69de29b diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache index 2ffe2501..2df57cdf 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache @@ -4,16 +4,16 @@ winexe C# .cs -D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\ +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\ Aucma.Core.PrintTo none false TRACE;DEBUG;NET;NET6_0;NETCOREAPP -D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\App.xaml +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\App.xaml 7-1193702131 21064389523 20-584291401 -412-396031425 +4121453728964 Assets\Styles\DefaultStyles.xaml;Views\ButtomPageView.xaml;Views\HomeWindowView.xaml;Views\IndexPage.xaml;Views\MainWindow.xaml;Views\PrintToDevView.xaml;Views\SupplementPrintPageView.xaml; False diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref index 68a8d128..540539cb 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref @@ -1,8 +1,8 @@  -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\App.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\Views\ButtomPageView.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\Views\HomeWindowView.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\Views\IndexPage.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\Views\PrintToDevView.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\Views\SupplementPrintPageView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\App.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\ButtomPageView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\HomeWindowView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\IndexPage.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\PrintToDevView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\SupplementPrintPageView.xaml;; diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_s2aiescv_wpftmp.AssemblyInfo.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_s2aiescv_wpftmp.AssemblyInfo.cs new file mode 100644 index 00000000..09700e39 --- /dev/null +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_s2aiescv_wpftmp.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.PrintTo")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.PrintTo")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.PrintTo")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_s2aiescv_wpftmp.AssemblyInfoInputs.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_s2aiescv_wpftmp.AssemblyInfoInputs.cache new file mode 100644 index 00000000..c6c0011d --- /dev/null +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_s2aiescv_wpftmp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +bd8498adce299fe4d9fba9a89012729f53a012bb diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_s2aiescv_wpftmp.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_s2aiescv_wpftmp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..97404bff --- /dev/null +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_s2aiescv_wpftmp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,17 @@ +is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.PrintTo_s2aiescv_wpftmp +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_s2aiescv_wpftmp.assets.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_s2aiescv_wpftmp.assets.cache new file mode 100644 index 00000000..c9fcfd33 Binary files /dev/null and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_s2aiescv_wpftmp.assets.cache differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_s2aiescv_wpftmp.csproj.BuildWithSkipAnalyzers b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_s2aiescv_wpftmp.csproj.BuildWithSkipAnalyzers new file mode 100644 index 00000000..e69de29b diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.cs index 631b5481..e26e0dbb 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.cs @@ -96,7 +96,7 @@ namespace Admin.Core.Wpf.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -112,7 +112,7 @@ namespace Admin.Core.Wpf.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.i.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.i.cs index 4a6960fa..e26e0dbb 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.i.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.g.i.cs @@ -102,7 +102,7 @@ namespace Admin.Core.Wpf.Views { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/buttompageview.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/buttompageview.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\ButtomPageView.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.cs index 21eeba87..7bb8501b 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\HomeWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2385F866CB4EFED545C5F2DA7FE185822AEECD77" +#pragma checksum "..\..\..\..\Views\HomeWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CA7E88C30A0F19FE2CCB63E734A6F5CC81DF5406" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -51,7 +51,7 @@ namespace Admin.Core.Wpf.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -67,7 +67,7 @@ namespace Admin.Core.Wpf.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.i.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.i.cs index 21481c95..7bb8501b 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.i.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.g.i.cs @@ -57,7 +57,7 @@ namespace Admin.Core.Wpf.Views { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/homewindowview.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/homewindowview.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\HomeWindowView.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.cs index 61a9b67c..0d3ea251 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.cs @@ -123,7 +123,7 @@ namespace Admin.Core.Wpf.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -139,7 +139,7 @@ namespace Admin.Core.Wpf.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.i.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.i.cs index 70fcd6fc..0d3ea251 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.i.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.g.i.cs @@ -129,7 +129,7 @@ namespace Admin.Core.Wpf.Views { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/indexpage.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/indexpage.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\IndexPage.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.baml b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.baml index 877fedda..a9d89bb5 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.baml and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.baml differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.cs index 6a7c0428..226c5540 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D8A256CF883917A8B1B4089CB7A02D2E485F8835" +#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "518A7EE664441D092AFE3DF49A6FCE2B3834BCEF" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -90,7 +90,7 @@ namespace Admin.Core.Wpf.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -106,7 +106,7 @@ namespace Admin.Core.Wpf.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.i.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.i.cs index 25f037f6..226c5540 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.i.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/MainWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D8A256CF883917A8B1B4089CB7A02D2E485F8835" +#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "518A7EE664441D092AFE3DF49A6FCE2B3834BCEF" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -96,7 +96,7 @@ namespace Admin.Core.Wpf.Views { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/mainwindow.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/mainwindow.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\MainWindow.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.cs index f0a049c1..77268d4a 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.cs @@ -64,7 +64,7 @@ namespace Admin.Core.Wpf.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -80,7 +80,7 @@ namespace Admin.Core.Wpf.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.i.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.i.cs index 5734faeb..77268d4a 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.i.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.g.i.cs @@ -70,7 +70,7 @@ namespace Admin.Core.Wpf.Views { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/printtodevview.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/printtodevview.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\PrintToDevView.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.cs index 8937aadf..ff60db8e 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.cs @@ -107,7 +107,7 @@ namespace Admin.Core.Wpf.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -123,7 +123,7 @@ namespace Admin.Core.Wpf.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.i.cs b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.i.cs index 8b42399e..ff60db8e 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.i.cs +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.g.i.cs @@ -113,7 +113,7 @@ namespace Admin.Core.Wpf.Views { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/supplementprintpageview.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/supplementprintpageview.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\SupplementPrintPageView.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/apphost.exe b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/apphost.exe index aca79e18..e49af99a 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/apphost.exe and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/apphost.exe differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/ref/Aucma.Core.PrintTo.dll b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/ref/Aucma.Core.PrintTo.dll index 97f86522..ec9c936c 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/ref/Aucma.Core.PrintTo.dll and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/ref/Aucma.Core.PrintTo.dll differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/refint/Aucma.Core.PrintTo.dll b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/refint/Aucma.Core.PrintTo.dll index 97f86522..ec9c936c 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/refint/Aucma.Core.PrintTo.dll and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/refint/Aucma.Core.PrintTo.dll differ diff --git a/Aucma.Core.SheetMetal/Log/GlobalInfoLogs_20231019.log b/Aucma.Core.SheetMetal/Log/GlobalInfoLogs_20231019.log index e69de29b..5f282702 100644 --- a/Aucma.Core.SheetMetal/Log/GlobalInfoLogs_20231019.log +++ b/Aucma.Core.SheetMetal/Log/GlobalInfoLogs_20231019.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Aucma.Core.SheetMetal/Models/MaterialComplateInfoModel.cs b/Aucma.Core.SheetMetal/Models/MaterialComplateInfoModel.cs index 775b74df..8eb4ab4f 100644 --- a/Aucma.Core.SheetMetal/Models/MaterialComplateInfoModel.cs +++ b/Aucma.Core.SheetMetal/Models/MaterialComplateInfoModel.cs @@ -32,5 +32,13 @@ namespace Aucma.Core.SheetMetal.Models /// 完成数量 /// public int CompleteAmount { get; set; } + /// + /// + /// + public string BeginTime { get; set; } + /// + /// + /// + public string EndTime { get; set; } } } diff --git a/Aucma.Core.SheetMetal/Models/PlanMaintenanceModel.cs b/Aucma.Core.SheetMetal/Models/PlanMaintenanceModel.cs index 5bba497e..d3feda23 100644 --- a/Aucma.Core.SheetMetal/Models/PlanMaintenanceModel.cs +++ b/Aucma.Core.SheetMetal/Models/PlanMaintenanceModel.cs @@ -68,6 +68,10 @@ namespace Aucma.Core.SheetMetal.Models /// public int ResidueAmount { get; set; } /// + /// 剩余可拆分数量 + /// + public int SpliteResidueAmount { get; set; } + /// /// 开始日期 /// public DateTime StartDate { get; set; } diff --git a/Aucma.Core.SheetMetal/Models/TaskExecModel.cs b/Aucma.Core.SheetMetal/Models/TaskExecModel.cs index 28f21f13..c372b27f 100644 --- a/Aucma.Core.SheetMetal/Models/TaskExecModel.cs +++ b/Aucma.Core.SheetMetal/Models/TaskExecModel.cs @@ -39,7 +39,7 @@ namespace Aucma.Core.SheetMetal.Models /// /// 开始时间 /// - public DateTime BeginTime { get; set; } + public DateTime? BeginTime { get; set; } /// /// 开始时间 /// diff --git a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs index 7f6ed7f4..4c8b30cf 100644 --- a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs @@ -23,6 +23,7 @@ using Aucma.Core.SheetMetal.Common; using static SkiaSharp.HarfBuzz.SKShaper; using Admin.Core.Model.Model_New; using Admin.Core.Tasks; +using CommunityToolkit.Mvvm.Messaging; /* @@ -35,12 +36,13 @@ namespace Aucma.Core.SheetMetal.ViewModels { private readonly Random _r = new(); private PilotInfo[] _modelData; - protected readonly ISmTaskExecutionServices? _taskExecutionServices; - + protected readonly IExecutePlanInfoServices? _taskExecutionServices; + int k = 100; public IndexPageViewModel() { - _taskExecutionServices = App.ServiceProvider.GetService(); - + _taskExecutionServices = App.ServiceProvider.GetService(); + + PlanMaxNum = 100; StationName = "U壳/侧板钣金生产"; OrderCode = "8512365486"; PlanCode = "8659452123"; @@ -92,31 +94,45 @@ namespace Aucma.Core.SheetMetal.ViewModels LoadModel(); LoadData(); + + WeakReferenceMessenger.Default.Register(this, Recive); + + GaugeItem gi = new GaugeItem(PlanMaxNum, // the gauge value + series => // the series style + { + series.DataLabelsSize = 20; + series.MaxRadialColumnWidth = 20; + series.MaxRadialColumnWidth = 10; + series.DataLabelsSize = 12; + }); + + Plan_Num = GaugeGenerator.BuildSolidGauge(gi); } #region 计划列表 #region 加载DataGrid数据 - private async void LoadData(List list) - { - foreach (var item in list) - { - PlanInfoDataGrid.Add(new TaskExecModel() { ID = item.ObjId.ToString(), OrderCode = item.OrderCode, MaterialCode = item.MaterialCode, MaterialName = item.MaterialName, TaskAmount = item.TaskAmount, CompleteAmount = item.CompleteAmount, BeginTime = item.CreateTime, IsExec = item.IsExec }); - } - } private async void LoadData() { - var list= await _taskExecutionServices.QueryAsync(); - //var execList= list.OrderBy(d=>d.TaskSort); - foreach (var item in list) + var list= await _taskExecutionServices.QueryAsync(d=>d.ProductLineCode.Equals("1001")); + var execList= list.OrderBy(d=>d.ExecuteOrder); + foreach (var item in execList) { - PlanInfoDataGrid.Add(new TaskExecModel() { ID = item.ObjId.ToString(),OrderCode = item.OrderCode, MaterialCode = item.MaterialCode, MaterialName = item.MaterialName, TaskAmount = item.TaskAmount, CompleteAmount = item.CompleteAmount, BeginTime = item.CreateTime, IsExec = item.IsExec }); + PlanInfoDataGrid.Add(new TaskExecModel() { + ID = item.ObjId.ToString(), + OrderCode = item.OrderCode, + MaterialCode = item.MaterialCode, + MaterialName = item.MaterialName, + TaskAmount = item.PlanAmount, + CompleteAmount = item.CompleteAmount, + BeginTime = item.BeginTime, + IsExec = item.ExecuteStatus + }); } } #endregion - #region 向上 /// /// 向上 @@ -124,7 +140,8 @@ namespace Aucma.Core.SheetMetal.ViewModels [RelayCommand] private async Task MoveUp(string info) { - bool result= await _taskExecutionServices.PlanMoveUp(info); + string station = "1001"; + bool result = await _taskExecutionServices.PlanMoveUp(info, station); if (result) { PlanInfoDataGrid.Clear(); @@ -140,7 +157,8 @@ namespace Aucma.Core.SheetMetal.ViewModels [RelayCommand] private async Task MoveDown(string info) { - bool result=await _taskExecutionServices.PlanMoveDown(info); + string station = "1001"; + bool result = await _taskExecutionServices.PlanMoveDown(info, station); if (result) { PlanInfoDataGrid.Clear(); @@ -156,16 +174,21 @@ namespace Aucma.Core.SheetMetal.ViewModels [RelayCommand] private async Task DeletePlan(string info) { - bool result = await _taskExecutionServices.PlanDelete(info); - if (result) + MessageBoxResult msg = MessageBox.Show("确定要删除吗?", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No); + if (MessageBoxResult.Yes == msg) { - PlanInfoDataGrid.Clear(); - LoadData(); - MessageBox.Show("执行计划删除成功","系统信息"); - } - else - { - MessageBox.Show("执行计划删除失败", "系统信息"); + bool result = await _taskExecutionServices.ExecPlanDelete(info); + if (result) + { + PlanInfoDataGrid.Clear(); + LoadData(); + MessageBox.Show("执行计划删除成功", "系统信息"); + + } + else + { + MessageBox.Show("执行计划删除失败", "系统信息"); + } } } #endregion @@ -177,9 +200,12 @@ namespace Aucma.Core.SheetMetal.ViewModels [RelayCommand] private async Task NextPass(string info) { - var list = await _taskExecutionServices.QueryAsync(d=>d.ObjId==int.Parse(info)); - var model=list.FirstOrDefault(); - if (model.IsExec == 1) + MessageBoxResult msg = MessageBox.Show("确定要下发计划吗?", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No); + if (MessageBoxResult.Yes != msg) return; + + var list = await _taskExecutionServices.QueryAsync(d => d.ObjId == int.Parse(info)); + var model = list.FirstOrDefault(); + if (model.ExecuteStatus == 2) { MessageBox.Show("该计划正在执行中，请勿重复下传", "系统信息"); } @@ -224,7 +250,6 @@ namespace Aucma.Core.SheetMetal.ViewModels } #endregion - #endregion #region 执行计划 @@ -305,6 +330,16 @@ namespace Aucma.Core.SheetMetal.ViewModels SetProperty(ref _planNum, value); } } + private int _planMaxNum; + public int PlanMaxNum + { + get { return _planMaxNum; } + set + { + _planMaxNum = value; + SetProperty(ref _planMaxNum, value); + } + } #endregion #region 实际数量 @@ -347,17 +382,26 @@ namespace Aucma.Core.SheetMetal.ViewModels #endregion - public IEnumerable Plan_Num { get; set; } = - GaugeGenerator.BuildSolidGauge( - new GaugeItem( - 80, // the gauge value - series => // the series style - { - series.DataLabelsSize = 20; - series.MaxRadialColumnWidth = 20; - series.MaxRadialColumnWidth = 10; - series.DataLabelsSize = 12; - })); + public IEnumerable plan_Num; + public IEnumerable Plan_Num + { + get { return plan_Num; } + set + { + plan_Num = value; + SetProperty(ref plan_Num, value); + } + } + //GaugeGenerator.BuildSolidGauge( + // new GaugeItem( + // k, // the gauge value + // series => // the series style + // { + // series.DataLabelsSize = 20; + // series.MaxRadialColumnWidth = 20; + // series.MaxRadialColumnWidth = 10; + // series.DataLabelsSize = 12; + // })); #endregion #region 当日产量 @@ -460,5 +504,50 @@ namespace Aucma.Core.SheetMetal.ViewModels //} } #endregion + + #region 刷新列表-其他界面刷新该方法 + /// + /// 刷新列表 + /// + /// + /// + private void Recive(object recipient, object message) + { + PlanInfoDataGrid.Clear(); + LoadData(); + } + #endregion + + + #region 计划拆分执行 + /// + /// 计划拆分执行 + /// + [RelayCommand] + private void Test() + { + int option = 30; + option++; + System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => + { + + GaugeItem gi = new GaugeItem(option, // the gauge value + series => // the series style + { + series.DataLabelsSize = 20; + series.MaxRadialColumnWidth = 20; + series.MaxRadialColumnWidth = 10; + series.DataLabelsSize = 12; + }); + + Plan_Num = GaugeGenerator.BuildSolidGauge(gi); + })); + + } + #endregion + + + + } } diff --git a/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs index 9f0eee25..9094614a 100644 --- a/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/SplitPlanViewModel.cs @@ -17,6 +17,7 @@ using Admin.Core.Service; using Admin.Core.Model.Model_New; using Admin.Core.Common; using CommunityToolkit.Mvvm.Messaging; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel; namespace Aucma.Core.SheetMetal.ViewModels { @@ -24,31 +25,40 @@ namespace Aucma.Core.SheetMetal.ViewModels { private static readonly log4net.ILog log = LogManager.GetLogger(typeof(IndexPageViewModel)); protected readonly IProductPlanInfoServices? _productPlanInfoServices; - protected readonly ISmTaskExecutionServices? _smTaskExecutionServices; + //protected readonly ISmTaskExecutionServices? _smTaskExecutionServices; + protected readonly IExecutePlanInfoServices? _executePlanInfoServices; public SplitPlanViewModel() { _productPlanInfoServices = App.ServiceProvider.GetService(); - _smTaskExecutionServices = App.ServiceProvider.GetService(); + _executePlanInfoServices = App.ServiceProvider.GetService(); LoadData(); + //WeakReferenceMessenger.Default.Register; } #region 加载DataGrid数据 private async void LoadData() { int i = 1; - List list = await _productPlanInfoServices.QueryPlanInfo("1001"); - foreach (var item in list) + string station = "1001"; + var planlist = await _productPlanInfoServices.QueryAsync(d=>d.ProductLineCode.Equals(station)); + var execList = await _executePlanInfoServices.QueryAsync(d => d.ProductLineCode.Equals(station)); + foreach (var item in planlist) { + int residue = 0; + if (execList == null) residue = 0; + else residue = (execList.Where(d => d.MaterialCode.Equals(item.MaterialCode))).Sum(d => d.PlanAmount); MaterialDataGrid.Add(new PlanMaintenanceModel() { No = i, + PlanCode= item.PlanCode, MaterialCode = item.MaterialCode, MaterialName = item.MaterialName, OrderCode = item.OrderCode, PlanAmount = item.PlanAmount, - ResidueAmount = item.ResidueAmount, - StartDate = item.StartDate + ResidueAmount = item.PlanAmount - item.CompleteAmount, + SpliteResidueAmount = item.PlanAmount - residue, + StartDate = item.BeginTime }); i++; } @@ -56,19 +66,26 @@ namespace Aucma.Core.SheetMetal.ViewModels private async void LoadData(string obj) { int i = 1; - List list = await _productPlanInfoServices.QueryPlanInfo("1001"); - var queryList = list.Where(d=>d.OrderCode.Contains(obj)|| d.MaterialCode.Contains(obj) || d.MaterialName.Contains(obj)); + string station = "1001"; + var planlist = await _productPlanInfoServices.QueryAsync(d => d.ProductLineCode.Equals(station)); + var queryList = planlist.Where(d=>d.OrderCode.Contains(obj)|| d.MaterialCode.Contains(obj) || d.MaterialName.Contains(obj)); + var execList = await _executePlanInfoServices.QueryAsync(d => d.ProductLineCode.Equals(station)); foreach (var item in queryList) { + int residue = 0; + if (execList == null) residue = 0; + else residue = (execList.Where(d => d.MaterialCode.Equals(item.MaterialCode))).Sum(d => d.PlanAmount); MaterialDataGrid.Add(new PlanMaintenanceModel() { No = i, + PlanCode = item.PlanCode, MaterialCode = item.MaterialCode, MaterialName = item.MaterialName, OrderCode = item.OrderCode, PlanAmount = item.PlanAmount, - ResidueAmount = item.ResidueAmount, - StartDate = item.StartDate + ResidueAmount = item.PlanAmount - item.CompleteAmount, + SpliteResidueAmount = item.PlanAmount - residue, + StartDate = item.BeginTime }); i++; } @@ -121,46 +138,36 @@ namespace Aucma.Core.SheetMetal.ViewModels MessageBox.Show("请选中一行！", "系统提醒"); return; } - var list = await _smTaskExecutionServices.QueryAsync(); string plan_code = SelectedCells.PlanCode; string order_code = SelectedCells.OrderCode; string material_code = SelectedCells.MaterialCode; string material_name = SelectedCells.MaterialName; int plan_amount = SelectedCells.PlanAmount; - SmTaskExecution task=new SmTaskExecution(); - //task.PlanCode = plan_code; + var list = await _executePlanInfoServices.QueryAsync(d=>d.ProductLineCode.Equals("1001")); + ExecutePlanInfo task=new ExecutePlanInfo(); + task.ExecutePlanCode = Guid.NewGuid().ToString(); + task.ProductPlanCode = plan_code; task.OrderCode = order_code; task.MaterialCode = material_code; task.MaterialName = material_name; - task.TaskAmount = plan_amount; - task.CompleteAmount = 0; + task.ProductLineCode = "1001";//计划工位 if (list.Count == 0) - { - task.TaskSort = 1; - task.ObjId = 1; - } + task.ExecuteOrder = 1; if (list.Count != 0) - { - task.ObjId = list.Max(d => d.ObjId) + 1; - task.TaskSort = list.Max(d => d.TaskSort) + 1; - } - - task.CreateTime = DateTime.Now; - - var smList = await _smTaskExecutionServices.QueryAsync(d=>d.IsExec==1); - if (smList.Count > 0) - task.IsExec = 0; - else - task.IsExec = 1; - - var result = await _smTaskExecutionServices.AddAsync(task); - if (result==0) + task.ExecuteOrder = list.Max(d => d.ExecuteOrder) + 1; + + task.ExecuteMethod = 1;//不做要求，系统自动确定 + task.ExecuteStatus = 1; + task.PlanAmount = SelectedCells.SpliteResidueAmount; + task.CompleteAmount = 0; + task.CreatedTime = DateTime.Now; + var result = await _executePlanInfoServices.AddAsync(task); + if (result>0) { MessageBox.Show("计划拆分成功！","系统提醒"); + WeakReferenceMessenger.Default.Send("Refresh");//刷新窗口 CloseWindow(); - MaterialDataGrid.Clear(); - LoadData(); } else { diff --git a/Aucma.Core.SheetMetal/ViewModels/StatisticsPageViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/StatisticsPageViewModel.cs index 6f466d6f..b253faef 100644 --- a/Aucma.Core.SheetMetal/ViewModels/StatisticsPageViewModel.cs +++ b/Aucma.Core.SheetMetal/ViewModels/StatisticsPageViewModel.cs @@ -8,29 +8,38 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows; +using Admin.Core.IService; +using Admin.Core.Service; +using Microsoft.Extensions.DependencyInjection; namespace Aucma.Core.SheetMetal.ViewModels { public partial class StatisticsPageViewModel : ObservableObject { - public StatisticsPageViewModel() { LoadData(); } - List materialComplateInfos = new List(); + protected readonly IProductPlanInfoServices? _productPlanInfoServices; + public StatisticsPageViewModel() { + + _productPlanInfoServices = App.ServiceProvider.GetService(); + LoadData(); } + #region 加载DataGrid数据 - private void LoadData() + private async void LoadData() { - MaterialDataGrid.Add(new MaterialComplateInfo() { No = 1, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 50, CompleteAmount = 10 }); - MaterialDataGrid.Add(new MaterialComplateInfo() { No = 2, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 60, CompleteAmount = 40 }); - MaterialDataGrid.Add(new MaterialComplateInfo() { No = 3, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 50, CompleteAmount = 10 }); - MaterialDataGrid.Add(new MaterialComplateInfo() { No = 4, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 40, CompleteAmount = 10 }); - MaterialDataGrid.Add(new MaterialComplateInfo() { No = 5, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 30, CompleteAmount = 10 }); - MaterialDataGrid.Add(new MaterialComplateInfo() { No = 6, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 50, CompleteAmount = 20 }); - MaterialDataGrid.Add(new MaterialComplateInfo() { No = 7, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 10, CompleteAmount = 10 }); - MaterialDataGrid.Add(new MaterialComplateInfo() { No = 8, ProductPlanCode = "8659452123", MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 50, CompleteAmount = 10 }); - MaterialDataGrid.Add(new MaterialComplateInfo() { No = 9, ProductPlanCode = "8659452123", MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 80, CompleteAmount = 10 }); - MaterialDataGrid.Add(new MaterialComplateInfo() { No = 10, ProductPlanCode = "8659452123", MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 50, CompleteAmount = 10}); - + var list = (await _productPlanInfoServices.QueryAsync(d=>d.ProductLineCode=="1001")).Take(1000); + foreach (var item in list) + { + MaterialDataGrid.Add(new MaterialComplateInfo() { + ProductPlanCode = item.PlanCode, + MaterialCode = item.MaterialCode, + MaterialName = item.MaterialName, + PlanAmount = item.PlanAmount, + CompleteAmount = item.CompleteAmount, + BeginTime = item.BeginTime.ToString(), + EndTime = item.EndTime.ToString(), + }); + } } #endregion @@ -53,7 +62,7 @@ namespace Aucma.Core.SheetMetal.ViewModels /// 查询 /// [RelayCommand] - private void ExecQuery(object obj) + private async Task ExecQuery(object obj) { var result = (StatisticModel)obj; if (string.IsNullOrEmpty(result.BeginTime)) @@ -66,24 +75,34 @@ namespace Aucma.Core.SheetMetal.ViewModels MessageBox.Show("结束时间不能为空！"); return; } - var beginTime = result.BeginTime; - var endTime = result.EndTime; - - System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => + + //System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => + //{ + if (!string.IsNullOrEmpty(result.BeginTime)) { - if (!string.IsNullOrEmpty(beginTime)) - { - MaterialDataGrid.Clear(); - MaterialDataGrid.Add(new MaterialComplateInfo() { No = 1, ProductPlanCode = "8659452123", MaterialCode = "8659452123", MaterialName = "SC-AUCMA-可口可乐，SC", PlanAmount = 50, CompleteAmount = 10 }); - } - else + var beginTime =DateTime.Parse(result.BeginTime); + var endTime = DateTime.Parse(result.EndTime); + MaterialDataGrid.Clear(); + var list = await _productPlanInfoServices.QueryAsync(d => d.ProductLineCode == "1001"); + foreach (var item in list.Where(d=>d.BeginTime> beginTime&& d.EndTime < endTime)) { - MaterialDataGrid.Clear(); - LoadData(); + MaterialDataGrid.Add(new MaterialComplateInfo() + { + ProductPlanCode = item.PlanCode, + MaterialCode = item.MaterialCode, + MaterialName = item.MaterialName, + PlanAmount = item.PlanAmount, + CompleteAmount = item.CompleteAmount, + BeginTime = item.BeginTime.ToString(), + EndTime = item.EndTime.ToString(), + }); } - //Datalist.Insert(0, Datalist[Datalist.Count - 1]); - //Datalist.RemoveAt(Datalist.Count - 1); - })); + } + else + { + MaterialDataGrid.Clear(); + LoadData(); + } } #endregion } diff --git a/Aucma.Core.SheetMetal/Views/IndexPage.xaml b/Aucma.Core.SheetMetal/Views/IndexPage.xaml index 7c95024b..de23583b 100644 --- a/Aucma.Core.SheetMetal/Views/IndexPage.xaml +++ b/Aucma.Core.SheetMetal/Views/IndexPage.xaml @@ -17,6 +17,7 @@ + @@ -32,10 +33,10 @@ - + @@ -79,6 +80,7 @@ +