diff --git a/JinYuan.ControlCenter/ControlCenter_Plc.cs b/JinYuan.ControlCenter/ControlCenter_Plc.cs index 779028b..303574b 100644 --- a/JinYuan.ControlCenter/ControlCenter_Plc.cs +++ b/JinYuan.ControlCenter/ControlCenter_Plc.cs @@ -512,9 +512,8 @@ namespace JinYuan.ControlCenters // 获取电池等级信息 var gradeResult = await GetBatteryGradesWithTimeout(mesResult.TrayInfo, 500); - string finalGrade = gradeResult.IsConsistent ? gradeResult.Grade : CommonMethods.curFdConfig.Grade1; - string add = (gradeResult.Grade == null || string.IsNullOrEmpty(gradeResult.Grade)) ? ",临时使用本机架1垛位的挡位" : ""; - string gradeRemark = gradeResult.IsConsistent ? "" : gradeResult.ErrorMessage + add; + string finalGrade = gradeResult.IsConsistent ? gradeResult.Grade : ""; + string gradeRemark = gradeResult.IsConsistent ? "" : gradeResult.ErrorMessage; // 反馈电池条码到PLC //await WriteBatteryBarcodesToPLC(pf, mesResult.TrayInfo); @@ -729,9 +728,8 @@ namespace JinYuan.ControlCenters // 获取电池等级信息 var gradeResult = await GetBatteryGradesWithTimeout(mesResult.TrayInfo, 500); - string finalGrade = gradeResult.IsConsistent ? gradeResult.Grade : CommonMethods.curFdConfig.Grade1; - string add = (gradeResult.Grade == null || string.IsNullOrEmpty(gradeResult.Grade) )? ",临时使用本机架1垛位的挡位" : ""; - string gradeRemark = gradeResult.IsConsistent ? "" : gradeResult.ErrorMessage + add; + string finalGrade = gradeResult.IsConsistent ? gradeResult.Grade : ""; + string gradeRemark = gradeResult.IsConsistent ? "" : gradeResult.ErrorMessage; // 反馈电池条码到PLC await WriteBatteryBarcodesToPLC(pf, mesResult.TrayInfo);