SoftwareGroup/1258
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20260609同步代码

Browse Source
This commit is contained in:
cailiming
2026-09-09 09:10:43 +08:00
parent 84f1a16598
commit cf2a7c8ff1
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JinYuan.ControlCenter/ControlCenter_Plc.cs
+4 -6
View File
@@ -512,9 +512,8 @@ namespace JinYuan.ControlCenters
// 获取电池等级信息 // 获取电池等级信息
var gradeResult = await GetBatteryGradesWithTimeout(mesResult.TrayInfo, 500); var gradeResult = await GetBatteryGradesWithTimeout(mesResult.TrayInfo, 500);
string finalGrade = gradeResult.IsConsistent ? gradeResult.Grade : CommonMethods.curFdConfig.Grade1; string finalGrade = gradeResult.IsConsistent ? gradeResult.Grade : "";
string add = (gradeResult.Grade == null || string.IsNullOrEmpty(gradeResult.Grade)) ? ",临时使用本机架1垛位的挡位" : ""; string gradeRemark = gradeResult.IsConsistent ? "" : gradeResult.ErrorMessage;
string gradeRemark = gradeResult.IsConsistent ? "" : gradeResult.ErrorMessage + add;
// 反馈电池条码到PLC // 反馈电池条码到PLC
//await WriteBatteryBarcodesToPLC(pf, mesResult.TrayInfo); //await WriteBatteryBarcodesToPLC(pf, mesResult.TrayInfo);
@@ -729,9 +728,8 @@ namespace JinYuan.ControlCenters
// 获取电池等级信息 // 获取电池等级信息
var gradeResult = await GetBatteryGradesWithTimeout(mesResult.TrayInfo, 500); var gradeResult = await GetBatteryGradesWithTimeout(mesResult.TrayInfo, 500);
string finalGrade = gradeResult.IsConsistent ? gradeResult.Grade : CommonMethods.curFdConfig.Grade1; string finalGrade = gradeResult.IsConsistent ? gradeResult.Grade : "";
string add = (gradeResult.Grade == null || string.IsNullOrEmpty(gradeResult.Grade) )? ",临时使用本机架1垛位的挡位" : ""; string gradeRemark = gradeResult.IsConsistent ? "" : gradeResult.ErrorMessage;
string gradeRemark = gradeResult.IsConsistent ? "" : gradeResult.ErrorMessage + add;
// 反馈电池条码到PLC // 反馈电池条码到PLC
await WriteBatteryBarcodesToPLC(pf, mesResult.TrayInfo); await WriteBatteryBarcodesToPLC(pf, mesResult.TrayInfo);