From d900d3e55f6e321707fbf38d9a7dc2f829775b76 Mon Sep 17 00:00:00 2001
From: "castle.zang" <castle.zang@estsh.com>
Date: Tue, 17 Dec 2024 15:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E6=9C=AB=E5=A4=A7=E5=B1=8F=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=E9=A2=9C=E8=89=B2=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/busi/MesEarlyWarningServiceImpl.java          | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java
index 121b5e5..9034a1d 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java
@@ -415,7 +415,7 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
             mesKanBanShowModel.setRealSupplyBufferColor("red");
             mesKanBanShowModel.setSupplyRedBuffer(supplyRedBuffer);
         }else if (realSupplyBuffer < supplyYellowBuffer){
-            mesKanBanShowModel.setRealSupplyBufferColor("organize");
+            mesKanBanShowModel.setRealSupplyBufferColor("orange");
             mesKanBanShowModel.setSupplyRedBuffer(supplyYellowBuffer);
         }
 
@@ -435,12 +435,11 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
         }
         mesKanBanShowModel.setSummaryRealSupplyRealCount(summaryRealSupplyRealCount);
         Long summaryWorkOrderYellowCount = kanBan.getSummaryWorkOrderYellowCount();
-        if (summaryRealSupplyRealCount > summaryWorkOrderRedCount){
+        if (summaryRealSupplyRealCount > summaryWorkOrderYellowCount){
+            mesKanBanShowModel.setSummaryWorkOrderColor("orange");
+        }else if (summaryRealSupplyRealCount > summaryWorkOrderRedCount){
             mesKanBanShowModel.setSummaryWorkOrderColor("red");
-        }else if (summaryRealSupplyRealCount > summaryWorkOrderYellowCount){
-            mesKanBanShowModel.setSummaryWorkOrderColor("organize");
         }
-
         //成品缓冲
         Long productionRedBuffer =kanBan.getProductionRedBuffer();
         mesKanBanShowModel.setProductionRedBuffer(productionRedBuffer);
@@ -460,7 +459,7 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
         if (realProductionBuffer < productionRedBuffer){
             mesKanBanShowModel.setRealProductionBufferColor("red");
         }else if (realProductionBuffer < productionYellowBuffer){
-            mesKanBanShowModel.setRealProductionBufferColor("organize");
+            mesKanBanShowModel.setRealProductionBufferColor("orange");
         }
         //声音信息
         //private String voice;