diff --git a/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java b/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java
index d56f729..e0c7035 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java
@@ -38,6 +38,7 @@ public class ShopOrderOutData extends BaseShopOrderData {
     private Float qtyApprovedPreOps;//
     private String manualFlag;
     private String repairSOFlag;//
+    private Float scheduleToPlanTime;//
 
     public ShopOrderOutData() {
     }
@@ -201,4 +202,12 @@ public class ShopOrderOutData extends BaseShopOrderData {
     public void setRepairSOFlag(String repairSOFlag) {
         this.repairSOFlag = repairSOFlag;
     }
+
+    public Float getScheduleToPlanTime() {
+        return scheduleToPlanTime;
+    }
+
+    public void setScheduleToPlanTime(Float scheduleToPlanTime) {
+        this.scheduleToPlanTime = scheduleToPlanTime;
+    }
 }
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index a6b3f24..cc76716 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -45,6 +45,7 @@
         D.EnterDate enterDate, dbo.Get_SOOpsScheduleAvailResource(T.Site,T.OrderNo,T.WorkCenterNo,T.ItemNo) availResource, T.WorkCenterNo workCenterNo,
         T.MachRunFactor machRunFactor, T.MachSetupTime machSetupTime, T.FactorUnit factorUnit, T.ScheduledFlag scheduledFlag, D.RoutingRevNo routingRevNo,
         T.QtyScheduled qtyScheduled,(round(T.QtyRequired,3) - Round(T.QtyScheduled,3)) qtyToSchedule, Isnull(S1.QtyScheduled,0.0) qtyScheduledPreOps,
+        dbo.getScheduleToPlanTime(D.LotSize, T.MachSetupTime, T.MachRunFactor, T.FactorUnit, t.Efficiency) scheduleToPlanTime,
         D.OriSOOrderNo oriSOOrderNo, P.Remark custPartNo, 1*t.Efficiency efficiency, D.CostRollUpFlag costRollUpFlag, isnull(S1.QtyApprove,0.0) qtyApprovedPreOps,
         d.ManualFlag manualFlag, d.RepairSOFlag repairSOFlag
         from SORouting as T
@@ -225,7 +226,7 @@
 
     <!--获取当前的上机卷信息-->
     <select id="getCurrentRollOpsBySeqNo" parameterType="BaseRollData" resultType="SfdcRollOpsData">
-        SELECT sro.Site site, sro.OrderNo orderNo, sro.RollNo rollNo, sro.ItemNo itemNo, sro.SeqNo seqNo, sro.ScanedBy scanedBy, sro.ScanedDate scanedDate,
+        SELECT TOP 1 sro.Site site, sro.OrderNo orderNo, sro.RollNo rollNo, sro.ItemNo itemNo, sro.SeqNo seqNo, sro.ScanedBy scanedBy, sro.ScanedDate scanedDate,
         sro.StartProdFlag startProdFlag, sro.FirstSetupBy firstSetupBy, sro.FirstSetupDate firstSetupDate, sro.LatestSetupBy latestSetupBy,
         sro.LatestSetupDate latestSetupDate, sro.FirstEndSetupBy firstEndSetupBy, sro.FirstEndSetupDate firstEndSetupDate, sro.LatestEndSetupBy latestEndSetupBy,
         sro.LatestEndSetupDate latestEndSetupDate, sro.FirstProdBy firstProdBy, sro.FirstProdDate firstProdDate, sro.LatestProdBy latestProdBy,