diff --git a/Sln.Iot.Business/RFID01Business.cs b/Sln.Iot.Business/RFID01Business.cs index b453d11..4454efb 100644 --- a/Sln.Iot.Business/RFID01Business.cs +++ b/Sln.Iot.Business/RFID01Business.cs @@ -68,7 +68,7 @@ namespace Sln.Iot.Business //转换托盘码 string traycode = Encoding.ASCII.GetString(trayBytesResult.Content); traycode = traycode.Replace("\0", ""); - _log.Info("RFID01" + traycode); + _log.Info($"RFID01 [{traycode}]"); byte[] prodBytes = pordBytesResult.Content; string[] prodcode = new string[6]; //分割转换产品码 @@ -81,7 +81,7 @@ namespace Sln.Iot.Business //connect1.SendValidateUnitsRequest("", traycode, prodcode); //生成work唯一guid(tid) - Guid tid = new Guid(); + Guid tid = Guid.NewGuid(); //sql更新 bool res = trayBindingService.TrayBindingRefresh(tid, traycode, prodcode); if (!res) diff --git a/Sln.Iot.Business/RFID02Business.cs b/Sln.Iot.Business/RFID02Business.cs index 3d7e42f..ae773bd 100644 --- a/Sln.Iot.Business/RFID02Business.cs +++ b/Sln.Iot.Business/RFID02Business.cs @@ -66,14 +66,17 @@ namespace Sln.Iot.Business //转换托盘码 string traycode = Encoding.ASCII.GetString(trayBytesResult.Content); traycode = traycode.Replace("\0", ""); - _log.Info("RFID02" + traycode); + _log.Info($"RFID02 [{traycode}]"); //sql更新 - //待开发 记录数据 //取出work唯一guid(tid) string stid = trayBindingService.TidGet(traycode); - Guid.TryParse(stid, out Guid tid); + if(!Guid.TryParse(stid, out Guid tid)) + { + tid = Guid.Parse("11111111-1111-4111-9111-111111111111"); + _log.Error("找不到对应的托盘信息,赋值默认GUID"); + } bool res = false; if (!res) diff --git a/Sln.Iot.Business/RFID03Business.cs b/Sln.Iot.Business/RFID03Business.cs index 54669c6..5a60329 100644 --- a/Sln.Iot.Business/RFID03Business.cs +++ b/Sln.Iot.Business/RFID03Business.cs @@ -60,13 +60,16 @@ namespace Sln.Iot.Business //转换托盘码 string traycode = Encoding.ASCII.GetString(trayBytesResult.Content); traycode = traycode.Replace("\0", ""); - _log.Info("RFID03" + traycode); + _log.Info($"RFID03 [{traycode}]"); //sql更新 //取出work唯一guid(tid) string stid = trayBindingService.TidGet(traycode); - Guid.TryParse(stid, out Guid tid); - + if (!Guid.TryParse(stid, out Guid tid)) + { + tid = Guid.Parse("11111111-1111-4111-9111-111111111111"); + _log.Error("找不到对应的托盘信息,赋值默认GUID"); + } bool res = trayBindingService.UpDateTime(DateTime.Now.ToString(), traycode, "1"); if (!res) { diff --git a/Sln.Iot.Business/RFID04Business.cs b/Sln.Iot.Business/RFID04Business.cs index 151dba7..04c7b0f 100644 --- a/Sln.Iot.Business/RFID04Business.cs +++ b/Sln.Iot.Business/RFID04Business.cs @@ -66,12 +66,16 @@ namespace Sln.Iot.Business //转换托盘吗 string traycode = Encoding.ASCII.GetString(trayBytesResult.Content); traycode = traycode.Replace("\0", ""); - _log.Info("RFID04" + traycode); + _log.Info($"RFID04 [{traycode}]"); //sql更新 //取出work唯一guid(tid) string stid = trayBindingService.TidGet(traycode); - Guid.TryParse(stid, out Guid tid); + if (!Guid.TryParse(stid, out Guid tid)) + { + tid = Guid.Parse("11111111-1111-4111-9111-111111111111"); + _log.Error("找不到对应的托盘信息,赋值默认GUID"); + } bool res = trayBindingService.UpDateTime(DateTime.Now.ToString(), traycode, "2"); if (!res) diff --git a/Sln.Iot.Business/RFID05Business.cs b/Sln.Iot.Business/RFID05Business.cs index f124636..1a1e089 100644 --- a/Sln.Iot.Business/RFID05Business.cs +++ b/Sln.Iot.Business/RFID05Business.cs @@ -68,12 +68,16 @@ namespace Sln.Iot.Business //转换托盘吗 string traycode = Encoding.ASCII.GetString(trayBytesResult.Content); traycode = traycode.Replace("\0", ""); - _log.Info("RFID05" + traycode); + _log.Info($"RFID05 [{traycode}]"); //sql更新 //取出work唯一guid(tid) string stid = trayBindingService.TidGet(traycode); - Guid.TryParse(stid, out Guid tid); + if (!Guid.TryParse(stid, out Guid tid)) + { + tid = Guid.Parse("11111111-1111-4111-9111-111111111111"); + _log.Error("找不到对应的托盘信息,赋值默认GUID"); + } bool res = trayBindingService.UpDateTime(DateTime.Now.ToString(), traycode, "4"); if (!res) diff --git a/Sln.Iot.Business/RFID06Business.cs b/Sln.Iot.Business/RFID06Business.cs index 0aa8cbd..8cb3bca 100644 --- a/Sln.Iot.Business/RFID06Business.cs +++ b/Sln.Iot.Business/RFID06Business.cs @@ -75,14 +75,17 @@ namespace Sln.Iot.Business //转换托盘吗 string traycode = Encoding.ASCII.GetString(trayBytesResult.Content); traycode = traycode.Replace("\0", ""); - _log.Info("RFID06" + traycode); + _log.Info($"RFID06 [{traycode}]"); //sql更新 //取出work唯一guid(tid) string stid = trayBindingService.TidGet(traycode); - Guid.TryParse(stid, out Guid tid); + if (!Guid.TryParse(stid, out Guid tid)) + { + tid = Guid.Parse("11111111-1111-4111-9111-111111111111"); + _log.Error("找不到对应的托盘信息,赋值默认GUID"); + } - //待开发 string[] prodcode = trayBindingService.ProdCodeGet(traycode); bool res = trayBindingService.TrayCodeDelete(traycode); diff --git a/Sln.Iot.Repository/service/ErrorService.cs b/Sln.Iot.Repository/service/ErrorService.cs index ad37684..14131b8 100644 --- a/Sln.Iot.Repository/service/ErrorService.cs +++ b/Sln.Iot.Repository/service/ErrorService.cs @@ -62,13 +62,17 @@ namespace Sln.Iot.Repository.service { try { - var restr = _helperV1.QuerySingle(x => x.ErrorName == Message).ErrorGuid; + var restr = _helperV1.QuerySingle(x => x.ErrorName == Message); + if (restr == null) + { + return string.Empty; + }; var res = _helperV1.SqlExcute($"DELETE FROM Vacuum1Error WHERE ErrorName = '{Message}'"); if (res == 0) { - throw new Exception("删除数据不成功,可能数据库中没有指定ErrorMessage的错误"); + _log.Info("删除数据不成功,可能数据库中没有指定ErrorMessage的错误"); } - return restr; + return restr.ErrorGuid; } catch (Exception ex) { @@ -131,13 +135,17 @@ namespace Sln.Iot.Repository.service { try { - var restr = _helperV2.QuerySingle(x => x.ErrorName == Message).ErrorGuid; + var restr = _helperV2.QuerySingle(x => x.ErrorName == Message); + if(restr == null) + { + return string.Empty; + }; var res = _helperV2.SqlExcute($"DELETE FROM Vacuum2Error WHERE ErrorName = '{Message}'"); if (res == 0) { - throw new Exception("删除数据不成功,可能数据库中没有指定ErrorMessage的错误"); + _log.Info("删除数据不成功,可能数据库中没有指定ErrorMessage的错误"); } - return restr; + return restr.ErrorGuid; } catch (Exception ex) { @@ -200,13 +208,17 @@ namespace Sln.Iot.Repository.service { try { - var restr = _helperL.QuerySingle(x => x.ErrorName == Message).ErrorGuid; + var restr = _helperL.QuerySingle(x => x.ErrorName == Message); + if (restr == null) + { + return string.Empty; + }; var res = _helperL.SqlExcute($"DELETE FROM LiftError WHERE ErrorName = '{Message}'"); if (res == 0) { - throw new Exception("删除数据不成功,可能数据库中没有指定ErrorMessage的错误"); + _log.Info("删除数据不成功,可能数据库中没有指定ErrorMessage的错误"); } - return restr; + return restr.ErrorGuid; } catch (Exception ex) { @@ -269,13 +281,17 @@ namespace Sln.Iot.Repository.service { try { - var restr = _helperO.QuerySingle(x => x.ErrorName == Message).ErrorGuid; + var restr = _helperO.QuerySingle(x => x.ErrorName == Message); + if (restr == null) + { + return string.Empty; + }; var res = _helperO.SqlExcute($"DELETE FROM OvenError WHERE ErrorName = '{Message}'"); if (res == 0) { - throw new Exception("删除数据不成功,可能数据库中没有指定ErrorMessage的错误"); + _log.Info("删除数据不成功,可能数据库中没有指定ErrorMessage的错误"); } - return restr; + return restr.ErrorGuid; } catch (Exception ex) {