Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 7ef221ef c3bea204
Showing 9 changed files with 761 additions and 487 deletions
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/plan/PlanCalcuParam_input.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/GidFbTimeFunction.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/GidsCountFunction.java
src/main/resources/rules/functions.drl
src/main/resources/rules/plan.drl
src/main/resources/static/pages/forms/statement/waybillBf.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/add_temp_sch.html
@@ -49,7 +49,7 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "where info.xl = ?1 and " +
             "info.schedule_date = ?2 " +
             "group by info.xl_name, info.schedule_date, info.lp, info.lp_name, info.cl, info.cl_zbh " +
-            "order by info.xl_name, info.schedule_date, info.lp ", nativeQuery = true)
+            "order by info.xl_name, info.schedule_date, info.lp, info.fcno ", nativeQuery = true)
     List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate);
     @Modifying
 package com.bsth.service.schedule.impl;
-import com.bsth.entity.Business;
 import com.bsth.entity.Line;
-import com.bsth.entity.schedule.*;
+import com.bsth.entity.schedule.SchedulePlan;
+import com.bsth.entity.schedule.TTInfo;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.repository.schedule.SchedulePlanRepository;
@@ -12,7 +12,6 @@ import com.bsth.service.schedule.*;
 import com.bsth.service.schedule.rules.plan.PlanCalcuParam_input;
 import com.bsth.service.schedule.rules.plan.PlanResult;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
 import com.bsth.service.schedule.rules.strategy.IStrategy;
@@ -21,8 +20,6 @@ import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
 import com.bsth.service.schedule.rules.ttinfo.TTInfo_input;
 import com.bsth.service.schedule.rules.ttinfo2.CalcuParam;
 import com.bsth.service.schedule.rules.ttinfo2.Result;
-import com.google.common.collect.Multimap;
-import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieSession;
@@ -209,6 +206,8 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         session.setGlobal("tTInfoDetailService", ttInfoDetailService);
         session.setGlobal("carConfigInfoService", carConfigInfoService);
         session.setGlobal("employeeConfigInfoService", employeeConfigInfoService);
+        session.setGlobal("lineService", lineService);
+        session.setGlobal("businessService", businessService);
         session.setGlobal("log", logger); // 设置日志
         // 载入数据
@@ -233,168 +232,177 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         // 3、计划输出
         PlanResult planResult = planResultOutput(schedulePlan, scheduleResults_output, ttInfoResults_output);
