1、修改调度值勤日报，添加预览视图可编辑班次信息功能（具体查看相关代码）

徐烜
1 parent a5753f0b
Showing 21 changed files with 617 additions and 96 deletions
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/service/schedule/SchedulePlanInfoService.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/plan/strategy/说明.txt
src/main/java/com/bsth/service/schedule/timetable/TimetableExcelData.java
src/main/java/com/bsth/service/schedule/timetable/strategy/TimetableExcelWithPlanInfoViewStrategy.java
src/main/java/com/bsth/service/schedule/timetable/strategy/impl/TimetableExcelWithPlanInfoViewStrategyImpl.java
src/main/java/com/bsth/service/schedule/utils/DataToolsProperties.java
src/main/resources/datatools/config-cloud.properties
src/main/resources/datatools/config-dev.properties
src/main/resources/datatools/config-prod.properties
src/main/resources/datatools/config-test.properties
src/main/resources/datatools/ktrs/planWithScheduleTypeOutput.ktr
src/main/resources/static/pages/scheduleApp/module/common/dts2/scheduleplan/saPlanInfoView.js
src/main/resources/static/pages/scheduleApp/module/common/dts2/scheduleplan/saPlanInfoViewTemplate.html
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-ui-route-state.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/edit-detail.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/list.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/module.js
@@ -20,10 +20,13 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface SchedulePlanInfoRepository extends BaseRepository<SchedulePlanInfo, Long> {
-	
+
+    @Query(value = "select max(info.fcno) as mx from bsth_c_s_sp_info info where info.xl =?1 and info.schedule_date =?2", nativeQuery = true)
+    Long findMaxFcno(Integer xlid, Date scheduleDate);
+
 	@Query(value = "select s from SchedulePlanInfo s where scheduleDate=?1")
 	List<SchedulePlanInfo> findByDate(Date date);
-	
+
 	@Query(value = "select s from SchedulePlanInfo s where scheduleDate >= ?1 and scheduleDate <= ?2 order by scheduleDate, xl_name, lp_name, bcs")
 	List<SchedulePlanInfo> findByDates(Date date1, Date date2);
@@ -124,7 +127,7 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             @Param("p5") Date scheduleDate,
             @Param("p6") String lpName,
             @Param("p7") Integer spyId_src);
-    
+
     @Query(value="select s from SchedulePlanInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 order by s.xlBm,clZbh,lp,xlDir")
 	List<SchedulePlanInfo> findLineScheduleBc(String scheduleDate);
@@ -136,7 +139,7 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
     		")a group by schedule_date, gs_bm, xl_bm " +
     		")b group by gs_bm, xl_bm ", nativeQuery = true)
     List<Object[]> findPlanGroupCar(Date date1, Date date2);
-    
+
     @Query(value = " select gs_bm, xl_bm, max(num) num from ( " +
     		"select schedule_date, gs_bm, xl_bm, count(*) num from ( " +
     		"select schedule_date, gs_bm, xl_bm, j_gh from bsth_c_s_sp_info " +
@@ -145,7 +148,7 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
     		")a group by schedule_date, gs_bm, xl_bm " +
     		")b group by gs_bm, xl_bm ", nativeQuery = true)
     List<Object[]> findPlanGroupDriver(Date date1, Date date2);
-    
+
     @Query(value = " select gs_bm, xl_bm, max(num) num from ( " +
     		"select schedule_date, gs_bm, xl_bm, count(*) num from ( " +
     		"select schedule_date, gs_bm, xl_bm, s_gh from bsth_c_s_sp_info " +
@@ -155,16 +158,16 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
     		")a group by schedule_date, gs_bm, xl_bm " +
     		")b group by gs_bm, xl_bm ", nativeQuery = true)
     List<Object[]> findPlanGroupBusConductor(Date date1, Date date2);
-    
+
     @Query(value = " select schedule_date, xl_bm, j_gh, s_gh from bsth_c_s_sp_info " +
     		"where schedule_date >= ?1 and schedule_date  <= ?2 " +
     		"group by schedule_date, xl_bm, j_gh, s_gh ", nativeQuery = true)
     List<Object[]> findPersonnelSchedule(Date date1, Date date2);
-    
+
     @Query(value="select s from SchedulePlanInfo s where s.xlBm = ?1 and s.ttInfo = ?2 "
     		+ "and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?3 order by s.lpName,bcs")
 	List<SchedulePlanInfo> findPlanByTTinfo(String xlBm, Long ttInfo, String scheduleDate);
-    
+
     @Query(value="select s from SchedulePlanInfo s where s.xlBm = ?1 "
     		+ "and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.lpName,bcs")
 	List<SchedulePlanInfo> findPlanByXlAndDate(String xlBm, String scheduleDate);
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
 import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.timetable.strategy.TimetableExcelWithPlanInfoViewStrategy;
 import com.bsth.service.schedule.utils.DataToolsFile;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
@@ -35,7 +35,7 @@ public interface SchedulePlanInfoService extends BService&lt;SchedulePlanInfo, Long
      * @return
      * @throws ScheduleException
      */
