From d53d41b1a376db054f7cd7c1632f0d096c3cb3d0 Mon Sep 17 00:00:00 2001
From: "castle.zang" <castle.zang@estsh.com>
Date: Mon, 25 Nov 2024 10:32:25 +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=BB=84=E8=89=B2=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=A9=99=E8=89=B2-43940?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/busi/MesEarlyWarningKanBanController.java          | 1 -
 .../apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java   | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesEarlyWarningKanBanController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesEarlyWarningKanBanController.java
index 19bec4d..1c4d570 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesEarlyWarningKanBanController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesEarlyWarningKanBanController.java
@@ -10,7 +10,6 @@ import cn.estsh.impp.framework.boot.util.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.text.ParseException;
 import java.util.List;
 
 @RestController
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 12d07bf..121b5e5 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("yellow");
+            mesKanBanShowModel.setRealSupplyBufferColor("organize");
             mesKanBanShowModel.setSupplyRedBuffer(supplyYellowBuffer);
         }
 
@@ -438,7 +438,7 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
         if (summaryRealSupplyRealCount > summaryWorkOrderRedCount){
             mesKanBanShowModel.setSummaryWorkOrderColor("red");
         }else if (summaryRealSupplyRealCount > summaryWorkOrderYellowCount){
-            mesKanBanShowModel.setSummaryWorkOrderColor("yellow");
+            mesKanBanShowModel.setSummaryWorkOrderColor("organize");
         }
 
         //成品缓冲
@@ -458,9 +458,9 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
         mesKanBanShowModel.setRealProductionBuffer(realProductionBuffer);
         Long productionYellowBuffer = kanBan.getProductionYellowBuffer();
         if (realProductionBuffer < productionRedBuffer){
-            mesKanBanShowModel.setRealProductionBufferColor("RED");
+            mesKanBanShowModel.setRealProductionBufferColor("red");
         }else if (realProductionBuffer < productionYellowBuffer){
-            mesKanBanShowModel.setRealProductionBufferColor("YELLOW");
+            mesKanBanShowModel.setRealProductionBufferColor("organize");
         }
         //声音信息
         //private String voice;