-        // TODO：
+        schedulePlan.getSchedulePlanInfoList().addAll(planResult.getSchedulePlanInfos());
+        schedulePlan.setTtInfoId("todo"); // TODO：待修正
+        schedulePlan.setTtInfoNames("todo"); // TODO：待修正
+
+        super.save(schedulePlan);
         return new SchedulePlan();
     }
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
     public SchedulePlan save(SchedulePlan schedulePlan) {
-        // 测试
-//        return save2(schedulePlan);
-
-        // 1-1、查找线路具体信息
-        Line xl = strategy.getLine(schedulePlan.getXl().getId());
-        // 1-2、查出指定线路的所有规则
-        TTInfo ttInfo = strategy.getTTInfo(xl.getId()).get(0); // 时刻表id
-        schedulePlan.setTtInfo(ttInfo); // TODO：关联的时刻表，之后改掉
-
-        // 2-1、构造drools规则输入数据，输出数据
-        // 全局计算参数
-        ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input(schedulePlan);
-        // 每个规则对应的输入参数
-        List<ScheduleRule_input> scheduleRule_inputs = new ArrayList<>();
-        Iterator<ScheduleRule1Flat> scheduleRule1FlatIterator = strategy.getScheduleRule(xl.getId()).iterator();
-        while (scheduleRule1FlatIterator.hasNext()) {
-            ScheduleRule1Flat scheduleRule1Flat_temp = scheduleRule1FlatIterator.next();
-            ScheduleRule_input scheduleRule_input = new ScheduleRule_input(scheduleRule1Flat_temp);
-            scheduleRule_inputs.add(scheduleRule_input);
-        }
-        // 规则输出数据
-        ScheduleResults_output scheduleResults_output = new ScheduleResults_output();
-
-        // 2-2、构造drools session->载入数据->启动规则->计算->销毁session
-        // 创建session，内部配置的是stateful
-        KieSession session = kieBase.newKieSession();
-        // 设置gloable对象，在drl中通过别名使用
-        session.setGlobal("scheduleResult", scheduleResults_output);
-        session.setGlobal("log", logger); // 设置日志
-
-        // 载入数据
-        session.insert(scheduleCalcuParam_input);
-        for (ScheduleRule_input scheduleRule_input : scheduleRule_inputs) {
-            session.insert(scheduleRule_input);
-        }
-        // 执行rule
-        session.fireAllRules();
-
-        // 执行完毕销毁，有日志的也要关闭
-        session.dispose();
-
-        System.out.println(scheduleResults_output.showGuideboardDesc1());
-
         // 2-3、如果排班的数据之前已经有了，删除之前的数据
         schedulePlanInfoRepository.deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(
-                xl.getId(), schedulePlan.getScheduleFromTime(), schedulePlan.getScheduleToTime()
+                schedulePlan.getXl().getId(), schedulePlan.getScheduleFromTime(), schedulePlan.getScheduleToTime()
         );
-        // 3、根据规则返回，组合最后的输出数据
-        // 3-1、根据注入的策略服务，获取原始数据
-        Map<Date, Multimap<Long, TTInfoDetail>> gbdTTinfoMaps = strategy.getGuideboardXlTTInfoDetailMaps(
-                xl.getId(), schedulePlan.getScheduleFromTime(), schedulePlan.getScheduleToTime());
-
-        Map<Long, CarConfigInfo> carConfigMaps = strategy.getCarConfigMaps(xl.getId()); // 车辆配置对应车辆信息
-        Map<Long, EmployeeConfigInfo> employeeConfigMaps = strategy.getEmployeeConfigMaps(xl.getId()); // 人员配置对应的人员信息
-
-        // 3-2、循环规则输出
-        Map<Long, String> ttInfoMap = new HashMap<>(); // 时刻表映射，id和名字
-        List<SchedulePlanInfo> schedulePlanInfos = new ArrayList<>();
-        for (ScheduleResult_output scheduleResult_output : scheduleResults_output.getResults()) {
-            // 车辆配置对应的车辆
-            CarConfigInfo configInfo = carConfigMaps.get(Long.valueOf(scheduleResult_output.getCarConfigId()));
-            // 人员配置对应的人员，这里需要分班处理的
-            List<EmployeeConfigInfo> employeeConfigInfoList = new ArrayList<>();
-            String[] eids = scheduleResult_output.getEmployeeConfigId().split("-");
-            for (String eid : eids) {
-                employeeConfigInfoList.add(employeeConfigMaps.get(Long.valueOf(eid)));
-            }
-            // 排班明细（这个要迭代的）
-            Collection<TTInfoDetail> ttInfoDetails_ = gbdTTinfoMaps.get(scheduleResult_output.getSd().toDate()).get(
-                    Long.parseLong(scheduleResult_output.getGuideboardId()));
-            List<TTInfoDetail> ttInfoDetails = new ArrayList<>(ttInfoDetails_);
-
-            // 排序ttInfoDetails
-            Collections.sort(ttInfoDetails, new Comparator<TTInfoDetail>() {
-                @Override
-                public int compare(TTInfoDetail o1, TTInfoDetail o2) {
-                    return o1.getFcno().compareTo(o2.getFcno());
-                }
-            });
-
-            Boolean isFb = false; // 是否分班
-            for (int i = 0; i < ttInfoDetails.size(); i++) {
-                TTInfoDetail ttInfoDetail = ttInfoDetails.get(i);
-
-                if (ttInfoDetail.getIsFB())
-                    isFb = ttInfoDetail.getIsFB();
-
-                SchedulePlanInfo schedulePlanInfo = new SchedulePlanInfo(
-                        xl,
-                        scheduleResult_output,
-                        ttInfoDetail,
-                        isFb,
-                        configInfo,
-                        employeeConfigInfoList,
-                        schedulePlan,
-                        i == 0,
-                        i == ttInfoDetails.size() - 1);
-
-                // 获取公司，分公司信息
-                String gsbm = xl.getCompany();
-                String fgsbm = xl.getBrancheCompany();
-                Business gs = null;
-                Business fgs = null;
-
-                Map<String, Object> param = new HashMap<>();
-
-                if (StringUtils.isNotEmpty(gsbm)) {
-                    param.clear();
-                    param.put("businessCode_eq", gsbm);
-                    Iterator<Business> businessIterator = businessService.list(param).iterator();
-                    if (businessIterator.hasNext()) {
-                        gs = businessIterator.next();
-                    }
-                }
-                if (StringUtils.isNotEmpty(gsbm) && StringUtils.isNotEmpty(fgsbm)) {
-                    param.clear();;
-                    param.put("upCode_eq", gsbm);
-                    param.put("businessCode_eq", fgsbm);
-                    Iterator<Business> businessIterator = businessService.list(param).iterator();
-                    if (businessIterator.hasNext()) {
-                        fgs = businessIterator.next();
-                    }
-                }
-
-                if (gs != null) {
-                    schedulePlanInfo.setGsBm(gs.getBusinessCode());
-                    schedulePlanInfo.setGsName(gs.getBusinessName());
-                }
-                if (fgs != null) {
-                    schedulePlanInfo.setFgsBm(fgs.getBusinessCode());
-                    schedulePlanInfo.setFgsName(fgs.getBusinessName());
-                }
-
-                // 操作人，操作时间
-                schedulePlanInfo.setCreateBy(schedulePlan.getCreateBy());
-                schedulePlanInfo.setCreateDate(schedulePlan.getCreateDate());
-                schedulePlanInfo.setUpdateBy(schedulePlan.getUpdateBy());
-                schedulePlanInfo.setUpdateDate(schedulePlan.getUpdateDate());
-
-                schedulePlanInfos.add(schedulePlanInfo);
-                ttInfoMap.put(ttInfoDetail.getTtinfo().getId(), ttInfoDetail.getTtinfo().getName());
-
-            }
-
-        }
-
-        schedulePlan.setTtInfoId(StringUtils.join(ttInfoMap.keySet(), ","));
-        schedulePlan.setTtInfoNames(StringUtils.join(ttInfoMap.values(), ","));
-
-        // 3-2、保存生成的排班和明细
-        schedulePlan.getSchedulePlanInfoList().addAll(schedulePlanInfos); // 关联的排班明细信息
-        super.save(schedulePlan);
-
-        return new SchedulePlan();
+        // 测试
+        return save2(schedulePlan);
+
+//        // 1-1、查找线路具体信息
+//        Line xl = strategy.getLine(schedulePlan.getXl().getId());
+//        // 1-2、查出指定线路的所有规则
+//        TTInfo ttInfo = strategy.getTTInfo(xl.getId()).get(0); // 时刻表id
+//        schedulePlan.setTtInfo(ttInfo); // TODO：关联的时刻表，之后改掉
+//
+//        // 2-1、构造drools规则输入数据，输出数据
+//        // 全局计算参数
+//        ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input(schedulePlan);
+//        // 每个规则对应的输入参数
+//        List<ScheduleRule_input> scheduleRule_inputs = new ArrayList<>();
+//        Iterator<ScheduleRule1Flat> scheduleRule1FlatIterator = strategy.getScheduleRule(xl.getId()).iterator();
+//        while (scheduleRule1FlatIterator.hasNext()) {
+//            ScheduleRule1Flat scheduleRule1Flat_temp = scheduleRule1FlatIterator.next();
+//            ScheduleRule_input scheduleRule_input = new ScheduleRule_input(scheduleRule1Flat_temp);
+//            scheduleRule_inputs.add(scheduleRule_input);
+//        }
+//        // 规则输出数据
+//        ScheduleResults_output scheduleResults_output = new ScheduleResults_output();
+//
+//        // 2-2、构造drools session->载入数据->启动规则->计算->销毁session
+//        // 创建session，内部配置的是stateful
+//        KieSession session = kieBase.newKieSession();
+//        // 设置gloable对象，在drl中通过别名使用
+//        session.setGlobal("scheduleResult", scheduleResults_output);
+//        session.setGlobal("log", logger); // 设置日志
+//
+//        // 载入数据
+//        session.insert(scheduleCalcuParam_input);
+//        for (ScheduleRule_input scheduleRule_input : scheduleRule_inputs) {
+//            session.insert(scheduleRule_input);
+//        }
+//        // 执行rule
+//        session.fireAllRules();
+//
+//        // 执行完毕销毁，有日志的也要关闭
+//        session.dispose();
+//
+//        System.out.println(scheduleResults_output.showGuideboardDesc1());
+//
+//        // 2-3、如果排班的数据之前已经有了，删除之前的数据
+//        schedulePlanInfoRepository.deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(
+//                xl.getId(), schedulePlan.getScheduleFromTime(), schedulePlan.getScheduleToTime()
+//        );
+//
+//        // 3、根据规则返回，组合最后的输出数据
+//        // 3-1、根据注入的策略服务，获取原始数据
+//        Map<Date, Multimap<Long, TTInfoDetail>> gbdTTinfoMaps = strategy.getGuideboardXlTTInfoDetailMaps(
+//                xl.getId(), schedulePlan.getScheduleFromTime(), schedulePlan.getScheduleToTime());
+//
+//        Map<Long, CarConfigInfo> carConfigMaps = strategy.getCarConfigMaps(xl.getId()); // 车辆配置对应车辆信息
+//        Map<Long, EmployeeConfigInfo> employeeConfigMaps = strategy.getEmployeeConfigMaps(xl.getId()); // 人员配置对应的人员信息
+//
+//        // 3-2、循环规则输出
+//        Map<Long, String> ttInfoMap = new HashMap<>(); // 时刻表映射，id和名字
+//        List<SchedulePlanInfo> schedulePlanInfos = new ArrayList<>();
+//        for (ScheduleResult_output scheduleResult_output : scheduleResults_output.getResults()) {
+//            // 车辆配置对应的车辆
+//            CarConfigInfo configInfo = carConfigMaps.get(Long.valueOf(scheduleResult_output.getCarConfigId()));
+//            // 人员配置对应的人员，这里需要分班处理的
+//            List<EmployeeConfigInfo> employeeConfigInfoList = new ArrayList<>();
+//            String[] eids = scheduleResult_output.getEmployeeConfigId().split("-");
+//            for (String eid : eids) {
+//                employeeConfigInfoList.add(employeeConfigMaps.get(Long.valueOf(eid)));
+//            }
+//            // 排班明细（这个要迭代的）
+//            Collection<TTInfoDetail> ttInfoDetails_ = gbdTTinfoMaps.get(scheduleResult_output.getSd().toDate()).get(
+//                    Long.parseLong(scheduleResult_output.getGuideboardId()));
+//            List<TTInfoDetail> ttInfoDetails = new ArrayList<>(ttInfoDetails_);
+//
+//            // 排序ttInfoDetails
+//            Collections.sort(ttInfoDetails, new Comparator<TTInfoDetail>() {
+//                @Override
+//                public int compare(TTInfoDetail o1, TTInfoDetail o2) {
+//                    return o1.getFcno().compareTo(o2.getFcno());
+//                }
+//            });
+//
+//            Boolean isFb = false; // 是否分班
+//            for (int i = 0; i < ttInfoDetails.size(); i++) {
+//                TTInfoDetail ttInfoDetail = ttInfoDetails.get(i);
+//
+//                if (ttInfoDetail.getIsFB())
+//                    isFb = ttInfoDetail.getIsFB();
+//
+//                SchedulePlanInfo schedulePlanInfo = new SchedulePlanInfo(
+//                        xl,
+//                        scheduleResult_output,
+//                        ttInfoDetail,
+//                        isFb,
+//                        configInfo,
+//                        employeeConfigInfoList,
+//                        schedulePlan,
+//                        i == 0,
+//                        i == ttInfoDetails.size() - 1);
+//
+//                // 获取公司，分公司信息
+//                String gsbm = xl.getCompany();
+//                String fgsbm = xl.getBrancheCompany();
+//                Business gs = null;
+//                Business fgs = null;
+//
+//                Map<String, Object> param = new HashMap<>();
+//
+//                if (StringUtils.isNotEmpty(gsbm)) {
+//                    param.clear();
+//                    param.put("businessCode_eq", gsbm);
+//                    Iterator<Business> businessIterator = businessService.list(param).iterator();
+//                    if (businessIterator.hasNext()) {
+//                        gs = businessIterator.next();
+//                    }
+//                }
+//                if (StringUtils.isNotEmpty(gsbm) && StringUtils.isNotEmpty(fgsbm)) {
+//                    param.clear();;
+//                    param.put("upCode_eq", gsbm);
+//                    param.put("businessCode_eq", fgsbm);
+//                    Iterator<Business> businessIterator = businessService.list(param).iterator();
+//                    if (businessIterator.hasNext()) {
+//                        fgs = businessIterator.next();
+//                    }
+//                }
+//
+//                if (gs != null) {
+//                    schedulePlanInfo.setGsBm(gs.getBusinessCode());
+//                    schedulePlanInfo.setGsName(gs.getBusinessName());
+//                }
+//                if (fgs != null) {
+//                    schedulePlanInfo.setFgsBm(fgs.getBusinessCode());
+//                    schedulePlanInfo.setFgsName(fgs.getBusinessName());
+//                }
+//
+//                // 操作人，操作时间
+//                schedulePlanInfo.setCreateBy(schedulePlan.getCreateBy());
+//                schedulePlanInfo.setCreateDate(schedulePlan.getCreateDate());
+//                schedulePlanInfo.setUpdateBy(schedulePlan.getUpdateBy());
+//                schedulePlanInfo.setUpdateDate(schedulePlan.getUpdateDate());
+//
+//                schedulePlanInfos.add(schedulePlanInfo);
+//                ttInfoMap.put(ttInfoDetail.getTtinfo().getId(), ttInfoDetail.getTtinfo().getName());
+//
+//            }
+//
+//        }
+//
+//        schedulePlan.setTtInfoId(StringUtils.join(ttInfoMap.keySet(), ","));
+//        schedulePlan.setTtInfoNames(StringUtils.join(ttInfoMap.values(), ","));
+//
+//        // 3-2、保存生成的排班和明细
+//        schedulePlan.getSchedulePlanInfoList().addAll(schedulePlanInfos); // 关联的排班明细信息
+//        super.save(schedulePlan);
+//
+//        return new SchedulePlan();
     }
     @Override
