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 9a8a879..edca77d 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
@@ -74,6 +74,10 @@ public class ScheduleData extends BaseShopOrderData {
     private String manualFlag;//刀模已发
     private boolean checkedFlag;//是否选中
     private String orderType;//订单类型
+    private String mergeStatusCon;//合并字段的内容
+    private String laterShipFlag;//晚于发货时间
+    private String earlierItemFlag;//早于上工序
+    private String finishPreItremFlag;//早于上工序的标记
 
     public ScheduleData() {
     }
@@ -429,4 +433,36 @@ public class ScheduleData extends BaseShopOrderData {
     public void setOrderType(String orderType) {
         this.orderType = orderType;
     }
+
+    public String getMergeStatusCon() {
+        return mergeStatusCon;
+    }
+
+    public void setMergeStatusCon(String mergeStatusCon) {
+        this.mergeStatusCon = mergeStatusCon;
+    }
+
+    public String getLaterShipFlag() {
+        return laterShipFlag;
+    }
+
+    public void setLaterShipFlag(String laterShipFlag) {
+        this.laterShipFlag = laterShipFlag;
+    }
+
+    public String getEarlierItemFlag() {
+        return earlierItemFlag;
+    }
+
+    public void setEarlierItemFlag(String earlierItemFlag) {
+        this.earlierItemFlag = earlierItemFlag;
+    }
+
+    public String getFinishPreItremFlag() {
+        return finishPreItremFlag;
+    }
+
+    public void setFinishPreItremFlag(String finishPreItremFlag) {
+        this.finishPreItremFlag = finishPreItremFlag;
+    }
 }
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index be2de81..70dd2d1 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -72,7 +72,22 @@ public class ScheduleServiceImpl implements ScheduleService {
         if (null == workCenterNo || null == resourceId || "".equals(workCenterNo) || "".equals(resourceId)) {
             return new ArrayList<ScheduleData>();
         }
-        return scheduleMapper.getOrderScheduleList(inData);
+
+        List<ScheduleData> resultList = scheduleMapper.getOrderScheduleList(inData);
+        //循环处理内容的字段
+        for(ScheduleData schedule : resultList){
+            String mergeStatusCon = schedule.getMergeStatusCon();
+            //判断是否查询到了
+            if(mergeStatusCon != null&& mergeStatusCon.length() >= 5){
+                String laterShipFlag = mergeStatusCon.substring(0, 1);
+                String earlierItemFlag = mergeStatusCon.substring(2, 3);
+                String finishPreItremFlag = mergeStatusCon.substring(4, 5);
+                schedule.setLaterShipFlag(laterShipFlag);
+                schedule.setEarlierItemFlag(earlierItemFlag);
+                schedule.setFinishPreItremFlag(finishPreItremFlag);
+            }
+        }
+        return resultList;
     }
 
     @Override
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index 6a6e246..3fdc810 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -146,6 +146,7 @@
         S1.PlanFinishTime preOpsPlanFinishTime, T.Remark remark, D.OriSOOrderNo oriSOOrderNo, P.Remark custPartNo, T.Efficiency eficiency,
         (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
         from SOScheduledList as E,SOScheduledRouting as T
         Left Join ShopOrder as D On T.Site=D.Site and T.OrderNo=D.OrderNo
@@ -1049,8 +1050,8 @@
 
     <!--获取班次选择的数据-->
     <select id="getScheduleShiftWithSelect" parameterType="SearchScheduleData" resultType="java.util.HashMap">
-        SELECT WR.ResourceID resourceId, CE.ScheduleDate scheduleDate, CES.ShiftNo shiftNo, CES.ShiftDesc shiftDesc,
-        CONVERT(VARCHAR(5), CES.StartExactTime, 108) starttime, CONVERT(VARCHAR(5), CES.EndExactTime, 108) endTime,
+        SELECT WR.ResourceID resourceId, CONVERT(VARCHAR(10), CE.ScheduleDate, 120) scheduleDate, CES.ShiftNo shiftNo, CES.ShiftDesc shiftDesc,
+        CONVERT(VARCHAR(5), CES.StartExactTime, 108) startTime, CONVERT(VARCHAR(5), CES.EndExactTime, 108) endTime,
         (CASE WHEN CES.EndTime <![CDATA[<]]> CES.StartTime THEN 'Y' ELSE 'N' END) nextDayFlag
         FROM WorkCenterResource WR, Calendar_Exception CE, Calendar_Exception_Shift CES
         WHERE WR.Site=CE.Site and WR.CalendarID=CE.CalendarID