From 7b070c8bbdca02645ee77273480cc7639d44e9b8 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Mon, 16 Sep 2024 21:48:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=85=A5=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/report/MesBusiReportController.java           |  4 +++-
 .../serviceimpl/base/MesProductionRecordServiceImpl.java     | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesBusiReportController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesBusiReportController.java
index 12447b2..e71a2bb 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesBusiReportController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesBusiReportController.java
@@ -17,6 +17,8 @@ import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
+import org.drools.core.rule.Collect;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -112,7 +114,7 @@ public class MesBusiReportController extends MesBaseController {
             productAccountModel.setPartNo("Z0020667");*/
 
             List<MesProductAccountResModel> mesProductAccountResModels = mesProductionRecordService.queryProductAccount(productAccountModel);
-
+            pager.setTotalRows(CollectionUtils.isEmpty(mesProductAccountResModels) ? 0 : mesProductAccountResModels.size());
             List<MesProductAccountResModel> mesProductAccountResModelsRes = mesProductionRecordService.transferAccount(mesProductAccountResModels,productAccountModel, pager);
 
             return ResultBean.success("查询成功").setResultList(mesProductAccountResModelsRes).setPager(pager);
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordServiceImpl.java
index 8e9f005..afd1b05 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordServiceImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordServiceImpl.java
@@ -586,8 +586,8 @@ public class MesProductionRecordServiceImpl extends BaseMesService<MesProduction
         int errorCount = 0;
         String reason = "";
         String reasonOffline = "【%s】到【%s】,客户端下线,导致【%s】个完成信号丢失";
-        String reasonQuality = "【%s】到【%s】设备信号质量有问题，导致【%s】个完成信号丢失";
-        String reasonBypass = "【%s】到【%s】设备信号Bypass,【%s】个完成信号丢失";
+        String reasonQuality = "【%s】到【%s】设备信号质量为0，导致【%s】个完成信号丢失";
+        String reasonBypass = "【%s】到【%s】设备打BYPASS,导致【%s】个完成信号丢失";
         boolean bypassFlag = false;
 
         List<String> finishList = Stream.of("Product_finish","Part_Finish").collect(Collectors.toList());
@@ -650,9 +650,9 @@ public class MesProductionRecordServiceImpl extends BaseMesService<MesProduction
         int errorCount = 0;
         String reason = "";
         String reasonOffline = "【%s】到【%s】,客户端下线,导致【%s】个完成信号丢失";
-        String reasonQuality = "【%s】到【%s】设备信号质量有问题，导致【%s】个完成信号丢失";
-        String reasonBypass = "【%s】到【%s】设备信号Bypass,【%s】个完成信号丢失";
-        String releaseBypass = "【%s】到【%s】设备信号没有给release就给了完成新号,导致【%s】个完成信号丢失";
+        String reasonQuality = "【%s】到【%s】设备信号质量为0，导致【%s】个完成信号丢失";
+        String reasonBypass = "【%s】到【%s】设备打BYPASS,导致【%s】个完成信号丢失";
+        String releaseBypass = "【%s】到【%s】设备在MES没有发允许加工指令的情况下,给了【%s】个完成信号";
 
 
 
@@ -731,7 +731,7 @@ public class MesProductionRecordServiceImpl extends BaseMesService<MesProduction
         int errorCount = 0;
         String reason = "";
         String reasonOffline = "【%s】到【%s】,客户端下线,导致【%s】个完成信号丢失";
-        String reasonQuality = "【%s】到【%s】设备信号质量有问题，导致【%s】个完成信号丢失";
+        String reasonQuality = "【%s】到【%s】设备信号质量为0，导致【%s】个完成信号丢失";
 
         for (MesProductRecordLog recordLog : recordLogs) {
             if (result == 0) {