diff --git a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
index fa335c2..1f92cae 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java
@@ -110,6 +110,7 @@ public class SearchScheduleData extends BaseData {
     private String specifiedTime;//是否制定排产的时间
     private Float scheduledQty;//排产的数量
     private int waitTimes;//等待时间
+    private boolean currentRollFlag;//是否按照当前卷来查询
 
     public SearchScheduleData() {
     }
@@ -753,4 +754,12 @@ public class SearchScheduleData extends BaseData {
     public void setWaitTimes(int waitTimes) {
         this.waitTimes = waitTimes;
     }
+
+    public boolean isCurrentRollFlag() {
+        return currentRollFlag;
+    }
+
+    public void setCurrentRollFlag(boolean currentRollFlag) {
+        this.currentRollFlag = currentRollFlag;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/gaotao/modules/schedule/data/SfdcDefectData.java b/src/main/java/com/gaotao/modules/schedule/data/SfdcDefectData.java
index 187eb8a..d3eea35 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/SfdcDefectData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/SfdcDefectData.java
@@ -14,8 +14,8 @@ import java.util.Date;
  */
 @Alias("SfdcDefectData")
 public class SfdcDefectData extends BaseRollData {
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date reportedDate;
     private String reportedBy;
     private String defectCode;
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 613b71c..dfee48e 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
@@ -131,6 +131,11 @@ public class ScheduleServiceImpl implements ScheduleService {
 
     @Override
     public List<SfdcTimeData> getSfdcTimeByCon(SearchScheduleData inData) {
+        //判断是否查询当前卷的
+        boolean currentRollFlag = inData.isCurrentRollFlag();
+        if(!currentRollFlag){
+            inData.setRollNo(null);
+        }
         return scheduleMapper.getSfdcTimeByCon(inData);
     }
 
@@ -141,6 +146,11 @@ public class ScheduleServiceImpl implements ScheduleService {
 
     @Override
     public List<SfdcToolData> getSfdcToolByCon(SearchScheduleData inData) {
+        //判断是否查询当前卷的
+        boolean currentRollFlag = inData.isCurrentRollFlag();
+        if(!currentRollFlag){
+            inData.setRollNo(null);
+        }
         return scheduleMapper.getSfdcToolByCon(inData);
     }
 
@@ -150,31 +160,61 @@ public class ScheduleServiceImpl implements ScheduleService {
         //首先查询referenceCustomerId
         String referenceCustomerId = scheduleMapper.getReferenceCustomerId(site);
         inData.setReferenceCustomerId(referenceCustomerId);
+        //判断是否查询当前卷的
+        boolean currentRollFlag = inData.isCurrentRollFlag();
+        if(!currentRollFlag){
+            inData.setRollNo(null);
+        }
         return scheduleMapper.getOrderBomByCon(inData);
     }
 
     @Override
     public List<SfdcMaterialData> getSfdcMaterialByCon(SearchScheduleData inData) {
+        //判断是否查询当前卷的
+        boolean currentRollFlag = inData.isCurrentRollFlag();
+        if(!currentRollFlag){
+            inData.setRollNo(null);
+        }
         return scheduleMapper.getSfdcMaterialByCon(inData);
     }
 
     @Override
     public List<SfdcRollOpsData> getSfdcRollOpsByCon(SearchScheduleData inData) {
+        //判断是否查询当前卷的
+        boolean currentRollFlag = inData.isCurrentRollFlag();
+        if(!currentRollFlag){
+            inData.setRollNo(null);
+        }
         return scheduleMapper.getSfdcRollOpsByCon(inData);
     }
 
     @Override
     public List<SfdcDefectData> getSfdcDefectByCon(SearchScheduleData inData) {
+        //判断是否查询当前卷的
+        boolean currentRollFlag = inData.isCurrentRollFlag();
+        if(!currentRollFlag){
+            inData.setRollNo(null);
+        }
         return scheduleMapper.getSfdcDefectByCon(inData);
     }
 
     @Override
     public List<SfdcRollData> getSfdcRollByCon(SearchScheduleData inData) {
+        //判断是否查询当前卷的
+        boolean currentRollFlag = inData.isCurrentRollFlag();
+        if(!currentRollFlag){
+            inData.setRollNo(null);
+        }
         return scheduleMapper.getSfdcRollByCon(inData);
     }
 
     @Override
     public List<SfdcData> getSfdcDataByCon(SearchScheduleData inData) {
+        //判断是否查询当前卷的
+        boolean currentRollFlag = inData.isCurrentRollFlag();
+        if(!currentRollFlag){
+            inData.setRollNo(null);
+        }
         return scheduleMapper.getSfdcDataByCon(inData);
     }
 
@@ -2790,6 +2830,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         String seqNo = inData.getSeqNo();
         String newRollNo = inData.getNewRollNo();
         String username = inData.getUsername();
+        String operatorId = inData.getOperatorId();
         String currentTime = DateUtil.getStringDate(new Date(), "yyyy-MM-dd HH:mm:ss");
 
         //1. 存储过程  切换卷 校验是否可以继续进行 --顾总写的
@@ -2867,13 +2908,14 @@ public class ScheduleServiceImpl implements ScheduleService {
         String newRollNo = inData.getNewRollNo();
         String rollNo = inData.getRollNo();
         String username = inData.getUsername();
+        String operatorId = inData.getOperatorId();
         String currentTime = DateUtil.getStringDate(new Date(), "yyyy-MM-dd HH:mm:ss");
 
         //调用校验的的方法
         this.checkSwitchSfdcRoll(inData);
 
         //1. 调用存储过程 处理切换卷
-        Map<String, Object> resultMap = this.switchRollAction(site, orderNo, itemNo, seqNo, newRollNo, username, "N", "Y", "N");
+        Map<String, Object> resultMap = this.switchRollAction(site, orderNo, itemNo, seqNo, newRollNo, operatorId, "N", "Y", "N");
         //判断结果是否成功
         String resultCode = String.valueOf(resultMap.get("resultCode"));
         if ("400".equalsIgnoreCase(resultCode)) {