diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index a11a9b32..32a392f7 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -5741,6 +5741,126 @@ 部门名称 + + + 订单信息 + + + + + 主键标识 + + + + + 物料名称 + + + + + 销售订单编号 + + + + + 销售订单行号 + + + + + 物料编号 + + + + + 物料名称 + + + + + 物料组 + + + + + 订单计划数量 + + + + + 完成数量 + + + + + ORDER_TYPE + + + + + 工单状态 + + + + + 开始日期 + + + + + 结束日期 + + + + + 工厂编码 + + + + + 是否标识 + + + + + 是否标识 + + + + + 创建人 + + + + + 创建时间 + + + + + 更新人 + + + + + 更新时间 + + + + + 完成日期 + + + + + 是否已下达计划（0-是，1-否） + + + + + 产线 + + 条码绑定扫描类型统计 @@ -6021,6 +6141,11 @@ 产品编号 + + + 产线 + + 订单数量 diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs index 2aa8fa0f..e5fef057 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache index b3b30e6b..c14fa900 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache @@ -1 +1 @@ -3c08b2a6f95957043123cba0d01dcd1675663fc7 +b2f84f971a8aec41b0f1751c6b19215e6b58e1f53b994e31c5da935f50c71835 diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig index db881581..0bc87a2e 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Common +<<<<<<< HEAD build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Common\ +======= +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Common\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705 diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs index a952d577..4e3bb54c 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache index 257bfd4c..027ec7d0 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache @@ -1 +1 @@ -2af60005099f8dd0481f84ac0dfadb89cc4b6f1d +7a24981bbe7f00a048a23b0cc465b6cd8b5064dc08290337b159e8e3e2522340 diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig index 20ee5954..97bd1d0c 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.EventBus +<<<<<<< HEAD build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.EventBus\ +======= +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.EventBus\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705 diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs index 93109f44..124995b4 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache index 22c8e621..df136dad 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache @@ -1 +1 @@ -790ffd47e6e46a3c8a83558ad3550154a5c81377 +23345160aa3ad64d7eae99fcdecbf4a96ab18a2f1cdee410e0367b155cc3cbd3 diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig index 5879585b..1bbf452f 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Extensions +<<<<<<< HEAD build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Extensions\ +======= +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705 diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs index 7a3f49c3..22897c45 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88718f3b34f7734324ee7cf97223cb04de12229c")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache index 4390da2f..e61911a3 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache @@ -1 +1 @@ -7d60a94dd38c10522cbfe4a021ccb6e9c5da0354 +20767d7337a3656e5cd7e3434c747ce5e30a077ccc10b646dba8956b775fa268 diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig index 417dcd7b..d6daf09f 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig @@ -1,3 +1,9 @@ is_global = true build_property.RootNamespace = Admin.Core.FrameWork +<<<<<<< HEAD build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.FrameWork\ +======= +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.FrameWork\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705 diff --git a/Admin.Core.IRepository/IRepository_New/IBaseOrderInfoRepository.cs b/Admin.Core.IRepository/IRepository_New/IBaseOrderInfoRepository.cs index 8fd88196..ceba2d63 100644 --- a/Admin.Core.IRepository/IRepository_New/IBaseOrderInfoRepository.cs +++ b/Admin.Core.IRepository/IRepository_New/IBaseOrderInfoRepository.cs @@ -1,5 +1,6 @@ using Admin.Core.Model; using Admin.Core.Model.Model_New; +using Admin.Core.Model.ViewModels; using System.Collections.Generic; using System.Threading.Tasks; @@ -10,7 +11,7 @@ namespace Admin.Core.IRepository /// public interface IBaseOrderInfoRepository : IBaseRepository { - Task> GetOrderInfoData(); + Task> GetOrderInfoData(); Task UpdatePrintName(BaseOrderInfo printName); } } \ No newline at end of file diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs index d6ce58a3..32ac87be 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache index 7f17d033..417a3d52 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache @@ -1 +1 @@ -80bb097f76aa594dc58289065a284d1acbd8bdff +c803867dace4d1d3b8251fc18425f9ccac1d2b517c5bb9ff7c6c12cd96ed827b diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig index b3be67cc..cde574bd 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IRepository +<<<<<<< HEAD build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.IRepository\ +======= +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IRepository\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705 diff --git a/Admin.Core.IService/IService_New/IBaseOrderInfoServices.cs b/Admin.Core.IService/IService_New/IBaseOrderInfoServices.cs index b67c92ae..4b0be01c 100644 --- a/Admin.Core.IService/IService_New/IBaseOrderInfoServices.cs +++ b/Admin.Core.IService/IService_New/IBaseOrderInfoServices.cs @@ -12,7 +12,7 @@ namespace Admin.Core.IService public interface IBaseOrderInfoServices : IBaseServices { Task> QueryPrintInfo(); - Task> GetOrderInfoData(); + Task> GetOrderInfoData(); /// /// 更新打印名称 /// diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs index e0cda4ad..e87266da 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache index d5703477..ee90ae41 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache @@ -1 +1 @@ -51b8351ca3dc5fa8344fbf501d63c1eff37c8f9c +58bf56cbe45768ce96bb2e89a0bd5b66ec369ef5a5e9a38fc9482a549eb4cf84 diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig index b8fc4712..024e741c 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IService +<<<<<<< HEAD build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.IService\ +======= +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IService\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705 diff --git a/Admin.Core.Model/Model_New/BaseOrderInfo.cs b/Admin.Core.Model/Model_New/BaseOrderInfo.cs index bb48e364..c4f991ab 100644 --- a/Admin.Core.Model/Model_New/BaseOrderInfo.cs +++ b/Admin.Core.Model/Model_New/BaseOrderInfo.cs @@ -125,5 +125,6 @@ namespace Admin.Core.Model.Model_New /// [SugarColumn(ColumnName = "IS_RELEASE")] public int IsRelease { get; set; } + } } diff --git a/Admin.Core.Model/ViewModels/BaseOrderInfoView.cs b/Admin.Core.Model/ViewModels/BaseOrderInfoView.cs new file mode 100644 index 00000000..5c59730a --- /dev/null +++ b/Admin.Core.Model/ViewModels/BaseOrderInfoView.cs @@ -0,0 +1,136 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Admin.Core.Model.ViewModels +{ + /// + /// 订单信息 + /// + public class BaseOrderInfoView + + { + /// + /// 主键标识 + /// + [SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, IsIdentity = true)] + public int ObjId { get; set; } + + /// + /// 物料名称 + /// + [SugarColumn(ColumnName = "ORDER_CODE")] + public string OrderCode { get; set; } + /// + /// 销售订单编号 + /// + [SugarColumn(ColumnName = "SALEORDER_CODE")] + public string SaleOrderCode { get; set; } + /// + /// 销售订单行号 + /// + [SugarColumn(ColumnName = "SALEORDER_LINENUMBER")] + public string SaleOrderLineNumber { get; set; } + /// + /// 物料编号 + /// + [SugarColumn(ColumnName = "MATERIAL_CODE")] + public string MaterialCode { get; set; } + + /// + /// 物料名称 + /// + [SugarColumn(ColumnName = "MATERIAL_NAME")] + public string MaterialName { get; set; } + /// + /// 物料组 + /// + [SugarColumn(ColumnName = "MATKL")] + public string Matkl { get; set; } + /// + /// 订单计划数量 + /// + [SugarColumn(ColumnName = "ORDER_AMOUNT")] + public int OrderAmount { get; set; } + /// + /// 完成数量 + /// + [SugarColumn(ColumnName = "COMPLETE_AMOUNT")] + public int CompleteAmount { get; set; } + /// + /// ORDER_TYPE + /// + [SugarColumn(ColumnName = "ORDER_TYPE")] + public string OrderType { get; set; } + /// + /// 工单状态 + /// + [SugarColumn(ColumnName = "ORDER_STATUS")] + public string OrderStatus { get; set; } + /// + /// 开始日期 + /// + [SugarColumn(ColumnName = "BEGIN_DATE")] + public DateTime BeginDate { get; set; } + /// + /// 结束日期 + /// + [SugarColumn(ColumnName = "END_DATE")] + public DateTime EndDate { get; set; } + /// + /// 工厂编码 + /// + [SugarColumn(ColumnName = "FACTORY_CODE")] + public string FactoryCode { get; set; } + /// + /// 是否标识 + /// + [SugarColumn(ColumnName = "IS_FLAG")] + public int IsFlag { get; set; } + /// + /// 是否标识 + /// + [SugarColumn(ColumnName = "PRINT_NAME")] + public string PrintName { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "CREATED_BY")] + public string CreatedBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CREATED_TIME")] + public DateTime CreatedTime { get; set; } + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "UPDATED_BY")] + public string UpdatedBy { get; set; } + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "UPDATED_TIME")] + public DateTime UpdatedTime { get; set; } + /// + /// 完成日期 + /// + [SugarColumn(ColumnName = "COMPLETE_DATE")] + public DateTime CompleteDate { get; set; } + /// + /// 是否已下达计划（0-是，1-否） + /// + [SugarColumn(ColumnName = "IS_RELEASE")] + public int IsRelease { get; set; } + + /// + /// 产线 + /// + [SugarColumn(ColumnName = "PRODUCT_LINE_NAME")] + public string? ProductLineName { get; set; } + + } +} diff --git a/Admin.Core.Model/ViewModels/PrintPlanInfoView.cs b/Admin.Core.Model/ViewModels/PrintPlanInfoView.cs index 109c65f5..14463e2e 100644 --- a/Admin.Core.Model/ViewModels/PrintPlanInfoView.cs +++ b/Admin.Core.Model/ViewModels/PrintPlanInfoView.cs @@ -20,6 +20,10 @@ namespace Admin.Core.Model.ViewModels /// public string ProductCode { get; set; } /// + /// 产线 + /// + public string ProductLineName { get; set; } + /// /// 订单数量 /// public int PlanAmount { get; set; } = 0; diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs index 98e3cd85..2d38a83f 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache index 84a57232..d5254024 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache @@ -1 +1 @@ -ef9752cf3f9e33d53832c154eeba975830dced91 +04d7d258a0c848e13c57e6f11d5074c8c05ea076312a43198d3e633e96c246dd diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs index d49abd81..86dcdb61 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88718f3b34f7734324ee7cf97223cb04de12229c")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache index d77b8cba..03710f46 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache @@ -1 +1 @@ -0868e6bde5b49a65a126b91d794e990427a11761 +689391e9f973c5505f9f19ae7180cf35baa36d32cc9dacfb00d7905272e68934 diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig index 19085d53..70b741bc 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.RealTimeService +<<<<<<< HEAD build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.RealTimeService\ +======= +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.RealTimeService\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705 diff --git a/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs b/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs index b6ef4665..a3c79f3b 100644 --- a/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs @@ -3,6 +3,7 @@ using Admin.Core.Model.Model_New; using Admin.Core.IRepository; using System.Collections.Generic; using System.Threading.Tasks; +using Admin.Core.Model.ViewModels; namespace Admin.Core.Repository { @@ -15,10 +16,13 @@ namespace Admin.Core.Repository { } - public async Task> GetOrderInfoData() + public async Task> GetOrderInfoData() { - string sql = $"select DISTINCT o.* from (select r.* from BASE_ORDERINFO r left join BASE_MATERIALINFO m on r.MATERIAL_CODE=m.MATERIAL_CODE where MATERIAL_SUBCLASS='100') o left join BASE_BOMINFO b on o.MATERIAL_CODE=b.PARENT_ID "; - return await Db.CopyNew().Ado.SqlQueryAsync(sql); + string sql = @$" select DISTINCT o.* from ( + select r.* from (select r.*,BP.PRODUCT_LINE_NAME from BASE_ORDERINFO r LEFT JOIN BASE_PRODUCTLINE BP on r.WORK_CENTER_CODE = BP.WORK_CENTER_CODE) r + left join BASE_MATERIALINFO m on r.MATERIAL_CODE=m.MATERIAL_CODE where MATERIAL_SUBCLASS='100') o left join BASE_BOMINFO b on o.MATERIAL_CODE=b.PARENT_ID + "; + return await Db.CopyNew().Ado.SqlQueryAsync(sql); } public async Task UpdatePrintName(BaseOrderInfo printName) diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs index ec5c5695..b879e2b7 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache index ba9c706f..e1b47f0f 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache @@ -1 +1 @@ -046606c52f7e20e88e6dd5ffc01e33664c4b9ff8 +6a6c491428483a984c3cac5dbc6631dd8fcbb879161ffc8f18dc73bf799f5480 diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig index 139ebdab..753ec003 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Repository +<<<<<<< HEAD build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Repository\ +======= +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Repository\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705 diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs index 80f512b2..84e8c132 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache index 17b49c29..355487a9 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache @@ -1 +1 @@ -dbec6c73777a8ebf7006f00f1928199755951ac1 +307c0001af8d22e34d91f9cc5e84971f77f62d421a8484bf33fcb08db05b8f4f diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig index d169bb09..fc8368de 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Serilog.Es +<<<<<<< HEAD build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Serilog.Es\ +======= +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Serilog.Es\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705 diff --git a/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs index 946e7f94..aa425b9d 100644 --- a/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs +++ b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs @@ -46,7 +46,7 @@ namespace Admin.Core.Service } - public async Task> GetOrderInfoData() + public async Task> GetOrderInfoData() { return await _baseOrderInfoRepository.GetOrderInfoData(); } @@ -62,7 +62,7 @@ namespace Admin.Core.Service List list = new List(); List baseBomList = await _baseBomInfoRepository.QueryAsync(); List printBarCodeList = await _printBarCodeServices.QueryAsync(); - List orderList = await this.GetOrderInfoData(); + List orderList = await this.GetOrderInfoData(); List printOrderInfoList = await _printOrderInfoRepository.QueryAsync(); if (orderList == null) return null; @@ -78,6 +78,7 @@ namespace Admin.Core.Service var objLiner = printBarCodeList.Where(d => d.PrintBarType == 2&& d.OrderCode == bb.OrderCode); PrintPlanInfoView view = new PrintPlanInfoView(); + view.ProductLineName = bb.ProductLineName; view.OrderCode = bb.OrderCode; view.ProductCode = bb.MaterialCode; view.ProductName = bb.MaterialName; diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs index ec38a905..ebefdf91 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache index 5904500d..1373ec68 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache @@ -1 +1 @@ -ff8a17c10bdbb7dcf5bd28c26639be5ea4bbf542 +992334000343f42f9bcd6757f7806a0b91621ca8fa8a14503f6542813560320d diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig index ede2b67e..b56c947a 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Service +<<<<<<< HEAD build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Service\ +======= +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Service\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705 diff --git a/Admin.Core.Socket/TouchSocketService.cs b/Admin.Core.Socket/TouchSocketService.cs index 71c1b28c..71ca3426 100644 --- a/Admin.Core.Socket/TouchSocketService.cs +++ b/Admin.Core.Socket/TouchSocketService.cs @@ -67,8 +67,9 @@ namespace Admin.Core.Socket client.Logger.Info($"{client.IP}:{client.Port} 客户端正在连接..."); return EasyTask.CompletedTask; };//有客户端正在连接 - service.Connected = (client, e) => { client.Logger.Info($"{client.IP}:{client.Port} 客户端连接成功！目前客户端连接数{service.Count}"); - log.Info($"{client.IP}:{client.Port} 客户端连接成功！目前客户端连接数{service.Count}"); + service.Connected = (client, e) => { + client.Logger.Info($"{client.IP}:{client.Port} 客户端连接成功！目前客户端连接数{service.Count}"); + SetProdStoreClientId(client); return EasyTask.CompletedTask; @@ -89,38 +90,38 @@ namespace Admin.Core.Socket try { var mes = Encoding.UTF8.GetString(e.ByteBlock.Buffer, 0, e.ByteBlock.Len);//注意：数据长度是byteBlock.Len - log.Info("原始报文:"+mes); + //心跳包 - if (mes== "heartbeat") + if (mes.Contains("heartbeat")) { //扫码器心跳连接 client.Logger.Info($"已从{client.IP}:{client.Port}》接收到心跳信息：{mes}"); RefreshStateEvent?.Invoke(client.IP, true); + return EasyTask.CompletedTask; } - else if (mes == "NoRead") + else if (mes.Contains("NoRead")) { NoReadReceiveEvent?.Invoke(client.IP); client.Logger.Info($"未从{client.IP}:{client.Port}》接收到二维码信息{mes}"); + return EasyTask.CompletedTask; } else { - log.Info("条码报文:" + mes); ReceiveCodeDelegateEvent?.Invoke(client.IP,mes); client.Logger.Info($"已从{client.IP}:{client.Port}》接收到信息：{mes}"); } - - } catch (Exception ex) { client.Logger.Error($"异常：{ex.Message}"); + log.Error($"异常：{ex.Message}"); } return EasyTask.CompletedTask; }; - // service.Setup(new TouchSocketConfig()//载入配置 + //service.Setup(new TouchSocketConfig()//载入配置 //.SetListenIPHosts(new IPHost[] { new IPHost($"0.0.0.0:5000") }) //.ConfigureContainer(a =>//容器的配置顺序应该在最前面 //{ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs index 83f017e2..07b8a103 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache index a5578479..4bde67cd 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache @@ -1 +1 @@ -da4240456d30e56fa6c5e71babf5565adb3e1436 +f4f29f0272b6220f9b0b1162fe66def42667452c77b332a049c8625a879748e2 diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig index 8c04f09e..3e795e00 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Tasks +<<<<<<< HEAD build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Tasks\ +======= +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705 diff --git a/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs b/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs index b6657db3..7a3445fe 100644 --- a/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs +++ b/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs @@ -160,12 +160,11 @@ namespace Aucma.Core.BoxFoam.Business do { space = obj.plc.ReadInt16("DB200.438");//读取货道号，大约1.5s 可以获取 - Console.WriteLine($"物料入库货道：{space}"); } while (space==0); Console.WriteLine($"物料MES码：{materialBarCode}》入库货道：{space}"); logHelper.Info($"物料MES码：{materialBarCode}》入库货道：{space}"); - LogDelegateEvent?.Invoke($"物料MES码：{materialBarCode}》物料码：{materialCode}", "White"); + LogDelegateEvent?.Invoke($"物料MES码：{materialBarCode}》物料码：{materialCode}》入库货道：{space}", "White"); //更新货道入库 await EnterStore(materialBarCode, space); //更新过点数 diff --git a/Aucma.Core.BoxFoam/Views/IndexPageView.xaml b/Aucma.Core.BoxFoam/Views/IndexPageView.xaml index c8ddc9b6..bd9eca69 100644 --- a/Aucma.Core.BoxFoam/Views/IndexPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/IndexPageView.xaml @@ -221,7 +221,7 @@ - + diff --git a/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj b/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj index fe6ff038..774c5b33 100644 --- a/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj +++ b/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj @@ -28,7 +28,9 @@ - + + + diff --git a/Aucma.Core.PrintTo/Models/OrderInfo.cs b/Aucma.Core.PrintTo/Models/OrderInfo.cs index d884dd31..c97157f1 100644 --- a/Aucma.Core.PrintTo/Models/OrderInfo.cs +++ b/Aucma.Core.PrintTo/Models/OrderInfo.cs @@ -17,6 +17,10 @@ namespace Aucma.Core.PrintTo.Models /// public DateTime CreatedTime { get; set; } /// + /// 产线 + /// + public string ProductLineName { get; set; } + /// /// 工单编码 /// public string OrderCode { get; set; } diff --git a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs index c36560d4..578a7ffd 100644 --- a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs @@ -61,6 +61,7 @@ namespace Aucma.Core.PrintTo.ViewModels { OrderInfo order = new OrderInfo(); order.CreatedTime = item.CreateTime; + order.ProductLineName = item.ProductLineName; order.OrderCode = item.OrderCode; order.ProductCode = item.ProductCode; order.ProductName = item.ProductName; @@ -268,7 +269,7 @@ namespace Aucma.Core.PrintTo.ViewModels ///追打 /// [RelayCommand] - private void AppendPrintPrint(string obj) + private void AppendPrint(string obj) { if (string.IsNullOrEmpty(obj)) { diff --git a/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs b/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs index c8243c4b..28d7c9c4 100644 --- a/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs @@ -402,7 +402,7 @@ namespace Aucma.Core.PrintTo.ViewModels log.Error($"打印出错:{ex.Message}\n{printBarCode.ToJson()}"); ErrorNum++; } - Thread.Sleep(500); + Thread.Sleep(200); Progress = i; i++; } diff --git a/Aucma.Core.PrintTo/Views/IndexPageView.xaml b/Aucma.Core.PrintTo/Views/IndexPageView.xaml index 2d75ed70..f8917614 100644 --- a/Aucma.Core.PrintTo/Views/IndexPageView.xaml +++ b/Aucma.Core.PrintTo/Views/IndexPageView.xaml @@ -179,8 +179,9 @@ ItemsSource="{Binding Datalist}" ColumnWidth="*" AutoGenerateColumns="False" IsReadOnly="True" CanUserAddRows="False" SelectionMode="Single" SelectedItem="{Binding SelectedCells, Mode=OneWayToSource}"> - - + + + @@ -257,7 +258,7 @@ IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>