diff --git a/yuhong_plc/zzz.Api/Controllers/Test/TestController.cs b/yuhong_plc/zzz.Api/Controllers/Test/TestController.cs
index c3bcf5b..347de26 100644
--- a/yuhong_plc/zzz.Api/Controllers/Test/TestController.cs
+++ b/yuhong_plc/zzz.Api/Controllers/Test/TestController.cs
@@ -321,7 +321,7 @@ namespace zzz.Api.Controllers
///
- /// 读取2线数据
+ /// 读取3线数据
///
[HttpGet]
public async Task TestRead3()
@@ -378,6 +378,9 @@ namespace zzz.Api.Controllers
await _readPLCDataService.ReadDataLine7(input1);
+ //decimal value = Math.Round( (decimal) 984 / 10, 2);
+ //Console.WriteLine(value);
+
return "OK";
}
diff --git a/yuhong_plc/zzz.Services/ReadPLC/ReadPLCDataService.cs b/yuhong_plc/zzz.Services/ReadPLC/ReadPLCDataService.cs
index c4e7449..979251f 100644
--- a/yuhong_plc/zzz.Services/ReadPLC/ReadPLCDataService.cs
+++ b/yuhong_plc/zzz.Services/ReadPLC/ReadPLCDataService.cs
@@ -2221,12 +2221,10 @@ namespace zzz.Services.ReadPLC
eqmt3.d6600 = _melsecMcNet.ReadInt32("D6600").Content; // 班产量
eqmt3.d6602 = _melsecMcNet.ReadInt32("D6602").Content; // 班成品
eqmt3.d6604 = _melsecMcNet.ReadInt32("D6604").Content; // 班废品
- eqmt3.d6614 = _melsecMcNet.ReadInt32("D6614").Content; //班合格率
-
+ //eqmt3.d6614 = _melsecMcNet.ReadInt32("D6614").Content; //班合格率 (不准)
+ eqmt3.d6614 = eqmt3.d840 == 0 ? 0 : Math.Round((decimal) eqmt3.d842 * 100 / eqmt3.d840, 2); //班合格率
eqmt3.d9530 = _melsecMcNet.ReadInt32("D9530").Content; //班OEE
-
-
#region 增加EqmtPub数据
var product_type = "1";
var eqmtBaseInfo = (await _eqmtBaseRep.QueryAsync(x => x.eqmt_id == eqmt3.eqmt_id)).FirstOrDefault();