@@ -8,8 +8,10 @@ import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
  * 排班规则-规则输入参数。
  */
 public class PlanCalcuParam_input {
-    /** 线路id */
-    private Integer xlId;
+    /** 线路Id */
+    private String xlId;
+    /** 计划主对象 */
+    private SchedulePlan schedulePlan;
     /** 循环规则输出 */
     private ScheduleResults_output scheduleResults_output;
     /** 时刻表选择规则输出 */
@@ -21,16 +23,17 @@ public class PlanCalcuParam_input {
             SchedulePlan schedulePlan,
             ScheduleResults_output scheduleResults_output,
             TTInfoResults_output ttInfoResults_output) {
-        this.xlId = schedulePlan.getXl().getId();
+        this.schedulePlan = schedulePlan;
+        this.xlId = String.valueOf(schedulePlan.getXl().getId());
         this.scheduleResults_output = scheduleResults_output;
         this.ttInfoResults_output = ttInfoResults_output;
     }
-    public Integer getXlId() {
+    public String getXlId() {
         return xlId;
     }
-    public void setXlId(Integer xlId) {
+    public void setXlId(String xlId) {
         this.xlId = xlId;
     }
@@ -49,4 +52,12 @@ public class PlanCalcuParam_input {
     public void setTtInfoResults_output(TTInfoResults_output ttInfoResults_output) {
         this.ttInfoResults_output = ttInfoResults_output;
     }
+
+    public SchedulePlan getSchedulePlan() {
+        return schedulePlan;
+    }
+
+    public void setSchedulePlan(SchedulePlan schedulePlan) {
+        this.schedulePlan = schedulePlan;
+    }
 }
+package com.bsth.service.schedule.rules.shiftloop;
+
+import com.bsth.entity.schedule.TTInfoDetail;
+import org.joda.time.LocalTime;
+import org.joda.time.format.DateTimeFormat;
+import org.kie.api.runtime.rule.AccumulateFunction;
+
+import java.io.*;
+
+/**
+ * 时刻表路牌下的分班时间（起始时间）。
+ */
+public class GidFbTimeFunction implements AccumulateFunction {
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    }
+
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+    }
+
+    protected static class GidFbTimeData implements Externalizable {
+        public LocalTime fbsj;
+        public String fbsj_str;
+        public TTInfoDetail ttInfoDetail;
+
+        public GidFbTimeData() {}
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            fbsj_str = (String) in.readObject();
+            ttInfoDetail = (TTInfoDetail) in.readObject();
+        }
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeObject(fbsj_str);
+            out.writeObject(ttInfoDetail);
+        }
+    }
+
+    @Override
+    public Serializable createContext() {
+        return new GidFbTimeData();
+    }
+
+    @Override
+    public void init(Serializable context) throws Exception {
+        GidFbTimeData gidFbTimeData = (GidFbTimeData) context;
+        gidFbTimeData.fbsj_str = "NULL"; // 注意：因为空的时间也要规则执行，所以返回一个表示空的字符串
+    }
+
+    @Override
+    public void accumulate(Serializable context, Object value) {
+        GidFbTimeData gidFbTimeData = (GidFbTimeData) context;
+        TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
+
+        // 1块路牌有多个分班班次，取最早的时间作为起始分班时间
+        if (ttInfoDetail.getIsFB()) {
+            LocalTime localTime = LocalTime.parse(ttInfoDetail.getFcsj(), DateTimeFormat.forPattern("HH:mm"));
+
+            if (gidFbTimeData.fbsj == null) {
+                gidFbTimeData.fbsj = localTime;
+                gidFbTimeData.fbsj_str = ttInfoDetail.getFcsj();
+            } else if (localTime.isBefore(gidFbTimeData.fbsj)) {
+                gidFbTimeData.fbsj = localTime;
+                gidFbTimeData.fbsj_str = ttInfoDetail.getFcsj();
+            }
+        }
+    }
+
+    @Override
+    public void reverse(Serializable serializable, Object o) throws Exception {
+
+    }
+
+    @Override
+    public boolean supportsReverse() {
+        return false;
+    }
+
+    @Override
+    public Class<?> getResultType() {
+        return String.class;
+    }
+
+    @Override
+    public Object getResult(Serializable context) throws Exception {
+        GidFbTimeData gidFbTimeData = (GidFbTimeData) context;
+        return gidFbTimeData.fbsj_str;
+    }
+}
+package com.bsth.service.schedule.rules.shiftloop;
+
+import com.bsth.entity.schedule.TTInfoDetail;
+import org.kie.api.runtime.rule.AccumulateFunction;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 计算时刻表里的路爬列表。
+ */
+public class GidsCountFunction implements AccumulateFunction {
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    }
+
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+    }
+
+    protected static class GidsCountData implements Externalizable {
+        public List<String> gids = new ArrayList<>();
+        public Set<String> gids_temp = new HashSet<>();
+        public TTInfoDetail ttInfoDetail;
+
+        public GidsCountData() {}
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            gids = (List<String>) in.readObject();
+            ttInfoDetail = (TTInfoDetail) in.readObject();
+        }
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeObject(gids);
+            out.writeObject(ttInfoDetail);
+        }
+    }
+
+    @Override
+    public Serializable createContext() {
+        return new GidsCountData();
+    }
+
+    @Override
+    public void init(Serializable context) throws Exception {
+        GidsCountData gidsCountData = (GidsCountData) context;
+        gidsCountData.gids = new ArrayList<>();
+        gidsCountData.gids_temp = new HashSet<>();
+    }
+
+    @Override
+    public void accumulate(Serializable context, Object value) {
+        GidsCountData gidsCountData = (GidsCountData) context;
+        TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
+
+        if (ttInfoDetail.getLp() != null) {
+            gidsCountData.gids_temp.add(
+                    String.valueOf(ttInfoDetail.getLp().getId()));
+            gidsCountData.gids.clear();
+            gidsCountData.gids.addAll(gidsCountData.gids_temp);
+        }
+
+        // TODO：以后还需要按照路牌排序
+    }
+
+    @Override
+    public void reverse(Serializable serializable, Object o) throws Exception {
+
+    }
+
+    @Override
+    public boolean supportsReverse() {
+        return false;
+    }
+
+    @Override
+    public Object getResult(Serializable context) throws Exception {
+        GidsCountData gidsCountData = (GidsCountData) context;
+        return gidsCountData.gids;
+
+    }
+
+    @Override
+    public Class<?> getResultType() {
+        return List.class;
+    }
+}
 package com.bsth.service.schedule;
