From 6a2914f353b30226bd3c46eef3e158fc962c6d2c Mon Sep 17 00:00:00 2001 From: "liulb@mesnac.com" Date: Mon, 25 Mar 2024 12:16:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=AE=B1=E4=BD=93?= =?UTF-8?q?=E5=8F=91=E6=B3=A1=EF=BC=8C=E6=8D=A2=E7=8F=AD=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E5=A4=B9=E5=85=B7=E4=BA=A7=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net6.0/Admin.Core.Common.AssemblyInfo.cs | 2 +- ...Admin.Core.Common.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.Extensions.AssemblyInfo.cs | 2 +- ...n.Core.Extensions.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.IRepository.AssemblyInfo.cs | 2 +- ....Core.IRepository.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.IService.AssemblyInfo.cs | 2 +- ...min.Core.IService.AssemblyInfoInputs.cache | 2 +- .../Model_New/MaterialCompletion.cs | 2 +- .../Model_New/ReportQualityInsPection.cs | 2 +- .../net6.0/Admin.Core.Model.AssemblyInfo.cs | 2 +- .../Admin.Core.Model.AssemblyInfoInputs.cache | 2 +- .../Admin.Core.Repository.AssemblyInfo.cs | 2 +- ...n.Core.Repository.AssemblyInfoInputs.cache | 2 +- .../net6.0/Admin.Core.Service.AssemblyInfo.cs | 2 +- ...dmin.Core.Service.AssemblyInfoInputs.cache | 2 +- .../net6.0/Admin.Core.Tasks.AssemblyInfo.cs | 2 +- .../Admin.Core.Tasks.AssemblyInfoInputs.cache | 2 +- .../Business/CollectionFoamLine.cs | 6 +-- .../Business/TeamSwitchBusiness.cs | 38 ++++++++++--------- .../AucamTemperatureMeasurementService.cs | 3 ++ 21 files changed, 43 insertions(+), 40 deletions(-) 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 b746d425..933a5bcc 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+403132f49e050644d1c67839de33f621806901e3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c53bc30072a3adeea1b0c21c91cb2d648f118f60")] [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 5be55100..423a57c4 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 @@ -0666c13a2b056db0ff994548270b1c3e0fa01dc56d8d10728543f8ff6eba22d0 +37bd2ff229b560659038609c60a65eaf79418032b62ff4b92113ec69c6a5960d 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 414d7c2f..43164c79 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+403132f49e050644d1c67839de33f621806901e3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c53bc30072a3adeea1b0c21c91cb2d648f118f60")] [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 66add48e..b1c9f004 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 @@ -1bd38aa1b3432a972991c5bf32a9f4cad2489cd86d27fe757f624d87e2606242 +b61f2f3e350ff49543683ff93e92534609858a2af46aa25badec7272acbe6855 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 2353a20f..e67ebfe9 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+403132f49e050644d1c67839de33f621806901e3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c53bc30072a3adeea1b0c21c91cb2d648f118f60")] [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 870af7c3..f06082bf 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 @@ -46c3e56653de77ded10b67f34e61c4fb16bf8b057ba9bcbe0b156d928f3c43d9 +62fed852eacf591790ff01b40eab06fc537da336e7476c4ee7497dcaefff7db6 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 5062a825..294fa29c 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+403132f49e050644d1c67839de33f621806901e3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c53bc30072a3adeea1b0c21c91cb2d648f118f60")] [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 3ae5b344..a4050c26 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 @@ -ad41c77e88702eca26b8703c593b8aad96d6a62d986d1c101722c17a52807b42 +995789d74271b8c3d23be86c14dce45c09267ea3bfd6164be4519e46ce7d91b8 diff --git a/Admin.Core.Model/Model_New/MaterialCompletion.cs b/Admin.Core.Model/Model_New/MaterialCompletion.cs index 12b24fed..ab5bb387 100644 --- a/Admin.Core.Model/Model_New/MaterialCompletion.cs +++ b/Admin.Core.Model/Model_New/MaterialCompletion.cs @@ -40,7 +40,7 @@ namespace Admin.Core.Model.Model_New /// /// 物料名称 /// - [SugarColumn(ColumnName = "MATERIAL_NAME")] + [SugarColumn(ColumnName = "MATERIAL_NAME",ColumnDataType = "NVARCHAR(128)")] public string MaterialName { get; set; } /// diff --git a/Admin.Core.Model/Model_New/ReportQualityInsPection.cs b/Admin.Core.Model/Model_New/ReportQualityInsPection.cs index a2aff8f6..7db11669 100644 --- a/Admin.Core.Model/Model_New/ReportQualityInsPection.cs +++ b/Admin.Core.Model/Model_New/ReportQualityInsPection.cs @@ -105,7 +105,7 @@ namespace Admin.Core.Model /// 更新时间 /// [SugarColumn(ColumnName = "UPDATED_TIME")] - public DateTime UpdatedTime { get; set; } + public DateTime? UpdatedTime { get; set; } /// /// 检测人工位编号 /// 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 02c8950c..0411ea5b 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+403132f49e050644d1c67839de33f621806901e3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c53bc30072a3adeea1b0c21c91cb2d648f118f60")] [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 69719e37..1f238001 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 @@ -6b97f419e02fba27cf774a027c90e9d121f6da2ba25b7b08423e2a5d50ab4785 +1b712b170964f1caaacc65c929d3c29729c899f231af7a3ba55583176cca2fd1 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 4d139d9e..347be560 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+403132f49e050644d1c67839de33f621806901e3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c53bc30072a3adeea1b0c21c91cb2d648f118f60")] [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 36d9f92a..51d4bd55 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 @@ -3cba0e0738d53c55c7c0486b9734628a4b826dd7428830736ac18bc28d89eb49 +efc561198173ae3698b722d3861fe5166dd13c55ff30f4dc9717b5666ce11451 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 25e65493..650115ab 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+403132f49e050644d1c67839de33f621806901e3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c53bc30072a3adeea1b0c21c91cb2d648f118f60")] [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 06ce1500..58bdc47e 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 @@ -d76a700e947edff06115523d74e4aa253d536ba875a250d7072603f80584837d +f0342ace3869b9b2dd7e45aa4bce15647b407e7e8b010c0c6fecba7b7985c65b 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 0b164c10..e72f4a94 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+403132f49e050644d1c67839de33f621806901e3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c53bc30072a3adeea1b0c21c91cb2d648f118f60")] [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 7cbbed9d..13bd3789 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 @@ -ca7ab395440ff8f1394a718d45211fc7468915a049deaf80561949200e6289e1 +884988e21b157fad7a1f8da431377752aad4da3380907ccff393770a33c9112b diff --git a/Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs b/Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs index 6d7fd17c..08577f2a 100644 --- a/Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs +++ b/Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs @@ -70,9 +70,7 @@ namespace Aucma.Core.BoxFoam.Business updateStoreAmount(spaceDetailModel); } - // InitData(spaceDetailModel); - //RefreshSpaceEvent?.Invoke(spaceDetailModel); - + //夹具箱型 List boxTypeList = ReadBoxType(plc1, plc2); List holderStatusList = ReadFixtureStatus(plc1, plc2); @@ -207,7 +205,7 @@ namespace Aucma.Core.BoxFoam.Business if (result != null) { short str1 = short.Parse(StringChange.bytesToHexStr(result.Skip(0).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber); - + fixtureStatuses.Add(new FixtureStatus() { ObjId = 1, diff --git a/Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs b/Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs index 18b74064..f948f783 100644 --- a/Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs +++ b/Aucma.Core.BoxFoam/Business/TeamSwitchBusiness.cs @@ -147,26 +147,28 @@ namespace Aucma.Core.BoxFoam.Business log.Warn($"{(shiftType == 1 ? "白班" : "夜班")}班组切换，开始处理切换逻辑"); try { + #region 240325 添加清空夹具产量功能 //下发PLC清空产量信号 #region 清空PLC产量，新线暂时未清除产量，如需清除可将注释取消 - //var obj1 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc1")); - //if (obj1 != null) - //{ - // if (obj1.plc.IsConnected) - // { - // var flag = obj1.plc.WriteInt16("M216", "1");//换班 数据清空 - // log.Warn($"班组切换清空A区产量数据：{(flag == true ? "成功" : "失败")}"); - // } - //} - //var obj2 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc2")); - //if (obj2 != null) - //{ - // if (obj2.plc.IsConnected) - // { - // bool flag = obj2.plc.WriteInt16("M216", "1");//换班 数据清空 - // log.Warn($"班组切换清空B区产量数据：{(flag == true ? "成功" : "失败")}"); - // } - //} + var obj1 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc")); + if (obj1 != null) + { + if (obj1.plc.IsConnected) + { + var flag = obj1.plc.WriteBool("M60", true);//换班 数据清空 + log.Warn($"班组切换清空1~6区产量数据：{(flag == true ? "成功" : "失败")}"); + } + } + var obj2 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("foamLine2Plc")); + if (obj2 != null) + { + if (obj2.plc.IsConnected) + { + bool flag = obj2.plc.WriteBool("M60", true);//换班 数据清空 + log.Warn($"班组切换清空7~12区产量数据：{(flag == true ? "成功" : "失败")}"); + } + } + #endregion //var obj3 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc3")); //if (obj3 != null) //{ diff --git a/Aucma.Core.TemperatureTask/AucamTemperatureMeasurementService.cs b/Aucma.Core.TemperatureTask/AucamTemperatureMeasurementService.cs index be919e5e..3a75ae2f 100644 --- a/Aucma.Core.TemperatureTask/AucamTemperatureMeasurementService.cs +++ b/Aucma.Core.TemperatureTask/AucamTemperatureMeasurementService.cs @@ -205,6 +205,7 @@ namespace Aucma.Core.TemperatureTask r.IsFlag = check.IsFlag; r.StationCode = check.StationCode; r.UpdatedTime = check.UpdateTime; + bool reportResult = _reportQualityInspectionServices.UpdateAsync(r).Result; if (reportResult) { @@ -223,10 +224,12 @@ namespace Aucma.Core.TemperatureTask if (check.TreatmentMeasure == "3") { report.FinishTime = null; + report.UpdatedTime = null; } else { report.FinishTime = check.FinishTime; + report.UpdatedTime = null; } report.BarCode = check.BarCode;