diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 3cd79122..315ec4a3 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -2721,6 +2721,41 @@ 匹配时间 + + + 异常记录表，暂时只有成品下线使用 + + + + + 主键 + + + + + 产品条码 + + + + + 异常信息 + + + + + 扫描时间 + + + + + 产线编号 + + + + + 异常类型（1=69码校验;2=重复扫描;3=未绑条码;4=未终检） + + 计划执行表 @@ -5711,6 +5746,126 @@ 部门名称 + + + 订单信息 + + + + + 主键标识 + + + + + 物料名称 + + + + + 销售订单编号 + + + + + 销售订单行号 + + + + + 物料编号 + + + + + 物料名称 + + + + + 物料组 + + + + + 订单计划数量 + + + + + 完成数量 + + + + + ORDER_TYPE + + + + + 工单状态 + + + + + 开始日期 + + + + + 结束日期 + + + + + 工厂编码 + + + + + 是否标识 + + + + + 是否标识 + + + + + 创建人 + + + + + 创建时间 + + + + + 更新人 + + + + + 更新时间 + + + + + 完成日期 + + + + + 是否已下达计划（0-是，1-否） + + + + + 产线 + + 条码绑定扫描类型统计 @@ -5991,6 +6146,11 @@ 产品编号 + + + 产线 + + 订单数量 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 e43b7078..db881581 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,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Common -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Common\ +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Common\ 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 987e6af9..20ee5954 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,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.EventBus -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.EventBus\ +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.EventBus\ 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 75d65c67..5879585b 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Extensions -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Extensions\ +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Extensions\ 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 a3871f56..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 -build_property.ProjectDir = E:\c#\AUCMA\new\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/IRepository_New/IExceptionRecordRepository.cs b/Admin.Core.IRepository/IRepository_New/IExceptionRecordRepository.cs new file mode 100644 index 00000000..006470d9 --- /dev/null +++ b/Admin.Core.IRepository/IRepository_New/IExceptionRecordRepository.cs @@ -0,0 +1,15 @@ +using Admin.Core.Model; +using Admin.Core.Model.Model_New; +using Admin.Core.Model.ViewModels; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace Admin.Core.IRepository +{ + /// + /// IDoorFoamRecordRepository + /// + public interface IExceptionRecordRepository : IBaseRepository + { + } +} \ No newline at end of file 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 7d227ef6..b3be67cc 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IRepository -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.IRepository\ +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.IRepository\ 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/IService_New/IExceptionRecordServices.cs b/Admin.Core.IService/IService_New/IExceptionRecordServices.cs new file mode 100644 index 00000000..22f69dca --- /dev/null +++ b/Admin.Core.IService/IService_New/IExceptionRecordServices.cs @@ -0,0 +1,17 @@ +using Admin.Core.IService; +using Admin.Core.Model; +using Admin.Core.Model.ViewModels; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace Admin.Core.IService +{ + /// + /// 条码绑定 + /// + public interface IExceptionRecordServices : IBaseServices + { + + + } +} \ No newline at end of file diff --git a/Admin.Core.IService/IService_New/IReportQualityInspectionServices.cs b/Admin.Core.IService/IService_New/IReportQualityInspectionServices.cs index 6fb3f53d..9a6e1aee 100644 --- a/Admin.Core.IService/IService_New/IReportQualityInspectionServices.cs +++ b/Admin.Core.IService/IService_New/IReportQualityInspectionServices.cs @@ -15,7 +15,7 @@ namespace Admin.Core.IService /// 判断是否有不合格质检项 /// /// - List JudgeIsQualified(string barCode); + ReportQualityInsPection JudgeIsQualified(string BoxCode); } } \ No newline at end of file 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 7ccb1e1e..b8fc4712 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IService -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.IService\ +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.IService\ diff --git a/Admin.Core.Model/Model_New/BaseMaterialInfo.cs b/Admin.Core.Model/Model_New/BaseMaterialInfo.cs index 935e9f82..a52c2549 100644 --- a/Admin.Core.Model/Model_New/BaseMaterialInfo.cs +++ b/Admin.Core.Model/Model_New/BaseMaterialInfo.cs @@ -99,7 +99,7 @@ namespace Admin.Core.Model /// 增量日期 /// [SugarColumn(ColumnName = "INCREMENT_DATE")] - public string IncrementDate { get; set; } + public DateTime IncrementDate { get; set; } /// /// 入库方向-A/B /// 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/Model_New/ExceptionRecord.cs b/Admin.Core.Model/Model_New/ExceptionRecord.cs new file mode 100644 index 00000000..4e077b05 --- /dev/null +++ b/Admin.Core.Model/Model_New/ExceptionRecord.cs @@ -0,0 +1,54 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Admin.Core.Model +{ + /// + /// 异常记录表，暂时只有成品下线使用 + /// + [SugarTable("RECORD_EXCEPTION", "AUCMA_SCADA")] + public class ExceptionRecord + { + /// + /// 主键 + /// + [SugarColumn(ColumnName = "OBJ_ID", IsIdentity = true, IsPrimaryKey = true, OracleSequenceName = "SEQ_RECORD_EXCEPTION")] + public int ObjId { get; set; } + + /// + /// 产品条码 + /// + [SugarColumn(ColumnName = "PRODUCT_SNCODE")] + public string ProductSnCode { get; set; } + + /// + /// 异常信息 + /// + [SugarColumn(ColumnName = "EXCEPTION_MSG")] + public string ExceptionMsg { get; set; } + + /// + /// 扫描时间 + /// + [SugarColumn(ColumnName = "PRODUCT_SCANTIME")] + public DateTime ProductScanTime { get; set; } + + /// + /// 产线编号 + /// + [SugarColumn(ColumnName = "PRODUCT_LINE_CODE")] + public string ProductLineCode { get; set; } + + /// + /// 异常类型（1=69码校验;2=重复扫描;3=未绑条码;4=未终检） + /// + [SugarColumn(ColumnName = "EXCEPTION_TYPE")] + public int ExceptionType { 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.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig index 0b5bdcb9..2cf38129 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Model -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Model\ +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Model\ 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 6a8a8ca9..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 -build_property.ProjectDir = E:\c#\AUCMA\new\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/Repository_New/ExceptionRecordRepository.cs b/Admin.Core.Repository/Repository_New/ExceptionRecordRepository.cs new file mode 100644 index 00000000..ecf1b370 --- /dev/null +++ b/Admin.Core.Repository/Repository_New/ExceptionRecordRepository.cs @@ -0,0 +1,22 @@ +using Admin.Core.IRepository; +using Admin.Core.Model; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Admin.Core.Repository +{ + public class ExceptionRecordRepository : BaseRepository, IExceptionRecordRepository + { + public ExceptionRecordRepository(IUnitOfWork unitOfWork) : base(unitOfWork) + { + } + + + + } +} 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 567ae76f..139ebdab 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Repository -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Repository\ +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Repository\ 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 a8331c60..d169bb09 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,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Serilog.Es -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Serilog.Es\ +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Serilog.Es\ 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/Service_New/ExceptionRecordServices.cs b/Admin.Core.Service/Service_New/ExceptionRecordServices.cs new file mode 100644 index 00000000..3f784c2f --- /dev/null +++ b/Admin.Core.Service/Service_New/ExceptionRecordServices.cs @@ -0,0 +1,35 @@ +using Admin.Core.IRepository; +using Admin.Core.IService; +using Admin.Core.Model; +using Admin.Core.Model.Model_New; +using Admin.Core.Model.ViewModels; +using Consul; +using log4net; +using Microsoft.IdentityModel.Logging; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Admin.Core.Service +{ + public class ExceptionRecordServices : BaseServices, IExceptionRecordServices + { + #region 对象引用 + private static readonly log4net.ILog log = LogManager.GetLogger(typeof(ExceptionRecordServices)); + #endregion + + private readonly IBaseRepository _dal; + private IExceptionRecordRepository _exceptionRecordRepository; + public ExceptionRecordServices(IBaseRepository dal, IExceptionRecordRepository exceptionRecordRepository) + { + this._dal = dal; + base.BaseDal = dal; + _exceptionRecordRepository = exceptionRecordRepository; + + } + + + } +} diff --git a/Admin.Core.Service/Service_New/ReportQualityInspectionServices.cs b/Admin.Core.Service/Service_New/ReportQualityInspectionServices.cs index d1f14dd2..45e60169 100644 --- a/Admin.Core.Service/Service_New/ReportQualityInspectionServices.cs +++ b/Admin.Core.Service/Service_New/ReportQualityInspectionServices.cs @@ -15,11 +15,11 @@ namespace Admin.Core.Service public class ReportQualityInspectionServices : BaseServices, IReportQualityInspectionServices { private readonly IBaseRepository _dal; - private readonly IReportQualityInspectionRepository _baseSpaceInfoRepository; + private readonly IReportQualityInspectionRepository _qualityInspectionRepository; private readonly ICodeBindingRecordRepository _codeBindingRecordRepository; public ReportQualityInspectionServices(IBaseRepository dal, IReportQualityInspectionRepository reportQualityInspectionRepository, ICodeBindingRecordRepository codeBindingRepository) { - _baseSpaceInfoRepository = reportQualityInspectionRepository; + _qualityInspectionRepository = reportQualityInspectionRepository; _codeBindingRecordRepository = codeBindingRepository; this._dal = dal; base.BaseDal = dal; @@ -27,21 +27,15 @@ namespace Admin.Core.Service /// - /// 判断是否有不合格质检项,传入的是SN码 + /// 判断是否有不合格质检项,传入的是箱体码 /// /// - public List JudgeIsQualified(string SnCode) + public ReportQualityInsPection JudgeIsQualified(string BoxCode) { try { - List list = _codeBindingRecordRepository.Query(s => s.ProductCode == SnCode); - if(list!=null && list.Count > 0) - { - string boxCode = list.FirstOrDefault().BoxCode; - var list1 = _baseSpaceInfoRepository.Query(x => x.BarCode.Equals(boxCode) && x.IsFlag != 1); - return list1; - } - + ReportQualityInsPection record = _qualityInspectionRepository.Db.Ado.SqlQuery($"select * from REPORT_QUALITY_INSPECTION where BAR_CODE = '{BoxCode}' AND STATION_CODE = 2010 AND TREATMENT_MEASURE = 3").FirstOrDefault(); + return record; } catch (System.Exception ex) { 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 ade53e61..ede2b67e 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Service -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Service\ +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Service\ 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.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig index aa57dd8c..8c04f09e 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Tasks -build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Tasks\ +build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Tasks\ 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.Palletiz/Business/InstoreBusiness.cs b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs index 21bb48c6..f879839e 100644 --- a/Aucma.Core.Palletiz/Business/InstoreBusiness.cs +++ b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs @@ -102,7 +102,7 @@ namespace Aucma.Core.Palletiz.Business if (asciiStr.Contains("heartbeat")) { - _logger.Info($"收到客户端:{client.Id};心跳指令：{asciiStr}"); + // _logger.Info($"收到客户端:{client.Id};心跳指令：{asciiStr}"); continue; } @@ -112,7 +112,7 @@ namespace Aucma.Core.Palletiz.Business continue; } - _logger.Info($"收到客户端:{client.Id}条码信息：{asciiStr}"); + // _logger.Info($"收到客户端:{client.Id}条码信息：{asciiStr}"); InStore(client.Id, asciiStr); } while (false); } diff --git a/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs b/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs index e56f017c..1e746e43 100644 --- a/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs @@ -116,11 +116,20 @@ namespace Aucma.Core.Palletiz.ViewModels [RelayCommand] private async Task ExecQuery(object obj) { + List list = null; await Task.Run(() => { string result = (string)obj; - List list = _recordInstoreServices.QueryAsync(x => (x.StoreCode == storeCodeA || x.StoreCode == storeCodeB) && x.BarCodeCode.Contains(result)).Result; + if(string.IsNullOrEmpty(result)) + { + list = _recordInstoreServices.QueryAsync(x => (x.StoreCode == storeCodeA || x.StoreCode == storeCodeB) && x.InStoreTime >= DateTime.Today).Result; + } + else + { + list = _recordInstoreServices.QueryAsync(x => (x.StoreCode == storeCodeA || x.StoreCode == storeCodeB) && x.BarCodeCode.Contains(result)).Result; + + } if (list != null && list.Count > 0) { App.Current.Dispatcher.Invoke(() => 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}}"/>