-import accumulate com.bsth.service.schedule.rules.ttinfo2.ErrorBcCountFunction ecount;
 \ No newline at end of file
+import accumulate com.bsth.service.schedule.rules.ttinfo2.ErrorBcCountFunction ecount;
+import accumulate com.bsth.service.schedule.rules.shiftloop.GidsCountFunction gidscount;
+import accumulate com.bsth.service.schedule.rules.shiftloop.GidFbTimeFunction gidfbtime;
 \ No newline at end of file
@@ -10,10 +10,15 @@ import com.bsth.service.schedule.TTInfoService;
 import com.bsth.service.schedule.TTInfoDetailService;
 import com.bsth.service.schedule.CarConfigInfoService;
 import com.bsth.service.schedule.EmployeeConfigInfoService;
+import com.bsth.service.LineService;
+import com.bsth.service.BusinessService;
+
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
 import com.bsth.service.schedule.rules.ttinfo.TTInfoResult_output;
 import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
+import com.bsth.entity.Line;
+import com.bsth.entity.Business;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
@@ -21,7 +26,9 @@ import com.bsth.entity.schedule.TTInfo;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.entity.schedule.SchedulePlanInfo;
-import org.slf4j.Logger;
+import org.slf4j.Logger
+import org.joda.time.format.DateTimeFormat
+import org.apache.commons.lang3.StringUtils;
 // 全局日志类（一般使用调用此规则的service类）
@@ -30,6 +37,8 @@ global TTInfoDetailService tTInfoDetailService;
 global TTInfoService tTInfoService;
 global CarConfigInfoService carConfigInfoService;
 global EmployeeConfigInfoService employeeConfigInfoService;
+global LineService lineService;
+global BusinessService businessService;
 // 输出
 global PlanResult planResult;
@@ -40,24 +49,46 @@ function Map ttidParams(String ttid) {
     return param;
 }