-    TTInfoDetailForEdit.EditInfo getDirectiveDataWithPlanInfo(
+    TimetableExcelWithPlanInfoViewStrategy.PlanInfoEditInfo getDirectiveDataWithPlanInfo(
             Integer xlId, Date scheduleDate) throws ScheduleException;
     /**
@@ -4,9 +4,9 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.service.schedule.SchedulePlanInfoService;
-import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.timetable.TimetableExcelData;
+import com.bsth.service.schedule.timetable.strategy.TimetableExcelWithPlanInfoViewStrategy;
 import com.bsth.service.schedule.timetable.strategy.impl.TimetableExcelWithPlanInfoExportStrategyImpl;
 import com.bsth.service.schedule.timetable.strategy.impl.TimetableExcelWithPlanInfoViewStrategyImpl;
 import com.bsth.service.schedule.utils.DataToolsFile;
@@ -59,13 +59,14 @@ public class SchedulePlanInfoServiceImpl extends BServiceImpl&lt;SchedulePlanInfo, 
     }
     @Override
-    public TTInfoDetailForEdit.EditInfo getDirectiveDataWithPlanInfo(Integer xlId, Date scheduleDate) throws ScheduleException {
+    public TimetableExcelWithPlanInfoViewStrategy.PlanInfoEditInfo getDirectiveDataWithPlanInfo(Integer xlId, Date scheduleDate) throws ScheduleException {
         TimetableExcelData timetableExcelData = TimetableExcelData.withPlanInfoExcelViewBuilder()
                 .setXlId(xlId)
                 .setScheduleDate(scheduleDate)
                 .setLineRepository(this.lineRepository)
                 .setDataToolsService(this.dataToolsService)
                 .setDataToolsProperties(this.dataToolsProperties)
+                .setSchedulePlanInfoRepository(this.schedulePlanInfoRepository)
                 .setTimetableExcelWithPlanInfoViewStrategy(new TimetableExcelWithPlanInfoViewStrategyImpl())
                 .build();
         return timetableExcelData.doGetDirectiveDataWithPlanInfo();
+如果后续排班计划的预览视图还要修正的话，
+建议创建一个类 PlanViewData，把TimetableExcelData相关排班信息导出的代码迁移出来
@@ -6,12 +6,12 @@ import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.entity.schedule.TTInfo;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.repository.LineRepository;
+import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.repository.schedule.TTInfoDetailRepository;
 import com.bsth.repository.schedule.TTInfoRepository;
 import com.bsth.service.LineService;
 import com.bsth.service.LsStationRouteService;
 import com.bsth.service.schedule.GuideboardInfoService;
-import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.timetable.strategy.*;
 import com.bsth.service.schedule.timetable.strategy.impl.TimetableExcelWithPlanInfoViewStrategyImpl;
@@ -198,17 +198,21 @@ public class TimetableExcelData {
      * 注意：dataToolsService和dataToolsProperties共用导入相关属性
      */
+    /** 指定线路，排班日期最大发车顺序号 */
+    private Long maxfcno;
+
     /** 获取显示数据策略 */
     private TimetableExcelWithPlanInfoViewStrategy timetableExcelWithPlanInfoViewStrategy;
     /**
      * 获取前端angular指令用数据。
      */
-    public TTInfoDetailForEdit.EditInfo doGetDirectiveDataWithPlanInfo() throws ScheduleException {
+    public TimetableExcelWithPlanInfoViewStrategy.PlanInfoEditInfo doGetDirectiveDataWithPlanInfo() throws ScheduleException {
         return this.timetableExcelWithPlanInfoViewStrategy.doGetDirectiveDataWithPlanInfo(
                 this.line,
                 this.scheduleDate,
                 this.dataToolsService,
-                this.dataToolsProperties);
+                this.dataToolsProperties,
+                maxfcno);
     }
     // ----------- 构造函数 ---------- //
@@ -274,6 +278,7 @@ public class TimetableExcelData {
         this.scheduleDate = planInfoExcelViewBuilder.scheduleDate;
         this.dataToolsService = planInfoExcelViewBuilder.dataToolsService;
         this.dataToolsProperties = planInfoExcelViewBuilder.dataToolsProperties;
+        this.maxfcno = planInfoExcelViewBuilder.maxfcno;
         // 获取显示数据策略
         this.timetableExcelWithPlanInfoViewStrategy =
                 planInfoExcelViewBuilder.timetableExcelWithPlanInfoViewStrategy;
@@ -727,6 +732,8 @@ public class TimetableExcelData {
         private DataToolsService dataToolsService;
         /** 配置数据导入导出用到的配置信息 */
         private DataToolsProperties dataToolsProperties;
+        /** 排班计划明细Repo */
+        private SchedulePlanInfoRepository schedulePlanInfoRepository;
         /** view策略 */
         private TimetableExcelWithPlanInfoViewStrategyImpl timetableExcelWithPlanInfoViewStrategy;
@@ -755,6 +762,11 @@ public class TimetableExcelData {
             return this;
         }
+        public PlanInfoExcelViewBuilder setSchedulePlanInfoRepository(SchedulePlanInfoRepository schedulePlanInfoRepository) {
+            this.schedulePlanInfoRepository = schedulePlanInfoRepository;
+            return this;
+        }
+
         public PlanInfoExcelViewBuilder setTimetableExcelWithPlanInfoViewStrategy(TimetableExcelWithPlanInfoViewStrategyImpl timetableExcelWithPlanInfoViewStrategy) {
             this.timetableExcelWithPlanInfoViewStrategy = timetableExcelWithPlanInfoViewStrategy;
             return this;
@@ -763,6 +775,8 @@ public class TimetableExcelData {
         // ---------------- 内部生成的属性 ---------------- //
         /** 线路信息 */
         private Line line;
+        /** 指定线路，排班日期最大发车顺序号 */
+        private Long maxfcno;
         public TimetableExcelData build() {
             // 1、参数验证
@@ -771,12 +785,18 @@ public class TimetableExcelData {
             Assert.notNull(this.lineRepository, "线路repo为空！");
             Assert.notNull(this.dataToolsService, "数据工具服务为空！");
             Assert.notNull(this.dataToolsProperties, "配置数据导入导出用到的配置信息为空！");
+            Assert.notNull(this.schedulePlanInfoRepository, "排班明细Repo为空！");
             Assert.notNull(this.timetableExcelWithPlanInfoViewStrategy, "获取显示数据策略为空！");
             // 2、获取线路信息
             Optional<Line> optionalLine = this.lineRepository.findById(this.xlId);
             Assert.isTrue(optionalLine.isPresent(), "线路[id=" + this.xlId + "]为空！");
             this.line = optionalLine.get();
+            // 3、获取maxfcno
+            Long maxfcno = this.schedulePlanInfoRepository.findMaxFcno(this.xlId, this.scheduleDate);
+            Assert.notNull(maxfcno, "maxfcno为空，排班信息可能为空！");
+            Assert.isTrue(maxfcno > 0L, "maxfcno <= 0，排班信息可能为空！");
+            this.maxfcno = maxfcno;
             return new TimetableExcelData(this);
         }
 package com.bsth.service.schedule.timetable.strategy;
 import com.bsth.entity.Line;
-import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
+import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.utils.DataToolsProperties;
 import com.bsth.service.schedule.utils.DataToolsService;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 /**
  * 排班时刻数据（时刻表的格式，附加驾驶员，车牌信息）前端angular指令数据策略接口。
@@ -19,11 +21,39 @@ public interface TimetableExcelWithPlanInfoViewStrategy {
      * @param scheduleDate 排班日期
      * @param dataToolsService dataToolsService
      * @param dataToolsProperties dataToolsProperties
+     * @param maxfcno 指定线路，排班日期最大发车顺序号
      */
-    TTInfoDetailForEdit.EditInfo doGetDirectiveDataWithPlanInfo(
+    PlanInfoEditInfo doGetDirectiveDataWithPlanInfo(
             Line xl,
             Date scheduleDate,
             DataToolsService dataToolsService,
-            DataToolsProperties dataToolsProperties
+            DataToolsProperties dataToolsProperties,
+            Long maxfcno
     ) throws ScheduleException;
+
+    /**
+     * 排班信息编辑用的返回数据。
+     */
+    class PlanInfoEditInfo {
+        /** 标题数据 */
+        private List<String> header = new ArrayList<>();
+        /** 内容数据 */
+        private List<List<SchedulePlanInfo>> contents = new ArrayList<>();
+
+        public List<String> getHeader() {
+            return header;
+        }
+
+        public void setHeader(List<String> header) {
+            this.header = header;
+        }
+
+        public List<List<SchedulePlanInfo>> getContents() {
+            return contents;
+        }
+
+        public void setContents(List<List<SchedulePlanInfo>> contents) {
+            this.contents = contents;
+        }
+    }
 }
 package com.bsth.service.schedule.timetable.strategy.impl;
 import com.bsth.entity.Line;
-import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
+import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.timetable.strategy.TimetableExcelWithPlanInfoViewStrategy;
 import com.bsth.service.schedule.utils.*;
-import org.apache.poi.ss.usermodel.Row;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,11 +23,12 @@ public class TimetableExcelWithPlanInfoViewStrategyImpl implements TimetableExce
     private final static Logger LOG = LoggerFactory.getLogger(TimetableExcelWithPlanInfoViewStrategyImpl.class);
     @Override
-    public TTInfoDetailForEdit.EditInfo doGetDirectiveDataWithPlanInfo(
+    public PlanInfoEditInfo doGetDirectiveDataWithPlanInfo(
             Line xl,
             Date scheduleDate,
             DataToolsService dataToolsService,
-            DataToolsProperties dataToolsProperties) throws ScheduleException {
+            DataToolsProperties dataToolsProperties,
+            Long maxfcno) throws ScheduleException {
         LOG.info("---------------- 开始获取显示数据 线路=[{}],日期=[{}]排班时刻信息... --------------", xl.getName(), scheduleDate);
@@ -34,31 +36,31 @@ public class TimetableExcelWithPlanInfoViewStrategyImpl implements TimetableExce
             // ---------- 1、ktr生成的导出文件 --------- //
             // ---------- 1-1、创建ktr参数 --------- //
             Map<String, Object> ktrParams = new HashMap<>();
-            // 导出用元数据ktr
-            File ktrMetaFile = new File(this.getClass().getResource(
-                    dataToolsProperties.getTtinfodetailPlaninfoMetaoutput()).toURI());
-            // 导出ktr
+            // 导出edit数据ktr
             File ktrFile = new File(this.getClass().getResource(
-                    dataToolsProperties.getTtinfodetailPlaninfoOutput()).toURI());
+                    dataToolsProperties.getTtinfodetailPlaninfoOutputEdit()).toURI());
             // 通用参数，转换文件路径，excel输出文件名
-            ktrParams.put("transpath", ktrMetaFile.getAbsolutePath());
-            ktrParams.put("filename", "排班时刻表导出数据temp");
+            ktrParams.put("transpath", ktrFile.getAbsolutePath());
+            ktrParams.put("filename", "排班时刻表导出edit数据");
             // ktr附加命名参数
             ktrParams.put("xlid", xl.getId()); // 线路Id
-            ktrParams.put("injectktrfile", ktrFile.getAbsolutePath()); // 注入元数据的ktr文件
             ktrParams.put("sdate", scheduleDate.toInstant()
                     .atZone(ZoneId.systemDefault()).toLocalDate()
                     .format(DateTimeFormatter.ISO_DATE)); // 排班日期
+            String outputFilePath = String.format("schedulePlanInfoForTtinfoDetail_(xlid=%s)_foredit-%s",
+                    String.valueOf(xl.getId()), new DateTime().toString("yyyyMMddHHmmss"));
+            ktrParams.put("filepath", dataToolsProperties.getTransTempdir() + File.separator + outputFilePath); // 数据输出文件路径
+
+
             // ---------- 1-2、执行ktr --------- //
             DataToolsFile exportFile = dataToolsService.exportData(ktrParams);
             // ---------- 2、处理生成的导出文件 --------- //
-            TTInfoDetailForEdit.EditInfo viewData = new TTInfoDetailForEdit.EditInfo();
+            PlanInfoEditInfo viewData = new PlanInfoEditInfo();
-            // 将导出的数据表头重新处理一遍，祛除->数字
-            // poi api，并读取第一行数据
+            // ---------- 2-1、获取sheet ------------ //
             org.apache.poi.ss.usermodel.Workbook poi_workbook;
             org.apache.poi.ss.usermodel.Sheet poi_sheet;
             if (DataToolsFileType.XLS.isThisType(exportFile.getFile())) {
@@ -68,35 +70,74 @@ public class TimetableExcelWithPlanInfoViewStrategyImpl implements TimetableExce
             } else {
                 throw new Exception("不是xls xlsx文件!");
             }
-            poi_sheet = poi_workbook.getSheet("Sheet1");
+            poi_sheet = poi_workbook.getSheetAt(0); // 获取第一个Sheet值
             if (poi_sheet == null || poi_sheet.getRow(0) == null) { // 空sheet
                 return viewData;
             }
-            int rownums = poi_sheet.getLastRowNum() + 1;
-            int colnums = poi_sheet.getRow(0).getLastCellNum();
-            Row firstrow = poi_sheet.getRow(0);
-            for (int i = 0; i < colnums; i++) {
-                org.apache.poi.ss.usermodel.Cell cell = firstrow.getCell(i);
-                viewData.getHeader().add(
-                        PoiUtils.getStringValueFromCell(cell).trim().replaceAll("(->\\d+)", ""));
-            }
-
-            for (int i = 1; i < rownums; i++) { // 第二行开始
-                List<TTInfoDetailForEdit.FcInfo> fcInfoList = new ArrayList<>();
-                for (int j = 0; j < colnums; j++) {
+            // ---------- 2-2、处理sheet ------------ //
+            String[] headarrays = new String[maxfcno.intValue() + 4];
+            headarrays[0] = "路牌"; // 第一列
+            headarrays[1] = "驾驶员"; // 第二列
+            headarrays[2] = "自编号"; // 第三列
+            headarrays[3] = "车牌号"; // 第四列
+
+            int rows = poi_sheet.getLastRowNum() + 1; // 总行数
+            for (int r = 1; r < rows; r++) { // 从第二行开始
+                List<SchedulePlanInfo> schedulePlanInfoList = new ArrayList<>();
+                for (int c = 0; c < headarrays.length; c++) {
                     // poi读
-                    String cellContent = PoiUtils.getStringValueFromCell(
-                            poi_sheet.getRow(i).getCell(j)
-                    ).replaceAll("\\s*", "");
+                    String content_str = PoiUtils.getStringValueFromCell(
+                            poi_sheet.getRow(r).getCell(c)
+                    );
+
+                    if (c == 0) { // 路牌列
+                        SchedulePlanInfo lpCol = new SchedulePlanInfo();
+                        lpCol.setLpName(content_str);
+                        schedulePlanInfoList.add(lpCol);
+                    } else if (c == 1) { // 驾驶员列
+                        SchedulePlanInfo jsyCol = new SchedulePlanInfo();
+                        jsyCol.setjName(content_str);
+                        schedulePlanInfoList.add(jsyCol);
+                    } else if (c == 2) { // 自编号列
+                        SchedulePlanInfo zbhCol = new SchedulePlanInfo();
+                        zbhCol.setClZbh(content_str);
+                        schedulePlanInfoList.add(zbhCol);
+                    } else if (c == 3) { // 车牌号列
+                        SchedulePlanInfo cphCol = new SchedulePlanInfo();
+                        cphCol.setClZbh(content_str); // 注意：车牌号也放在自编号字段中
+                        schedulePlanInfoList.add(cphCol);
+                    } else {
+                        if (StringUtils.isEmpty(content_str)) {
+                            // content_str为空，说明当前发车顺序号对应的班次为空，插入一个字段为空的对象
+                            SchedulePlanInfo emptyCol = new SchedulePlanInfo();
+                            schedulePlanInfoList.add(emptyCol);
+                        } else {
+                            String[] content = content_str.split(",");
+
+                            SchedulePlanInfo schedulePlanInfo = new SchedulePlanInfo();
+                            schedulePlanInfo.setId(Long.parseLong(content[0])); // 排班明细Id
+                            schedulePlanInfo.setXlDir(content[1]); // 上下行
+                            schedulePlanInfo.setQdzName(content[2]); // 起点站名字
+                            schedulePlanInfo.setZdzName(content[3]); // 终点站名字
+                            schedulePlanInfo.setFcsj(content[4]); // 发车时间
+                            schedulePlanInfo.setJhlc(Double.valueOf(content[5])); // 计划里程
+                            schedulePlanInfo.setBcsj(Integer.valueOf(content[6])); // 班次时间
+                            schedulePlanInfo.setBcType(content[7]); // 班次类型
+
+                            if (headarrays[c] == null) {
+                                headarrays[c] = content[8]; // 计算的发车站名
+                            }
+
+                            schedulePlanInfoList.add(schedulePlanInfo);
+                        }
+
+                    }
-                    TTInfoDetailForEdit.FcInfo fcInfo = new TTInfoDetailForEdit.FcInfo();
-                    fcInfo.setFcsj(cellContent);
-                    fcInfoList.add(fcInfo);
                 }
-                viewData.getContents().add(fcInfoList);
+                viewData.getContents().add(schedulePlanInfoList);
             }
-
+            viewData.getHeader().addAll(Arrays.asList(headarrays));
             return viewData;
         } catch (Exception exp) {
@@ -127,6 +127,8 @@ public class DataToolsProperties {
     @NotNull
     /** 时刻表导出数据（带排班信息）ktr转换 */
     private String ttinfodetailPlaninfoOutput;
+    /** 时刻表导出数据（带排班信息）编辑用ktr转换 */
+    private String ttinfodetailPlaninfoOutputEdit;
     //------------------------ 数据同步ktr -----------------------//
     @NotNull
@@ -425,4 +427,12 @@ public class DataToolsProperties {
     public void setTtinfodetailPlaninfoOutput(String ttinfodetailPlaninfoOutput) {
         this.ttinfodetailPlaninfoOutput = ttinfodetailPlaninfoOutput;
     }
+
+    public String getTtinfodetailPlaninfoOutputEdit() {
+        return ttinfodetailPlaninfoOutputEdit;
+    }
+
+    public void setTtinfodetailPlaninfoOutputEdit(String ttinfodetailPlaninfoOutputEdit) {
+        this.ttinfodetailPlaninfoOutputEdit = ttinfodetailPlaninfoOutputEdit;
+    }
 }
@@ -83,6 +83,8 @@ datatools.guideboards_dataoutputktr=/datatools/ktrs/guideboardDataOutput.ktr
 datatools.ttinfodetail_planinfo_metaoutput=/datatools/ktrs/planWithScheduleTypeOutputMetaData.ktr
 # 时刻表导出数据（带排班信息）ktr转换
 datatools.ttinfodetail_planinfo_output=/datatools/ktrs/planWithScheduleTypeOutput.ktr
+# 时刻表导出数据（带排班信息）编辑用ktr转换
+datatools.ttinfodetail_planinfo_output_edit=/datatools/ktrs/planWithScheduleTypeOutputForEdit.ktr
 ##--------------------------- 数据同步ktr ------------------------##
 datatools.vehicle_datasyncktr=/datatools/ktrs/vehicleDataSync.ktr
@@ -82,7 +82,8 @@ datatools.guideboards_dataoutputktr=/datatools/ktrs/guideboardDataOutput.ktr
 datatools.ttinfodetail_planinfo_metaoutput=/datatools/ktrs/planWithScheduleTypeOutputMetaData.ktr
 # 时刻表导出数据（带排班信息）ktr转换
 datatools.ttinfodetail_planinfo_output=/datatools/ktrs/planWithScheduleTypeOutput.ktr
-
+# 时刻表导出数据（带排班信息）编辑用ktr转换
+datatools.ttinfodetail_planinfo_output_edit=/datatools/ktrs/planWithScheduleTypeOutputForEdit.ktr
 ##--------------------------- 数据同步ktr ------------------------##
 datatools.vehicle_datasyncktr=/datatools/ktrs/vehicleDataSync.ktr
@@ -83,6 +83,8 @@ datatools.guideboards_dataoutputktr=/datatools/ktrs/guideboardDataOutput.ktr
 datatools.ttinfodetail_planinfo_metaoutput=/datatools/ktrs/planWithScheduleTypeOutputMetaData.ktr
 # 时刻表导出数据（带排班信息）ktr转换
 datatools.ttinfodetail_planinfo_output=/datatools/ktrs/planWithScheduleTypeOutput.ktr
+# 时刻表导出数据（带排班信息）编辑用ktr转换
+datatools.ttinfodetail_planinfo_output_edit=/datatools/ktrs/planWithScheduleTypeOutputForEdit.ktr
 ##--------------------------- 数据同步ktr ------------------------##
 datatools.vehicle_datasyncktr=/datatools/ktrs/vehicleDataSync.ktr
@@ -83,6 +83,8 @@ datatools.guideboards_dataoutputktr=/datatools/ktrs/guideboardDataOutput.ktr
 datatools.ttinfodetail_planinfo_metaoutput=/datatools/ktrs/planWithScheduleTypeOutputMetaData.ktr
 # 时刻表导出数据（带排班信息）ktr转换
 datatools.ttinfodetail_planinfo_output=/datatools/ktrs/planWithScheduleTypeOutput.ktr
+# 时刻表导出数据（带排班信息）编辑用ktr转换
+datatools.ttinfodetail_planinfo_output_edit=/datatools/ktrs/planWithScheduleTypeOutputForEdit.ktr
 ##--------------------------- 数据同步ktr ------------------------##
 datatools.vehicle_datasyncktr=/datatools/ktrs/vehicleDataSync.ktr
 <?xml version="1.0" encoding="UTF-8"?>
 <transformation>
   <info>
-    <name>&#x6392;&#x73ed;&#x8ba1;&#x5212;&#x660e;&#x7ec6;&#xff08;&#x65f6;&#x523b;&#x8868;&#x683c;&#x5f0f;&#xff09;</name>
+    <name>&#x6392;&#x73ed;&#x8ba1;&#x5212;&#x660e;&#x7ec6;&#xff08;&#x65f6;&#x523b;&#x8868;&#x683c;&#x5f0f;&#xff09;&#x5bfc;&#x51fa;</name>
     <description/>
     <extended_description/>
     <trans_version/>
@@ -12,7 +12,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                 restrict: 'E',
                 templateUrl: '/pages/scheduleApp/module/common/dts2/scheduleplan/saPlanInfoViewTemplate.html',
                 scope: { // 独立作用域
-                    ds: "=ngModel"
+                    ds: "=ngModel",
+                    celldbclickFn: "&celldbclick",
                 },
                 controllerAs: "$saPlanInfoViewCtrl",
                 bindToController: true,
@@ -34,8 +35,10 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                         throw new Error("saPlanInfoView指令 name属性required");
                     }
+                    var $attr_celldbclick = tAttrs["celldbclick"]; // 单元格双击事件名
+
                     // 内部controlAs名字
-                    var ctrlAs = '$saTimeTableCtrl';
+                    var ctrlAs = '$saPlanInfoViewCtrl';
                     return {
                         pre: function(scope, element, attr) {
@@ -44,6 +47,23 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                         },
                         post: function(scope, element, attr) {
                             // TODO：
+
+                            // ------------------- dom事件处理function -----------------//
+                            scope[ctrlAs].$$cell_click = function(rowindex, colindex, cell) {
+                                console.log("click " + "row=" + rowindex + ",col=" + colindex);
+                                if (cell.id) { // 有排班明细id的cell才能操作
+                                    cell.sel = !cell.sel; // 是否选中toggle
+                                }
+
+                            };
+                            scope[ctrlAs].$$cell_dbclick = function(rowindex, colindex, cell) {
+                                if (cell.id) { // 有排班明细id的cell才能操作
+                                    if ($attr_celldbclick) {
+                                        // 注意调用方法
+                                        scope[ctrlAs].celldbclickFn()(rowindex, colindex);
+                                    }
+                                }
+                            };
                         }
                     };
@@ -402,14 +402,24 @@
                                             <dd ng-repeat="cell in info track by $index"
                                                 ng-init="colIndex = $index"
-                                                ng-if="$index <= 2" >
-                                                {{cell.fcsj}}
+                                                ng-if="$index == 0" >
+                                                {{cell.lpName}}
+                                            </dd>
+                                            <dd ng-repeat="cell in info track by $index"
+                                                ng-init="colIndex = $index"
+                                                ng-if="$index == 1" >
+                                                {{cell.jName}}
+                                            </dd>
+                                            <dd ng-repeat="cell in info track by $index"
+                                                ng-init="colIndex = $index"
+                                                ng-if="$index == 2" >
+                                                {{cell.clZbh}}
                                             </dd>
                                             <dd ng-repeat="cell in info track by $index"
                                                 ng-init="colIndex = $index"
                                                 ng-if="$index == 3" style="border-right: 2px solid #96b9d7;">
-                                                {{cell.fcsj}}
+                                                {{cell.clZbh}}
                                             </dd>
                                         </dl>
@@ -438,16 +448,18 @@
                                             <dd ng-repeat="cell in info track by $index"
                                                 ng-init="colIndex = $index"
+                                                ng-click="$saPlanInfoViewCtrl.$$cell_click(rowIndex, colIndex, cell)"
+                                                ng-dblclick="$saPlanInfoViewCtrl.$$cell_dbclick(rowIndex, colIndex, cell)"
                                                 ng-if="$index > 3"
                                                 ng-class="{
                                                     lpName: true,
                                                     error: false,
-                                                    active: false,
+                                                    active: cell.sel,
                                                     ists: false,
                                                     region: false,
                                                     isfb: false,
-                                                    outbc: cell.bc_type == 'out',
-                                                    inbc: cell.bc_type == 'in'
+                                                    outbc: cell.bcType == 'out',
+                                                    inbc: cell.bcType == 'in'
                                                     }">
                                                 {{cell.fcsj}}
                                             </dd>
@@ -6622,7 +6622,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                 restrict: 'E',
                 templateUrl: '/pages/scheduleApp/module/common/dts2/scheduleplan/saPlanInfoViewTemplate.html',
                 scope: { // 独立作用域
-                    ds: "=ngModel"
+                    ds: "=ngModel",
+                    celldbclickFn: "&celldbclick",
                 },
                 controllerAs: "$saPlanInfoViewCtrl",
                 bindToController: true,
@@ -6644,8 +6645,10 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                         throw new Error("saPlanInfoView指令 name属性required");
                     }
+                    var $attr_celldbclick = tAttrs["celldbclick"]; // 单元格双击事件名
+
                     // 内部controlAs名字
-                    var ctrlAs = '$saTimeTableCtrl';
+                    var ctrlAs = '$saPlanInfoViewCtrl';
                     return {
                         pre: function(scope, element, attr) {
@@ -6654,6 +6657,23 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                         },
                         post: function(scope, element, attr) {
                             // TODO：
+
+                            // ------------------- dom事件处理function -----------------//
+                            scope[ctrlAs].$$cell_click = function(rowindex, colindex, cell) {
+                                console.log("click " + "row=" + rowindex + ",col=" + colindex);
+                                if (cell.id) { // 有排班明细id的cell才能操作
+                                    cell.sel = !cell.sel; // 是否选中toggle
+                                }
+
+                            };
+                            scope[ctrlAs].$$cell_dbclick = function(rowindex, colindex, cell) {
+                                if (cell.id) { // 有排班明细id的cell才能操作
+                                    if ($attr_celldbclick) {
+                                        // 注意调用方法
+                                        scope[ctrlAs].celldbclickFn()(rowindex, colindex);
+                                    }
+                                }
+                            };
                         }
                     };
@@ -970,7 +970,7 @@ ScheduleApp.config([
                     }]
                 }
             })
-            .state("schedulePlanInfoExtFormManage_edit", { // 修改套跑form
+            .state("schedulePlanInfoExtFormManage_edit", { // 调整路牌班次人员
                 url: '/schedulePlanInfoExtFormManage_edit/:xlId/:xlName/:sd/:lpId/:lpName',
                 views: {
                     "": {templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/report/ext/edit.html'}
@@ -988,10 +988,30 @@ ScheduleApp.config([
                         });
                     }]
                 }
+            })
+            .state("schedulePlanReportExtManageListEdit", { // 修改班次信息
+                url: '/schedulePlanReportExtManageListEdit/:spInfoId',
+                views: {
+                    "": {templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/report/ext/edit-detail.html'}
+                },
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'schedulePlanManage_module',
+                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                            files: [
+                                "assets/bower_components/angular-ui-select/dist/select.min.css",
+                                "assets/bower_components/angular-ui-select/dist/select.min.js",
+                                "pages/scheduleApp/module/core/schedulePlanManage/report/ext/module.js"
+                            ]
+                        });
+                    }]
+                }
             });
     }
