diff --git a/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java b/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
index c88d907..f3b7394 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
@@ -80,6 +80,7 @@ public class ScheduleData extends BaseShopOrderData {
     private String finishPreItemFlag;//早于上工序的标记
     private String preResourceInfo;//前道机台信息
     private Float preQtyFinished;//前道工序完成的
+    private String colorStyle;//颜色样式
 
     public ScheduleData() {
     }
@@ -483,4 +484,12 @@ public class ScheduleData extends BaseShopOrderData {
     public void setPreQtyFinished(Float preQtyFinished) {
         this.preQtyFinished = preQtyFinished;
     }
+
+    public String getColorStyle() {
+        return colorStyle;
+    }
+
+    public void setColorStyle(String colorStyle) {
+        this.colorStyle = colorStyle;
+    }
 }
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index 4a55d04..c440b37 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -150,7 +150,7 @@
         (Case when dbo.Get_SOOpsJobEstFinishDate(T.Site,T.OrderNo,T.ItemNo,T.SeqNo)<![CDATA[ <= ]]>T.PlanFinishTime then 0.0
         else round((convert(float,dbo.Get_SOOpsJobEstFinishDate(T.Site,T.OrderNo,T.ItemNo,T.SeqNo)) - convert(float,T.PlanFinishTime)) * 24,2) end) delayHours,
         dbo.Get_SOSchedule_RecordIdentity(T.Site,T.PlanStartTime,T.PlanFinishTime,D.NeedDate,S1.PlanStartTime,S1.PlanFinishTime) mergeStatusCon,
-        D.CostRollUpFlag costRollUpFlag
+        D.CostRollUpFlag costRollUpFlag, dbo.getCurrentScheduleColorStyle(T.QtyReported, D.LotSize, T.PlanFinishTime, T.ClosedFlag) colorStyle
         from SOScheduledList as E,SOScheduledRouting as T
         Left Join ShopOrder as D On T.Site=D.Site and T.OrderNo=D.OrderNo
         ,SORouting as S