-function Map xlidParams(Integer xlid) {
+function Map xlidParams(String xlid) {
     Map param = new HashMap();
-    param.put("xl.id_eq", xlid);
+    param.put("xl.id_eq", Integer.valueOf(xlid));
     return param;
 }
+function List ecList(EmployeeConfigInfoService service, String ecids) {
+    List<String> ids = Arrays.asList(ecids.split("-"));
+    List rst = new ArrayList();
+    for (int i = 0; i < ids.size(); i++) {
+        rst.add(service.findById(Long.parseLong(ids.get(i))));
+    }
+    return rst;
+}
+
+function LocalTime fcsjTime(String fcsj) {
+    if ("NULL".equals(fcsj)) {
+        return null;
+    }
+    return LocalTime.parse(fcsj, DateTimeFormat.forPattern("HH:mm"));
+}
+
+function String ttInfoId_sd(Map map, DateTime sd) {
+    TTInfoResult_output ttInfoResult_output = (TTInfoResult_output) map.get(sd);
+    return ttInfoResult_output.getTtInfoId();
+}
+
 /*
     规则说明：
-    1、根据循环规则输出，时刻表选择规则输出，计算排班明细
+    根据循环规则输出，时刻表选择规则输出，组合计算排班明细
 */
 //-------------------- 第一阶段、计算迭代数据 -----------------//
 declare Loop_result
-    xlId: Integer // 线路id
+    xlId: String // 线路id
+
     ruleLoop: List // 每天分配的规则 List<ScheduleResult_output>
+
     ttInfoMapLoop_temp: Map // 每天分配的时刻表 Map<DataTime, Collection<TTInfoResult_output>>
     ttInfoMapLoop: Map // 每天分配的时刻表 Map<DataTime, TTInfoResult_output>
-
     ttInfoMap: Map // 总共用到的时刻表 Map<id, TTInfoResult_output>
 end
@@ -107,31 +138,7 @@ end
 //-------------------- 第二阶段、将时刻表班次，车辆配置，人员配置信息载入 -----------------//
-declare TTInfoDetail_Wrap
-    ttInfoId: String // 时刻表id（cast字符串-方便比较）
-    gid: String // 路牌id（cast字符串-方便比较）
-
-    self: TTInfoDetail // 原始数据
-end
-
-rule "calcu_TTInfoDetail_Wrap"
-    salience 800
-    when
-        $lr: Loop_result($xlId: xlId)
-        $ttInfoId: String() from $lr.getTtInfoMap().keySet()
-        $ttInfoDetail: TTInfoDetail() from tTInfoDetailService.list(ttidParams($ttInfoId))
-    then
-        TTInfoDetail_Wrap ttInfoDetail_wrap = new TTInfoDetail_Wrap();
-        ttInfoDetail_wrap.setTtInfoId($ttInfoId);
-        ttInfoDetail_wrap.setGid(String.valueOf($ttInfoDetail.getLp().getId()));
-        ttInfoDetail_wrap.setSelf($ttInfoDetail);
-
-//        log.info("时刻表id={}", $ttInfoId);
-//        log.info("时刻表明细id={}", $ttInfoDetail.getId());
-
-        insert(ttInfoDetail_wrap);
-end
-
+//--------------- 车辆配置信息载入 -------------//
 declare CarConfig_Wrap
     id: String // 车辆配置id（cast字符串-方便比较）
@@ -151,6 +158,7 @@ rule &quot;calcu_CarConfig_Wrap&quot;
         insert(carConfig_wrap);
 end
+//--------------- 人员配置信息载入 --------------//
 declare EmployeeConfig_Wrap
     id: String // 人员配置id（cast字符串-方便比较）
@@ -170,56 +178,171 @@ rule &quot;calcu_EmployeeConfig_Wrap&quot;
         insert(employeeConfig_wrap);
 end
-declare ScheduleResult_output_Wrap
-    xlId: Integer // 线路id
-    sd: DateTime // 日期
-    ruleId: String // 规则Id
-    eciIds: List // 人员配置ids
+//----------------- 时刻表班次信息载入 -----------------//
+declare TTInfo_gid_stat
+    xlId: String // 线路id（cast字符串-方便比较）
+    ttInfoId: String // 时刻表id（cast字符串-方便比较）
+    gid: String // 路牌id（cast字符串-方便比较）
+
+    maxFcno: Integer // 最大发车顺序号
+
+    fbTime: LocalTime // 分班时间
+end
+
+rule "calcu_TTInfo_gid_stat"
+    salience 800
+    when
+        $lr: Loop_result($xlId: xlId)
+        $ttInfoId: String() from $lr.getTtInfoMap().keySet()
+        $gids: List() from accumulate ($ttd: TTInfoDetail() from tTInfoDetailService.list(ttidParams($ttInfoId)), gidscount($ttd))
+        $gid: String() from $gids
+        $fbtime_str: String() from accumulate ($ttd: TTInfoDetail(lp.id.toString() == $gid) from tTInfoDetailService.list(ttidParams($ttInfoId)), gidfbtime($ttd))
+        $maxfcno: Double() from accumulate ($ttd: TTInfoDetail(lp.id.toString() == $gid) from tTInfoDetailService.list(ttidParams($ttInfoId)), max($ttd.getFcno()))
+    then
+        TTInfo_gid_stat ttInfo_gid_stat = new TTInfo_gid_stat();
+        ttInfo_gid_stat.setXlId($xlId);
+        ttInfo_gid_stat.setTtInfoId($ttInfoId);
+        ttInfo_gid_stat.setGid($gid);
+
+        ttInfo_gid_stat.setMaxFcno($maxfcno.intValue());
+        ttInfo_gid_stat.setFbTime(fcsjTime($fbtime_str));
+
+        insert(ttInfo_gid_stat);
+
+        log.info("xlid={},ttid={},gid={},maxfcno={},fbtime={}",
+            $xlId, $ttInfoId, $gid, ttInfo_gid_stat.getMaxFcno(), ttInfo_gid_stat.getFbTime());
+
+end
+
+declare TTInfoDetail_Wrap
+    xlId: String // 线路id（cast字符串-方便比较）
+    ttInfoId: String // 时刻表id（cast字符串-方便比较）
+    gid: String // 路牌id（cast字符串-方便比较）
-    self: ScheduleResult_output // 原始数据
+    isFirstBc: Boolean = false // 是否是当前路牌的第一个班次
+    isLastBc: Boolean = false // 是否是当前路牌的最后一个班次
+    isFb: Boolean = false // 是否分班
+
+    self: TTInfoDetail // 原始数据
 end
-rule "calcu_ScheduleResult_output_Wrap"
+rule "calcu_TTInfoDetail_Wrap"
     salience 800
     when
         $lr: Loop_result($xlId: xlId)
-        $sro: ScheduleResult_output() from $lr.getRuleLoop()
+        $ttInfoId: String() from $lr.getTtInfoMap().keySet()
+        $ttInfoStat: TTInfo_gid_stat(
+            ttInfoId == $ttInfoId,
+            $gid: gid, $maxFcno: maxFcno)
+        $ttInfoDetail: TTInfoDetail(lp.id.toString() == $gid) from tTInfoDetailService.list(ttidParams($ttInfoId))
     then
-        ScheduleResult_output_Wrap scheduleResult_output_wrap = new ScheduleResult_output_Wrap();
-        scheduleResult_output_wrap.setXlId($xlId);
-        scheduleResult_output_wrap.setSd($sro.getSd());
-        scheduleResult_output_wrap.setRuleId($sro.getRuleId());
-        scheduleResult_output_wrap.setEciIds(Arrays.asList(
-            $sro.getEmployeeConfigId().split("-")));
-        scheduleResult_output_wrap.setSelf($sro);
-
-        insert(scheduleResult_output_wrap);
+        TTInfoDetail_Wrap ttInfoDetail_wrap = new TTInfoDetail_Wrap();
+        ttInfoDetail_wrap.setXlId($xlId);
+        ttInfoDetail_wrap.setTtInfoId($ttInfoId);
+        ttInfoDetail_wrap.setGid($gid);
+        ttInfoDetail_wrap.setIsFirstBc(1 == $ttInfoDetail.getFcno());
+        ttInfoDetail_wrap.setIsLastBc($maxFcno == $ttInfoDetail.getFcno());
+
+        LocalTime fcsj = fcsjTime($ttInfoDetail.getFcsj());
+        LocalTime fbsj = $ttInfoStat.getFbTime();
+        ttInfoDetail_wrap.setIsFb(fbsj == null ? false : (fcsj.isEqual(fbsj) || fcsj.isAfter(fbsj)));
+
+        ttInfoDetail_wrap.setSelf($ttInfoDetail);
+
+        insert(ttInfoDetail_wrap);
+
+        log.info("xlid={},ttid={},gid={},isFirstBc={},isLastBc={},isFb={},fcsj={}",
+            $xlId, $ttInfoId, $gid,
+            ttInfoDetail_wrap.getIsFirstBc(),
+            ttInfoDetail_wrap.getIsLastBc(),
+            ttInfoDetail_wrap.getIsFb(),
+            $ttInfoDetail.getFcsj());
 end
 //-------------------- 第三阶段、合并计算SchedulePlanInfo -----------------//
-// TODO：暂时不考虑分班
-
-//rule "Calcu_SchedulePlanInfo"
-//    salience 600
-//    when
-//        $lr: Loop_result($xlId: xlId)
-//        $sro: ScheduleResult_output($sd: sd) from $lr.getRuleLoop()
-//        ScheduleResult_output_Wrap(
-//            xlId == $xlId, sd == $sro.sd, ruleId == $sro.ruleId,
-//            $eciIds: eciIds, $sr: self)
-//        $ecId: String() from $eciIds
-//        CarConfig_Wrap(id == $sro.carConfigId, $cc: self)
-//        EmployeeConfig_Wrap(id == $ecId, $ec: self)
-//        TTInfoDetail_Wrap(
-//            ttInfoId == ((TTInfoResult_output) $lr.getTtInfoMapLoop($sd)).,
-//            gid == $sr.guideboardId,
-//            $ttInfoDetail: self
-//        )
-//    then
-//        log.info("Calcu_SchedulePlanInfo");
-//
-//end
+rule "Calcu_SchedulePlanInfo"
+    salience 600
+    when
+        $param: PlanCalcuParam_input($xlId: xlId)
+        $lr: Loop_result(xlId == $xlId)
+        $sro: ScheduleResult_output($sd: sd, $gid: guideboardId) from $lr.getRuleLoop()
+        CarConfig_Wrap(id == $sro.carConfigId, $cc: self)
+        TTInfoDetail_Wrap(
+            ttInfoId == ttInfoId_sd($lr.getTtInfoMapLoop(), $sd),
+            gid == $gid,
+            $isFb: isFb, $isFirstBc: isFirstBc, $isLastBc: isLastBc,
+            $ttInfoDetail: self
+        )
+    then
+        // 线路
+        Line xl = lineService.findById(Integer.valueOf($xlId));
+
+        SchedulePlanInfo schedulePlanInfo = new SchedulePlanInfo(
+            xl,
+            $sro,
+            $ttInfoDetail,
+            $isFb,
+            $cc,
+            ecList(employeeConfigInfoService, $sro.getEmployeeConfigId()),
+            $param.getSchedulePlan(),
+            $isFirstBc,
+            $isLastBc
+        );
+
+        // 获取公司，分公司信息
+        String gsbm = xl.getCompany();
+        String fgsbm = xl.getBrancheCompany();
+        Business gs = null;
+        Business fgs = null;
+
+        Map<String, Object> param = new HashMap<>();
+
+        if (StringUtils.isNotEmpty(gsbm)) {
+            param.clear();
+            param.put("businessCode_eq", gsbm);
+            Iterator<Business> businessIterator = businessService.list(param).iterator();
+            if (businessIterator.hasNext()) {
+                gs = businessIterator.next();
+            }
+        }
+        if (StringUtils.isNotEmpty(gsbm) && StringUtils.isNotEmpty(fgsbm)) {
+            param.clear();;
+            param.put("upCode_eq", gsbm);
+            param.put("businessCode_eq", fgsbm);
+            Iterator<Business> businessIterator = businessService.list(param).iterator();
+            if (businessIterator.hasNext()) {
+                fgs = businessIterator.next();
+            }
+        }
+
+        if (gs != null) {
+            schedulePlanInfo.setGsBm(gs.getBusinessCode());
+            schedulePlanInfo.setGsName(gs.getBusinessName());
+        }
+        if (fgs != null) {
+            schedulePlanInfo.setFgsBm(fgs.getBusinessCode());
+            schedulePlanInfo.setFgsName(fgs.getBusinessName());
+        }
+
+        // 操作人，操作时间
+        schedulePlanInfo.setCreateBy($param.getSchedulePlan().getCreateBy());
+        schedulePlanInfo.setCreateDate($param.getSchedulePlan().getCreateDate());
+        schedulePlanInfo.setUpdateBy($param.getSchedulePlan().getUpdateBy());
+        schedulePlanInfo.setUpdateDate($param.getSchedulePlan().getUpdateDate());
+
+        // TODO：
+        $param.getSchedulePlan().setTtInfo($ttInfoDetail.getTtinfo());
+
+        // result 输出
+        planResult.getSchedulePlanInfos().add(schedulePlanInfo);
+
+        log.info("gid={},ecid={},ttInfoId={}",
+            $gid, ecList(employeeConfigInfoService, $sro.getEmployeeConfigId()),
+            ttInfoId_sd($lr.getTtInfoMapLoop(), $sd));
+
+end
+
@@ -22,90 +22,48 @@
 	</div>
 </div>
-
 <div class="row">
-
 	<div class="col-md-12">
-
 		<div class="portlet light porttlet-fit bordered">
-
 			<div class="portlet-title">
-
 				<form class="form-inline" action="">
-
 					<div style="display: inline-block;">
-
 						<span class="item-label" style="width: 80px;">线路: </span>
 						<select class="form-control" name="line" id="line" style="width: 180px;"></select>
-
 					</div>
-
 					<div style="display: inline-block;margin-left: 15px;">
-
 						<span class="item-label" style="width: 80px;">时间: </span>
-
 						<input class="form-control" type="text" id="date" style="width: 180px;"/>
-
 					</div>
-
 					<div class="form-group" style="display: inline-block;margin-left: 15px;">
-
 						<input class="btn btn-default" type="button" id="query" value="查询"/>
-
 						<input class="btn btn-default" type="button" id="export" value="导出"/>
-
 						<input class="btn btn-default" type="button" id="print" value="打印"/>
-
 						<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
-
 					</div>
-
 				</form>
-
 			</div>
-
 			<div class="portlet-body">
-
 				<div class="row">
-
 					<div class="col-md-3">
-
 						<div class="" style="margin-top: 10px;overflow:auto;height: 860px">
-
 							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
-
 								<thead>
-
 									<tr class="hidden">
-
-										<th>人员</th>
-
-										<th>自编号</th>
-
-										<th>路牌</th>
-
+										<th class="rypx" style="cursor:pointer ">人员</th>
+										<th class="zbhpx" style="cursor:pointer ">自编号</th>
+										<th class="lppx" style="cursor:pointer ">路牌</th>
 									</tr>
-
 								</thead>
-
 								<tbody>
-
-
 								</tbody>
-
 							</table>
-
 						</div>
-
 					</div>
-
 					<div class="col-md-9"  id="printArea">
-
 						<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
-
 							<table class="table table-bordered table-checkable" id="forms">
-
 								<tbody class="ludan_1">
 								</tbody>
@@ -118,45 +76,46 @@
 						        <tbody class="ludan_4">
 						        </tbody>
-
 							</table>
-
 						</div>
-
 					</div>
-
 				</div>
-
 			</div>
-
 		</div>
-
 	</div>
-
 </div>
-
-
 <script>
-
 	$(function(){
-
 		// 关闭左侧栏
-
 		if (!$('body').hasClass('page-sidebar-closed'))
-
 			$('.menu-toggler.sidebar-toggler').click();
-
 		$("#date").datetimepicker({
-
 			format : 'YYYY-MM-DD',
-
 			locale : 'zh-cn'
-
 		});
+
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		$("#date").val(year + "-" + month + "-" + day);
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			initPinYinSelect2('#line',data,'');
+			
+		})
-		$('#line').select2({
+		/* $('#line').select2({
 			ajax: {
 				url: '/realSchedule/findLine',
 				type: 'post',
@@ -194,80 +153,163 @@
 			   }
 			}
 		});
+		 */
 		var date = '';
-
+		var line ='';
 		$("#query").on("click",function(){
-
-			var line = $("#line").val();
-
+			line = $("#line").val();
 			date = $("#date").val();
 			$(".hidden").removeClass("hidden");
-
-			$get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
-
+			$get('/realSchedule/queryUserInfo',{line:line,date:date,state:2},function(result){
 				// 把数据填充到模版中
-
 				var tbodyHtml = template('list_info',{list:result});
-
 				// 把渲染好的模版html文本追加到表格中
-
 				$('#info tbody').html(tbodyHtml);
-
 			});
-
 		});
+		var type="desc";
+		$(".rypx").on("click",function(){
+			line = $("#line").val();
+			date = $("#date").val();
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"j_Gh",type:type},function(result){
+				if(type=="desc"){
+					type ="asc";
+				}else{
+					type ="desc";
+				}
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info_px',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
+		})
+		
+		$(".zbhpx").on("click",function(){
+			line = $("#line").val();
+			date = $("#date").val();
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"clZbh",type:type},function(result){
+				if(type=="desc"){
+					type ="asc";
+				}else{
+					type ="desc";
+				}
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info_px',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
+		})
+		
+		$(".lppx").on("click",function(){
+			line = $("#line").val();
+			date = $("#date").val();
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"lpName",type:type},function(result){
+				if(type=="desc"){
+					type ="asc";
+				}else{
+					type ="desc";
+				}
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info_px',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
+		})
 		var params = new Array();
 		var jName = '';
-
 		$("#info tbody").on("click","tr",function(){
 			if($(this).children().size() < 2){
 				return;
 			}
-
-
 			$(this).children().each(function(index){
-
 				params[index] = $(this).text();
-
 			});
 			jName = params[0].split("\\")[0];
 			var id = $("#"+params[1]).val();
-			$get('/realSchedule/'+id,null,function(result){
+			$get('/realSchedule/MapById',{id:id},function(result){
 			    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
 				var ludan_1 = template('ludan_1',result);
-				//var ludan_4 = template('ludan_4',result);
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms .ludan_1').html(ludan_1);
-				//$('#forms .ludan_4').html(ludan_4);
 			});
-
-			$post('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
+			$get('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
 			    getTime(result);
-
 				var ludan_2 = template('ludan_2',{list:result});
-
 				// 把渲染好的模版html文本追加到表格中
-
 				$('#forms .ludan_2').html(ludan_2);
-
 			});
-			$post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
+			$get('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+					
+				  var gl=accAdd(result.ksgl,result.jcclc);
+					result.ljgl=gl;
+					
+				var ljjcc1=accAdd(result.ksgl,result.jcclc);
+					//临加进出场公里
+					var ljjcc=numSubtr(result.zkslc,ljjcc1);
+					result.zlcgl=numSubtr(result.realMileage,ljjcc);
+				
 			    var ludan_3 = template('ludan_3',result);
 			    $('#forms .ludan_3').html(ludan_3);
 			});
-
 		});
+		var accAdd = function (a, b) {
+	        var c, d, e;
+	        try {
+	            c = a.toString().split(".")[1].length;
+	        } catch (f) {
+	            c = 0;
+	        }
+	        try {
+	            d = b.toString().split(".")[1].length;
+	        } catch (f) {
+	            d = 0;
+	        }
+	        return e = Math.pow(10, Math.max(c, d)), (mul(a, e) + mul(b, e)) / e;
+	    };
+
+	    var numSubtr = function (a, b) {
+	        var c, d, e;
+	        try {
+	            c = a.toString().split(".")[1].length;
+	        } catch (f) {
+	            c = 0;
+	        }
+	        try {
+	            d = b.toString().split(".")[1].length;
+	        } catch (f) {
+	            d = 0;
+	        }
+	        return e = Math.pow(10, Math.max(c, d)), (a * e - b * e) / e;
+	    };
+	    
+	    function mul(a, b) {
+	        var c = 0,
+	            d = a.toString(),
+	            e = b.toString();
+	        try {
+	            c += d.split(".")[1].length;
+	        } catch (f) {
+	        }
+	        try {
+	            c += e.split(".")[1].length;
+	        } catch (f) {
+	        }
+	        return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
+	    }
 		$("#export").on("click",function(){
 			if(params.length < 1){
 				return;
 			}
-			$post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
-				window.open("/downloadFile/download?fileName="+jName);
+			$get('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+				window.open("/downloadFile/download?fileName="+date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单");
 			});
 		});
@@ -276,9 +318,17 @@
 		});
 		$("#exportMore").on("click",function(){
-			return;
-			$post('/realSchedule/exportWaybillMore',{date:date},function(result){
-				window.open("/downloadFile/download?fileName="+jName);
+			if($("#info tbody tr td").length <= 1)
+				return;
+			var param = new Array();
+			$("#info tbody tr").each(function(index){
+				param[index] = new Array();
+				$(this).children().each(function(i){
+					param[index][i] = $(this).text().split("\\")[0];
+				});
+			});
+			$post('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
+				window.open("/downloadFile/downloadList?fileName="+result.fileName);
 			});
 		});
@@ -296,37 +346,35 @@
                 }
             }); 
 		}