-]);
+]);
+
 // ui route 配置
 /** 排班规则模块配置route */
+<div ng-controller="SchedulePlanReportExtManageListEditCtrl as ctrl">
+    <div class="page-head">
+        <div class="page-title">
+            <h1>修改班次信息</h1>
+        </div>
+    </div>
+
+    <ul class="page-breadcrumb breadcrumb">
+        <li>
+            <a href="/pages/home.html" data-pjax>首页</a>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <span class="active">运营计划管理</span>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <a ui-sref="schedulePlanReportExtManage">调度值勤日报</a>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <span class="active">修改班次信息</span>
+        </li>
+    </ul>
+
+    <div class="portlet light bordered">
+        <div class="portlet-title">
+            <div class="caption caption-subject font-red-sunglo bold uppercase">
+                <span ng-bind="ctrl.headInfo.xlName"></span>
+                当前排班日期
+                <span ng-bind="ctrl.schedulePlanInfoForSave.scheduleDate | date: 'yyyy年MM月dd日'"></span>
+            </div>
+        </div>
+
+        <div class="portlet-body form">
+            <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
+                <div class="form-body">
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">线路：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control"
+                                   ng-value="ctrl.headInfo.xlName"
+                                   readonly/>
+                        </div>
+
+                    </div>
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">路牌：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control"
+                                   ng-value="ctrl.headInfo.lpName"
+                                   readonly/>
+                        </div>
+
+                    </div>
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">驾驶员：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control"
+                                   ng-value="ctrl.headInfo.jName"
+                                   readonly/>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">自编号：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control"
+                                   ng-value="ctrl.headInfo.clZbh"
+                                   readonly/>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">车牌号：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control"
+                                   ng-value="ctrl.headInfo.clCph"
+                                   readonly/>
+                        </div>
+
+                    </div>
+
+                    <!--<div class="form-group has-success has-feedback">-->
+                        <!--<label class="col-md-2 control-label">方向*：</label>-->
+                        <!--<div class="col-md-3">-->
+                            <!--<sa-Radiogroup model="ctrl.TimeTableDetailForSave.xlDir" dicgroup="LineTrend" name="xlDir" required></sa-Radiogroup>-->
+                        <!--</div>-->
+                        <!--&lt;!&ndash; 隐藏块，显示验证信息 &ndash;&gt;-->
+                        <!--<div class="alert alert-danger well-sm" ng-show="myForm.xlDir.$error.required">-->
+                            <!--请选择线路上下行-->
+                        <!--</div>-->
+
+                    <!--</div>-->
+
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">起点站：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control"
+                                   ng-value="ctrl.schedulePlanInfoForSave.qdzName"
+                                   readonly/>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">终点站：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control"
+                                   ng-value="ctrl.schedulePlanInfoForSave.zdzName"
+                                   readonly/>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">发车时间*：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control" name="fcsj"
+                                   ng-model="ctrl.schedulePlanInfoForSave.fcsj"
+                                   ng-pattern="ctrl.time_regex"
+                                   required />
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.fcsj.$error.required">
+                            发车时间必须填写
+                        </div>
+                        <div class="alert alert-danger well-sm" ng-show="myForm.fcsj.$error.pattern">
+                            时间格式错误，应该是格式hh:mm，如：06:39
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">计划里程*：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control" name="jhlc"
+                                   ng-model="ctrl.schedulePlanInfoForSave.jhlc" required ng-pattern="ctrl.float_regex"
+                                    />
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.jhlc.$error.required">
+                            计划里程必须填写
+                        </div>
+                        <div class="alert alert-danger well-sm" ng-show="myForm.jhlc.$error.pattern">
+                            输入数字
+                        </div>
+
+                    </div>
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">班次历时*：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control" name="bcsj"
+                                   ng-model="ctrl.schedulePlanInfoForSave.bcsj" required ng-pattern="ctrl.number_regex"
+                                    />
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.bcsj.$error.required">
+                            班次时间必须填写
+                        </div>
+                        <div class="alert alert-danger well-sm" ng-show="myForm.bcsj.$error.pattern">
+                            输入整数
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">班次类型*：</label>
+                        <div class="col-md-3">
+                            <sa-Select5 name="bcType"
+                                        model="ctrl.schedulePlanInfoForSave"
+                                        cmaps="{'bcType': 'code'}"
+                                        dcname="bcType"
+                                        icname="code"
+                                        dsparams="{{ {type: 'dic', param: 'ScheduleType' } | json }}"
+                                        iterobjname="item"
+                                        iterobjexp="item.name"
+                                        searchph="请选择班次类型..."
+                                        searchexp="this.name"
+                                        required
+                                    >
+                            </sa-Select5>
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.bcType.$error.required">
+                            班次类型必须选择
+                        </div>
+
+                    </div>
+
+                </div>
+
+                <div class="form-actions">
+                    <div class="row">
+                        <div class="col-md-offset-3 col-md-4">
+                            <button type="submit" class="btn green"
+                                    ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
+                            <a type="button" class="btn default"
+                               href="javascript:" ng-click="ctrl.cancel()" ><i class="fa fa-times"></i> 取消</a>
+                        </div>
+                    </div>
+                </div>
+            </form>
+
+        </div>
+    </div>
+
+
+
+
+</div>
@@ -32,7 +32,7 @@
             </div>
         </div>
