|
|
@ -144,7 +144,7 @@ public class MesProductionSortModuleService extends BaseModuleService {
|
|
|
|
if (queueOrderModel.getStatus() == MesExtEnumUtil.QUEUE_ORDER_STATUS.FINISH.getValue()) isComplete = true;
|
|
|
|
if (queueOrderModel.getStatus() == MesExtEnumUtil.QUEUE_ORDER_STATUS.FINISH.getValue()) isComplete = true;
|
|
|
|
else if (!isComplete) color = MesExtEnumUtil.COLOR.WHITE.getValue();
|
|
|
|
else if (!isComplete) color = MesExtEnumUtil.COLOR.WHITE.getValue();
|
|
|
|
//跳号标黄色
|
|
|
|
//跳号标黄色
|
|
|
|
if (index <= queueOrderList.size() && checkJumpNumber(queueOrderList.get(index).getWorkOrderSeq(), mesQueueOrder.getWorkOrderSeq())) color = MesExtEnumUtil.COLOR.YELLOW.getValue();
|
|
|
|
if (index < queueOrderList.size() && checkJumpNumber(queueOrderList.get(index).getWorkOrderSeq(), mesQueueOrder.getWorkOrderSeq())) color = MesExtEnumUtil.COLOR.YELLOW.getValue();
|
|
|
|
queueOrderModel.setColor(color);
|
|
|
|
queueOrderModel.setColor(color);
|
|
|
|
queueOrderModels.add(queueOrderModel);
|
|
|
|
queueOrderModels.add(queueOrderModel);
|
|
|
|
index++;
|
|
|
|
index++;
|
|
|
|