-
 	});
-
 </script>
-
 <script type="text/html" id="list_info">
-
 	{{each list as obj i}}
-
 		<tr>
-
 			<td width="45%">{{obj[4]}}\{{obj[1]}}</td>
-
 			<td width="32%">{{obj[2]}}</td>
-
 			<td width="23%">{{obj[3]}}<input type="hidden" id="{{obj[2]}}" value="{{obj[0]}}"></td>
-
 		</tr>
-
 	{{/each}}
-
 	{{if list.length == 0}}
-
 		<tr>
-
 			<td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
-
 		</tr>
-
 	{{/if}}
-
+</script>
+<script type="text/html" id="list_info_px">
+	{{each list as obj i}}
+		<tr>
+			<td width="45%">{{obj.jName}}\{{obj.jGh}}</td>
+			<td width="32%">{{obj.clZbh}}</td>
+			<td width="23%">{{obj.lpName}}<input type="hidden" id="{{obj.clZbh}}" value="{{obj.id}}"></td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
 </script>
 <script type="text/html" id="ludan_1">
 	  <tr>
@@ -336,11 +384,11 @@
           <td colspan="14">路别:{{xlName}}   路牌:{{lpName}}   车号:{{clZbh}}   出场时间:{{fcsjActual}}   到达站名:{{zdzName}}   当班调派:&nbsp;   日期:{{scheduleDate}}</td>
       </tr>
       <tr>
