From 1fcd220c1dc081ef0fb6a8a2e3e7e84c4f611991 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Fri, 17 Sep 2021 14:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=89=80=E6=9C=89=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProdReadyTaskServiceImpl.java   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
index b57c5b3c..95ffed54 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
@@ -494,18 +494,20 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
             }
             //下道工序
             Router router = routerService.getRouterBySfcBo(HandleEnum.SFC.getHandle(site, sfcServiceById.getSfc()));
-            int seq = 0;
+            if (router==null){
+                throw new BaseException("未找到当前工序");
+            }
             List<RouterStepDto> stepOperationList = routerStepService.findRouterOperationByRouterBo(site, router.getHandle());
+            StringBuilder operationDesc = new StringBuilder();
             for (int i = 0; i < stepOperationList.size(); i++) {
                 RouterStepDto stepOperation = stepOperationList.get(i);
-                if (stepOperation.getStepId().equals(prodReadyTask.getStepId())) {
-                    seq = i;
+                operationDesc.append(stepOperation.getOperationDesc()) ;
+                if (i!=stepOperationList.size()-1){
+                    operationDesc.append(",");
                 }
             }
-            if (seq != stepOperationList.size() - 1) {
-                RouterStepDto stepOperation = stepOperationList.get(seq + 1);
-                labelPrintDto.setOperation(stepOperation.getOperationDesc());
-            }
+            labelPrintDto.setOperation(operationDesc.toString());
+
             labelPrintDtoList.add(labelPrintDto);
             printData = JSON.toJSONString(labelPrintDtoList);
             //打印记录