From 5c758f33c040eb1a05e419934692e042d54ef03e Mon Sep 17 00:00:00 2001
From: jun <junsheng.li@estsh.com>
Date: Wed, 16 Oct 2024 16:02:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=BF=87=E7=A8=8B=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=EF=BC=8C=E6=A0=87=E9=BB=84=E7=9A=84=E6=98=AF=E8=B7=B3?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E5=B7=A5=E5=8D=95=EF=BC=8C=E8=80=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=98=AF=E6=9C=89=E8=B7=B3=E8=BF=87=E7=9A=84=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../station/MesProductionSortModuleService.java        | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionSortModuleService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionSortModuleService.java
index 4d24ac4..b5cb098 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionSortModuleService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionSortModuleService.java
@@ -5,21 +5,21 @@ import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionCustomContextStepServi
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProdShiftContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPartContext;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesQueueOrderModel;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseModuleService;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IStepService;
 import cn.estsh.i3plus.mes.pcn.util.PojoAttrUtil;
 import cn.estsh.i3plus.mes.pcn.util.StationKvBeanUtil;
+import cn.estsh.i3plus.platform.common.tool.CheckTool;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.*;
+import cn.estsh.i3plus.pojo.mes.bean.MesProdShiftRecord;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder;
 import cn.estsh.i3plus.pojo.mes.model.AttrBean;
 import cn.estsh.i3plus.pojo.mes.model.StationKvBean;
 import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
@@ -32,6 +32,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -135,15 +136,18 @@ public class MesProductionSortModuleService extends BaseModuleService {
             if (!CollectionUtils.isEmpty(queueOrderList)) {
 
                 boolean isComplete = false;
+                int index = MesPcnExtConstWords.ONE;
                 for (MesQueueOrder mesQueueOrder : queueOrderList) {
                     MesQueueOrderModel queueOrderModel = new MesQueueOrderModel();
                     BeanUtils.copyProperties(mesQueueOrder, queueOrderModel);
                     String color = MesExtEnumUtil.COLOR.GREEN.getValue();
                     if (queueOrderModel.getStatus() == MesExtEnumUtil.QUEUE_ORDER_STATUS.FINISH.getValue()) isComplete = true;
                     else if (!isComplete) color = MesExtEnumUtil.COLOR.WHITE.getValue();
-                    else if (isComplete && (queueOrderModel.getStatus() == MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue())) color = MesExtEnumUtil.COLOR.YELLOW.getValue();
+                    //跳号标黄色
+                    if (index <= queueOrderList.size() && checkJumpNumber(queueOrderList.get(index).getWorkOrderSeq(), mesQueueOrder.getWorkOrderSeq())) color = MesExtEnumUtil.COLOR.YELLOW.getValue();
                     queueOrderModel.setColor(color);
                     queueOrderModels.add(queueOrderModel);
+                    index++;
                 }
             }
         }
@@ -162,6 +166,12 @@ public class MesProductionSortModuleService extends BaseModuleService {
         return queueOrder == null ? null : Stream.of(queueOrder.getPartProdGroupCode()).collect(Collectors.toList());
     }
 
+
+    private boolean checkJumpNumber(String nextWorkOrderSeq, String currentWorkOrderSeq) {
+        if (StringUtils.isEmpty(nextWorkOrderSeq) || StringUtils.isEmpty(currentWorkOrderSeq) || !CheckTool.isNumber(nextWorkOrderSeq) || !CheckTool.isNumber(currentWorkOrderSeq)) return false;
+        return Integer.parseInt(currentWorkOrderSeq) != Integer.parseInt(nextWorkOrderSeq) + MesPcnExtConstWords.ONE;
+    }
+
     private MesQueueOrder getNewQueueOrder(StationRequestBean reqBean) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(reqBean.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(reqBean.getWorkCenterCode(), MesPcnExtConstWords.WORK_CENTER_CODE, packBean);