-          <td colspan="2">出场存油 &nbsp;升</td>
-          <td colspan="2">加注油量 &nbsp;升</td>
-          <td colspan="2">进场存油 &nbsp;升</td>
+          <td colspan="2">出场存油 {{ccyl}};升</td>
+          <td colspan="2">加注油量 {{jzl}}升</td>
+          <td colspan="2">进场存油 {{jcyl}}升</td>
           <td colspan="4">加注机油 &nbsp;升</td>
-          <td colspan="4">本日耗油 &nbsp;升</td>
+          <td colspan="4">本日耗油 {{yh}}升</td>
       </tr>
       <tr>
           <td rowspan="2">调度章</td>
@@ -388,175 +436,65 @@
           <td colspan="1">慢</td>
       </tr>
 </script>
-
 <script type="text/html" id="ludan_2">
-
 	{{each list as obj i}}
-
 		<tr>
-
-			<td>{{i+1}}</td>
-
-			<td>{{obj.jName}}</td>
-
-			<td>{{obj.sName}}</td>
-
+			<td>{{obj.adjustExps}}</td>
+			<td>{{obj.jGh}}{{obj.jName}}</td>
+			<td>{{if obj.sGh !=null}}
+				{{obj.sGh}}{{obj.sName}}
+				{{/if}}
+			</td>
 			<td>&nbsp;</td>
