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;