-        <sa-Planinfoview name="saPlanView" ng-model="ctrl.saPlanInfoViewData.infos" ng-model-options="{ getterSetter: true }" >
+        <sa-Planinfoview name="saPlanView" ng-model="ctrl.saPlanInfoViewData.infos" ng-model-options="{ getterSetter: true }" celldbclick="ctrl.singleEditBcDetail">
         </sa-Planinfoview>
     </div>
@@ -9,11 +9,27 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         function(service, service2, $q) {
             /** 当前的查询条件信息 */
             var currentSearchCondition = {};
+            /** 当前视图Id 0:值勤日报视图 1:预览编辑视图 */
+            var viewId = 0;
             // 查询对象
             var queryClass = service.rest;
             return {
+                getViewId: function() {
+                    return viewId;
+                },
+                // callbackFun回调函数，参数1:上一个视图id，参数2:当前视图Id
+                switchView: function(callbackFun) {
+                    if (viewId === 0) {
+                        viewId = 1;
+                        callbackFun(0, 1);
+                    } else {
+                        viewId = 0;
+                        callbackFun(1, 0);
+                    }
+                },
+
                 getQueryClass: function() {
                     return queryClass;
                 },
@@ -290,32 +306,35 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.saPlanInfoViewData = {
                 infos: {}
             };
-            self.viewId = 0;
+            self.viewId = service.getViewId();
+
+            if (self.viewId === 1) { // 是从其他state转换过来的，数据也需要初始化一次
+                service.getSaPlanInfoViewData().then(
+                    function(rst) {
+                        self.saPlanInfoViewData.infos = rst;
+
+                        console.log(self.saPlanInfoViewData.infos);
+                    },
+                    function(err) {
+
+                    }
+                );
+            }
+
             self.switchView = function() {
-                if (self.viewId === 0) {
-                    self.viewId = 1;
-                    if (service.getSaPlanInfoViewData() != null) {
-                        service.getSaPlanInfoViewData().then(
+                var saPlanInfoViewDataPromise = service.getSaPlanInfoViewData();
+                if (saPlanInfoViewDataPromise == null) {
+                    alert("请选择线路和排班日期！");
+                    return;
+                }
+
+                service.switchView(function(preViewId, currentViewId) {
+                    self.viewId = currentViewId;
+                    if (currentViewId === 1) {
+                        saPlanInfoViewDataPromise.then(
                             function(rst) {
                                 self.saPlanInfoViewData.infos = rst;
-                                /*
-                                    注意：后台是没有传过来班次类型，这里通过head来判定是否进出场班次
-                                    TODO：如果以后要标识新的班次类型，甚至要修改班次内容，后台可能要大改（可能要改回时刻表编辑的做法）
-                                    TODO：注意，调度执勤日报时刻表视图后台etl用的是导出的etl，所以要加复杂功能的话可能还得拆成2个etl
-                                 */
-                                var _headers = rst.header;
-                                for (var i = 0; i < rst.contents.length; i++) {
-                                    for (var j = 0; j < rst.contents[i].length; j++) {
-                                        if (_headers[j].indexOf("出场") >= 0) {
-                                            self.saPlanInfoViewData.infos.contents[i][j].bc_type = "out";
-                                        }
-                                        if (_headers[j].indexOf("进场") >= 0) {
-                                            self.saPlanInfoViewData.infos.contents[i][j].bc_type = "in";
-                                        }
-                                    }
-                                }
-
                                 console.log(self.saPlanInfoViewData.infos);
                             },
                             function(err) {
@@ -323,19 +342,103 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                             }
                         );
                     }
-                } else {
-                    self.viewId = 0;
-                }
+                });
             };
             self.ttHeight = 500; // sa-Planinfoview组件的高度
+
+            /**
+             * 单独修改班次明细。
+             */
+            self.singleEditBcDetail = function(rowNum, colNum) {
+
+                console.log(rowNum + "," + colNum);
+
+                $state.go('schedulePlanReportExtManageListEdit',
+                    {
+                        spInfoId: self.saPlanInfoViewData.infos.contents[rowNum][colNum]["id"]
+                    });
+            };
+
         }
     ]
 );
+// edit.detail页面
+angular.module('ScheduleApp').controller(
+    'SchedulePlanReportExtManageListEditCtrl',
+    [
+        'SchedulePlanInfoManageService_g',
+        'BusInfoManageService_g',
+        '$stateParams',
+        '$state',
+        'SaTimeTableUtils',
+        function(spInfoservice, carService, $stateParams, $state, SaTimeTableUtils) {
+            var self = this;
+
+            console.log($stateParams.spInfoId);
+
+            // 其他的显示数据
+            self.headInfo = {
+                xlName: '', // 线路名称
+                lpName: '', // 路牌名称
+                jName: '', // 驾驶员
+                clZbh: '', // 自编号
+                clCph: '', // 车牌号
+            };
+
+            // 排班明细对象
+            var SchedulePlanInfo = spInfoservice.rest;
+            // 车辆信息对象
+            var Cars = carService.rest;
+
+            // 保存的排班明细数据
+            self.schedulePlanInfoForSave = {};
+            // 获取数据
+            SchedulePlanInfo.get({id: $stateParams.spInfoId}, function(value) {
+                self.schedulePlanInfoForSave = value;
+
+                self.headInfo['xlName'] = value['xlName'];
+                self.headInfo['lpName'] = value['lpName'];
+                self.headInfo['jName'] = value['jName'];
+                self.headInfo['clZbh'] = value['clZbh'];
+
+                Cars.get({id: value.cl}, function(value2) {
+                    self.headInfo['clCph'] = value2['carPlate'];
+                });
+            });
+
+            // 时间正则表达式（格式hh:mm，如：06:39）
+            self.time_regex = /^([01]?[0-9]|2[0-3]):[0-5][0-9]$/;
+            // 整数
+            self.number_regex = /^-?\d+$/;
+            // 小数
+            self.float_regex = /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)?$/;
+
+            // 提交方法
+            self.submit = function() {
+                self.schedulePlanInfoForSave.$save(function() {
+                    $state.go("schedulePlanReportExtManage");
+                });
+            };
+            // 取消方法
+            self.cancel = function() {
+                $state.go("schedulePlanReportExtManage");
+            };
+
+        }
+    ]
+);
+
+
+
+
+
+
+
 // edit.html页面
 angular.module('ScheduleApp').controller(
     'ScheduleRuleManageExtFormCtrl',
@@ -34,7 +34,7 @@ ScheduleApp.config([
                     }]
                 }
             })
-            .state("schedulePlanInfoExtFormManage_edit", { // 修改套跑form
+            .state("schedulePlanInfoExtFormManage_edit", { // 调整路牌班次人员
                 url: '/schedulePlanInfoExtFormManage_edit/:xlId/:xlName/:sd/:lpId/:lpName',
                 views: {
                     "": {templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/report/ext/edit.html'}
@@ -52,7 +52,26 @@ ScheduleApp.config([
                         });
                     }]
                 }
+            })
+            .state("schedulePlanReportExtManageListEdit", { // 修改班次信息
+                url: '/schedulePlanReportExtManageListEdit/:spInfoId',
+                views: {
+                    "": {templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/report/ext/edit-detail.html'}
+                },
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'schedulePlanManage_module',
+                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                            files: [
+                                "assets/bower_components/angular-ui-select/dist/select.min.css",
+                                "assets/bower_components/angular-ui-select/dist/select.min.js",
+                                "pages/scheduleApp/module/core/schedulePlanManage/report/ext/module.js"
+                            ]
+                        });
+                    }]
+                }
             });
     }
-]);
 \ No newline at end of file
+]);