-
 			<td>{{obj.qdzName}}</td>
-
 			<td>{{obj.zdzName}}</td>
-
 			<td>{{obj.fcsj}}</td>
-
 			<td>{{obj.fcsjActual}}</td>
-
 			<td>{{obj.zdsj}}</td>
-
 			<td>{{obj.zdsjActual}}</td>
-
 			<td>{{obj.fast}}</td>
-
 			<td>{{obj.slow}}</td>
-
 			<td>{{obj.jhlc}}</td>
-			<td>{{obj.remarks}}</td>
-
+			<td >
+             	{{obj.remarks}}
+			</td>
 		</tr>
-
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
 			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
-
 </script>
 <script type="text/html" id="ludan_3">
 	<tr>
-		<td colspan="2">计划公里</td>
-		<td>{{jhlc}}</td>
-		<td colspan="2">烂班公里</td>
-		<td>{{remMileage}}</td>
-		<td colspan="2">临加公里</td>
-		<td>{{addMileage}}</td>
-		<td colspan="2">营运公里</td>
-		<td colspan="3">{{yygl}}</td>
-	</tr>
-	<tr>
-		<td colspan="2">空驶公里</td>
-		<td>{{ksgl}}</td>
-		<td colspan="2">总公里</td>
-		<td>{{realMileage}}</td>
 		<td colspan="2">计划班次</td>
 		<td>{{jhbc}}</td>
+		<td colspan="2">计划公里</td>
+		<td>{{jhlc}}</td>
 		<td colspan="2">烂班班次</td>
-		<td colspan="3">{{cjbc}}</td>
+		<td>{{cjbc}}</td>
+		<td colspan="3"> 烂班公里</td>
+		<td colspan="2">{{remMileage}}</td>
 	</tr>
 	<tr>
-		<td colspan="2">增加班次</td>
+		<td colspan="2">临加班次</td>
 		<td>{{ljbc}}</td>
+		<td colspan="2">临加公里</td>
+		<td>{{addMileage}}</td>
 		<td colspan="2">实际班次</td>
 		<td>{{sjbc}}</td>
+		<td colspan="3">营运公里</td>
+		<td colspan="2">{{yygl}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">空驶公里</td>
+		<td>{{ljgl}}</td>
+		<td colspan="2">总公里</td>
+		<td>{{zlcgl}}</td>
 		<td colspan="2"></td>
 		<td></td>
-		<td colspan="2"></td>
 		<td colspan="3"></td>
+		<td colspan="2"></td>
 	</tr>
 </script>
-<script type="text/html" id="ludan_4">
-		<tr>
-	    <td colspan="12">认真做好终点项目的例保保修工作，杜绝机械火警事故！</td>
-	    <td>轮胎</td>
-	    <td>&nbsp;</td>
-	</tr>
-	<tr>
-	    <td colspan="3">重点例保项目</td>
-	    <td>1</td>
-	    <td>2</td>
-	    <td>3</td>
-	    <td colspan="3">重点例保项目</td>
-	    <td>1</td>
-	    <td>2</td>
-	    <td>3</td>
-	    <td>灭火机</td>
-	    <td>&nbsp;</td>
-	</tr>
-	<tr>
-	    <td colspan="3">各类制动</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="3">各类灯光</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="2">出场路码表里程</td>
-	</tr>
-	<tr>
-	    <td colspan="3">方向机</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="3">各类仪表</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="2" rowspan="2">&nbsp;</td>
-	</tr>
-	<tr>
-	    <td colspan="3">欠压报警器</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="3">各类皮带</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	</tr>
-	<tr>
-	    <td colspan="3">发动机清洁及响声</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="3">油箱及托架</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="2">出场路码表里程</td>
-	</tr>
-	<tr>
-	    <td colspan="3">地盘响声</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="3">轮胎、半轴螺栓螺母</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="2" rowspan="3">&nbsp;</td>
-	</tr>
-	<tr>
-	    <td colspan="3">化油器及油路</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="3">油、电、水、气</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	</tr>
-	<tr>
-	    <td colspan="3">进排歧管及排气管</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td colspan="3">内外车身及附件</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	    <td>&nbsp;</td>
-	</tr>
-	<tr>
-	    <td colspan="14">1 首次出场，2 复使中途，3 某次进场。√正常，ⓧ报修，×尚未报修</td>
-	</tr>
-</script>
 \ No newline at end of file
@@ -182,6 +182,14 @@
                         delete data.spy;
                     }
+                    //公司信息
+                    var line = gb_data_basic.findLineByCodes([data.xlBm]);
+                    if(line && line.length > 0){
+                        line = line[0];
+                        data.gsBm = line.company;
+                        data.fgsBm = line.brancheCompany;
+                    }
+
                     gb_common.$post('/realSchedule', data, function (rs) {
                         //插入
                         gb_schedule_table.insertSchedule(rs.t, rs.ts);