潘钊 / bsth_control · Commits

Commit 4f3f73e877ac2a6ae578b832ce3ecec1b8dff22f

Authored by 廖磊
1 parent f02cd88a

0109

Inline Side-by-side
Showing 8 changed files with 446 additions and 302 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
  View file @4f3f73e
@@ -299,10 +299,17 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, @@ -299,10 +299,17 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo,
299 299
300 @RequestMapping(value = "/exportWaybill") 300 @RequestMapping(value = "/exportWaybill")
301 public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh, 301 public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
302 - @RequestParam String lpName,@RequestParam String date) {  
303 - return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date); 302 + @RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
  303 + return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date,line);
  304 + }
  305 +
  306 + @RequestMapping(value = "/exportWaybillQp")
  307 + public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
  308 + ,@RequestParam String date,@RequestParam String line) {
  309 + return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
304 } 310 }
305 311
  312 +
306 @RequestMapping(value = "/dailyInfo") 313 @RequestMapping(value = "/dailyInfo")
307 public List<Map<String, Object>> dailyInfo(@RequestParam String line, @RequestParam String date,@RequestParam String type) { 314 public List<Map<String, Object>> dailyInfo(@RequestParam String line, @RequestParam String date,@RequestParam String type) {
308 return scheduleRealInfoService.dailyInfo(line, date, type); 315 return scheduleRealInfoService.dailyInfo(line, date, type);
@@ -321,8 +328,14 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo, @@ -321,8 +328,14 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
321 328
322 @RequestMapping(value="/findKMBC") 329 @RequestMapping(value="/findKMBC")
323 public Map<String,Object> findKMBC(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName 330 public Map<String,Object> findKMBC(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
324 - ,@RequestParam String date){  
325 - return scheduleRealInfoService.findKMBC(jName, clZbh,lpName,date); 331 + ,@RequestParam String date,@RequestParam String line){
  332 + return scheduleRealInfoService.findKMBC(jName, clZbh,lpName,date,line);
  333 + }
  334 +
  335 + @RequestMapping(value="/findKMBCQp")
  336 + public Map<String,Object> findKMBCQp(@RequestParam String clZbh
  337 + ,@RequestParam String date,@RequestParam String line){
  338 + return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
326 } 339 }
327 340
328 @RequestMapping(value="/findLpName") 341 @RequestMapping(value="/findLpName")
@@ -351,16 +364,14 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo, @@ -351,16 +364,14 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
351 */ 364 */
352 @RequestMapping(value="/queryListWaybill") 365 @RequestMapping(value="/queryListWaybill")
353 public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName 366 public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
354 - ,@RequestParam String date){  
355 - String type="fqp";  
356 - return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,type); 367 + ,@RequestParam String date,@RequestParam String line){
  368 + return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
357 } 369 }
358 370
359 @RequestMapping(value="/queryListWaybillQp") 371 @RequestMapping(value="/queryListWaybillQp")
360 - public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName  
361 - ,@RequestParam String date){  
362 - String type="qp";  
363 - return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,type); 372 + public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
  373 + @RequestParam String date,@RequestParam String line){
  374 + return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
364 } 375 }
365 376
366 @RequestMapping(value="/statisticsDaily") 377 @RequestMapping(value="/statisticsDaily")
@@ -368,6 +379,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo, @@ -368,6 +379,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
368 return scheduleRealInfoService.statisticsDaily(line, date,xlName); 379 return scheduleRealInfoService.statisticsDaily(line, date,xlName);
369 } 380 }
370 381
  382 + @RequestMapping(value="/MapById",method = RequestMethod.GET)
  383 + public Map<String, Object> MapById(@RequestParam("id") Long id){
  384 + return scheduleRealInfoService.MapById(id);
  385 + }
  386 +
371 /** 387 /**
372 * @Title: scheduleDaily 388 * @Title: scheduleDaily
373 * @Description: TODO(调度日报表) 389 * @Description: TODO(调度日报表)
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
  View file @4f3f73e
@@ -24,7 +24,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI @@ -24,7 +24,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
24 @Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)") 24 @Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
25 List<ScheduleRealInfo> queryUserInfo2(String line,String date); 25 List<ScheduleRealInfo> queryUserInfo2(String line,String date);
26 26
27 - @Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)") 27 + @Query(value="select min(s.id), s.clZbh from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.clZbh order by (lpName+1)")
28 List<ScheduleRealInfo> queryUserInfo3(String line,String date); 28 List<ScheduleRealInfo> queryUserInfo3(String line,String date);
29 29
30 @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by bcs") 30 @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by bcs")
@@ -79,13 +79,13 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI @@ -79,13 +79,13 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
79 + " and clZbh like %?5% order by s.fcsj") 79 + " and clZbh like %?5% order by s.fcsj")
80 List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code); 80 List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
81 81
82 - @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') order by bcs")  
83 - List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date); 82 + @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5 order by realExecDate,fcsjActual")
  83 + List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
84 84
85 - @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and bcType='normal' order by bcs")  
86 - List<ScheduleRealInfo> queryListWaybill2(String jName,String clZbh,String lpName,String date); 85 + @Query(value="select s from ScheduleRealInfo s where s.clZbh = ?1 and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,fcsjActual")
  86 + List<ScheduleRealInfo> queryListWaybill2(String clZbh,String date,String line);
87 87
88 - @Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by bcs") 88 + @Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by realExecDate,fcsjActual")
89 List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date); 89 List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date);
90 90
91 @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between str_to_date(?3,'%Y-%m-%d') and str_to_date(?4,'%Y-%m-%d') order by bcs") 91 @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between str_to_date(?3,'%Y-%m-%d') and str_to_date(?4,'%Y-%m-%d') order by bcs")
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
  View file @4f3f73e
@@ -61,7 +61,9 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L @@ -61,7 +61,9 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
61 61
62 List<ScheduleRealInfo> queryUserInfo(String line,String date,String state); 62 List<ScheduleRealInfo> queryUserInfo(String line,String date,String state);
63 63
64 - List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName,String date); 64 + List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName,String date,String line);
  65 +
  66 + List<ScheduleRealInfo> exportWaybillQp(String clZbh,String date,String line);
65 67
66 List<Map<String,Object>> dailyInfo(String line,String date,String type); 68 List<Map<String,Object>> dailyInfo(String line,String date,String type);
67 69
@@ -87,7 +89,9 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L @@ -87,7 +89,9 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
87 89
88 Map<String,Object> findKMBC1(String jName,String clZbh, String date,String enddate); 90 Map<String,Object> findKMBC1(String jName,String clZbh, String date,String enddate);
89 91
90 - Map<String,Object> findKMBC(String jName,String clZbh,String lpName,String date); 92 + Map<String,Object> findKMBC(String jName,String clZbh,String lpName,String date,String line);
  93 +
  94 + Map<String,Object> findKMBCQp(String clZbh,String date,String line);
91 95
92 Map<String,Object> findKMBC2(String jName,String clZbh,String date); 96 Map<String,Object> findKMBC2(String jName,String clZbh,String date);
93 97
@@ -97,8 +101,10 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L @@ -97,8 +101,10 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
97 101
98 List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code, String type); 102 List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code, String type);
99 103
100 - List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String type); 104 + List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
101 105
  106 + List<ScheduleRealInfo> queryListWaybillQp(String clZbh,String date,String line);
  107 +
102 Map<String, Object> removeChildTask(Long taskId); 108 Map<String, Object> removeChildTask(Long taskId);
103 109
104 List<Map<String,Object>> statisticsDaily(String line,String date,String xlName); 110 List<Map<String,Object>> statisticsDaily(String line,String date,String xlName);
@@ -128,4 +134,9 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L @@ -128,4 +134,9 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
128 Map<String,Object> changeBcType(Long id, String bcType, String remarks); 134 Map<String,Object> changeBcType(Long id, String bcType, String remarks);
129 135
130 Map<String,Object> historySave(ScheduleRealInfo sch); 136 Map<String,Object> historySave(ScheduleRealInfo sch);
  137 +
  138 +
  139 + Map<String, Object> MapById(Long id) ;
  140 +
  141 +
131 } 142 }
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @4f3f73e
@@ -21,6 +21,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo; @@ -21,6 +21,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
21 import com.bsth.entity.schedule.CarConfigInfo; 21 import com.bsth.entity.schedule.CarConfigInfo;
22 import com.bsth.entity.schedule.EmployeeConfigInfo; 22 import com.bsth.entity.schedule.EmployeeConfigInfo;
23 import com.bsth.entity.schedule.GuideboardInfo; 23 import com.bsth.entity.schedule.GuideboardInfo;
  24 +import com.bsth.entity.sys.DutyEmployee;
24 import com.bsth.entity.sys.SysUser; 25 import com.bsth.entity.sys.SysUser;
25 import com.bsth.repository.LineRepository; 26 import com.bsth.repository.LineRepository;
26 import com.bsth.repository.realcontrol.ChildTaskPlanRepository; 27 import com.bsth.repository.realcontrol.ChildTaskPlanRepository;
@@ -32,6 +33,7 @@ import com.bsth.security.util.SecurityUtils; @@ -32,6 +33,7 @@ import com.bsth.security.util.SecurityUtils;
32 import com.bsth.service.SectionRouteService; 33 import com.bsth.service.SectionRouteService;
33 import com.bsth.service.impl.BaseServiceImpl; 34 import com.bsth.service.impl.BaseServiceImpl;
34 import com.bsth.service.realcontrol.ScheduleRealInfoService; 35 import com.bsth.service.realcontrol.ScheduleRealInfoService;
  36 +import com.bsth.service.sys.DutyEmployeeService;
35 import com.bsth.util.*; 37 import com.bsth.util.*;
36 import com.bsth.websocket.handler.SendUtils; 38 import com.bsth.websocket.handler.SendUtils;
37 import com.google.common.base.Splitter; 39 import com.google.common.base.Splitter;
@@ -41,6 +43,7 @@ import com.google.common.collect.Multimap; @@ -41,6 +43,7 @@ import com.google.common.collect.Multimap;
41 import org.apache.commons.lang3.StringUtils; 43 import org.apache.commons.lang3.StringUtils;
42 import org.joda.time.format.DateTimeFormat; 44 import org.joda.time.format.DateTimeFormat;
43 import org.joda.time.format.DateTimeFormatter; 45 import org.joda.time.format.DateTimeFormatter;
  46 +import org.pentaho.di.core.logging.ChannelLogTable.ID;
44 import org.slf4j.Logger; 47 import org.slf4j.Logger;
45 import org.slf4j.LoggerFactory; 48 import org.slf4j.LoggerFactory;
46 import org.springframework.beans.factory.annotation.Autowired; 49 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,6 +71,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -68,6 +71,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
68 @Autowired 71 @Autowired
69 SectionRouteService sectionRouteService; 72 SectionRouteService sectionRouteService;
70 73
  74 + @Autowired
  75 + DutyEmployeeService dutyEmployeeService;
  76 +
71 /*@Autowired 77 /*@Autowired
72 BorrowCenter borrowCenter;*/ 78 BorrowCenter borrowCenter;*/
73 79
@@ -474,11 +480,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -474,11 +480,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
474 * 480 *
475 */ 481 */
476 @Override 482 @Override
477 - public List<ScheduleRealInfo> exportWaybill(String jName, String clZbh, String lpName,String date) { 483 + public List<ScheduleRealInfo> exportWaybill(String jName, String clZbh, String lpName,String date,String line) {
478 ReportUtils ee = new ReportUtils(); 484 ReportUtils ee = new ReportUtils();
479 ReportRelatedUtils rru = new ReportRelatedUtils(); 485 ReportRelatedUtils rru = new ReportRelatedUtils();
480 List<Iterator<?>> list = new ArrayList<Iterator<?>>(); 486 List<Iterator<?>> list = new ArrayList<Iterator<?>>();
481 - List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName,date); 487 + List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName,date,line);
482 List<Map<String,Object>> listMap = new ArrayList<Map<String,Object>>(); 488 List<Map<String,Object>> listMap = new ArrayList<Map<String,Object>>();
483 489
484 DecimalFormat format = new DecimalFormat("0.00"); 490 DecimalFormat format = new DecimalFormat("0.00");
@@ -499,7 +505,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -499,7 +505,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
499 //计划班次，烂班班次，增加班次 505 //计划班次，烂班班次，增加班次
500 tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc(); 506 tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
501 if(scheduleRealInfo.isSflj()){ 507 if(scheduleRealInfo.isSflj()){
502 - addMileage += tempJhlc;  
503 ljbc++; 508 ljbc++;
504 }else{ 509 }else{
505 jhlc += tempJhlc; 510 jhlc += tempJhlc;
@@ -513,7 +518,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -513,7 +518,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
513 //计算营运里程，空驶里程 518 //计算营运里程，空驶里程
514 if(childTaskPlans.isEmpty()){ 519 if(childTaskPlans.isEmpty()){
515 if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out") 520 if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
516 - || scheduleRealInfo.getBcType().equals("venting")){ 521 + ){
517 ksgl += tempJhlc; 522 ksgl += tempJhlc;
518 }else{ 523 }else{
519 yygl += tempJhlc; 524 yygl += tempJhlc;
@@ -523,8 +528,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -523,8 +528,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
523 while(it.hasNext()){ 528 while(it.hasNext()){
524 ChildTaskPlan childTaskPlan = it.next(); 529 ChildTaskPlan childTaskPlan = it.next();
525 if(childTaskPlan.getMileageType().equals("empty")){ 530 if(childTaskPlan.getMileageType().equals("empty")){
  531 + if(scheduleRealInfo.isSflj()){
  532 + addMileage += tempJhlc;
  533 + }
526 ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage(); 534 ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
527 }else{ 535 }else{
  536 + if(scheduleRealInfo.isSflj()){
  537 + addMileage += tempJhlc;
  538 + }
528 yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage(); 539 yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
529 } 540 }
530 } 541 }
@@ -573,7 +584,123 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -573,7 +584,123 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
573 584
574 list.add(listMap.iterator()); 585 list.add(listMap.iterator());
575 ee.excelReplace(list, new Object[] { scheduleRealInfos.get(0),map }, path+"mould\\waybill_minhang.xls", 586 ee.excelReplace(list, new Object[] { scheduleRealInfos.get(0),map }, path+"mould\\waybill_minhang.xls",
576 - path+"export\\" + jName + ".xls"); 587 + path+"export\\" + date+"-"+jName+"-"+clZbh+"-"+lpName+"-行车路单.xls");
  588 + return scheduleRealInfos;
  589 + }
  590 +
  591 + /**
  592 + *
  593 + */
  594 + @Override
  595 + public List<ScheduleRealInfo> exportWaybillQp( String clZbh,String date,String line) {
  596 + ReportUtils ee = new ReportUtils();
  597 + ReportRelatedUtils rru = new ReportRelatedUtils();
  598 + List<Iterator<?>> list = new ArrayList<Iterator<?>>();
  599 + List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybill2( clZbh,date,line);
  600 + List<Map<String,Object>> listMap = new ArrayList<Map<String,Object>>();
  601 +
  602 + DecimalFormat format = new DecimalFormat("0.00");
  603 +// int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
  604 +// int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
  605 + int jhbc = 0,cjbc = 0,ljbc = 0;
  606 + double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0,jcclc=0;
  607 + float addMileage = 0l,remMileage = 0l;
  608 +
  609 + Map<String,Object> map;
  610 + for(ScheduleRealInfo scheduleRealInfo : scheduleRealInfos){
  611 + if(scheduleRealInfo != null){
  612 + //计算计划里程（主任务过滤掉临加班次），烂班里程，临加里程，计划班次，烂班班次，增加班次
  613 + //计划里程（主任务过滤掉临加班次），
  614 + //烂班里程（主任务烂班），
  615 + //临加里程（主任务临加），
  616 + //计划班次，烂班班次，增加班次
  617 + tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
  618 + if(scheduleRealInfo.isSflj()){
  619 + ljbc++;
  620 + }else{
  621 + jhlc += tempJhlc;
  622 + jhbc++;
  623 + if(scheduleRealInfo.getStatus() == -1){
  624 + remMileage += tempJhlc;
  625 + cjbc++;
  626 + }
  627 + }
  628 + Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
  629 + //计算营运里程，空驶里程
  630 + if(childTaskPlans.isEmpty()){
  631 + if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
  632 + || scheduleRealInfo.getBcType().equals("venting")){
  633 + ksgl += tempJhlc;
  634 + }else{
  635 + yygl += tempJhlc;
  636 + }
  637 + }else{
  638 + Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  639 + while(it.hasNext()){
  640 + ChildTaskPlan childTaskPlan = it.next();
  641 + if(childTaskPlan.getMileageType().equals("empty")){
  642 + if(scheduleRealInfo.isSflj()){
  643 + addMileage += tempJhlc;
  644 + }
  645 + ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
  646 + }else{
  647 + if(scheduleRealInfo.isSflj()){
  648 + addMileage += tempJhlc;
  649 + }
  650 + yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
  651 + }
  652 + }
  653 + }
  654 +
  655 + if(!(scheduleRealInfo.getBcType().equals("in")||scheduleRealInfo.getBcType().equals("out"))){
  656 + map = new HashMap<String, Object>();
  657 + try {
  658 + map = rru.getMapValue(scheduleRealInfo);
  659 + String zdsj = scheduleRealInfo.getZdsj();
  660 + String zdsjActual = scheduleRealInfo.getZdsjActual();
  661 + if(zdsj != null && zdsjActual != null &&
  662 + !zdsj.equals(zdsjActual)){
  663 + if(zdsj.compareTo(zdsjActual) > 0){
  664 + map.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  665 + map.put("slow", "");
  666 + } else {
  667 + map.put("fast", "");
  668 + map.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  669 + }
  670 + } else {
  671 + map.put("fast", "");
  672 + map.put("slow", "");
  673 + }
  674 + listMap.add(map);
  675 + } catch (Exception e) {
  676 + e.printStackTrace();
  677 + }
  678 + }
  679 + }
  680 + }
  681 +
  682 + //计算里程和班次数，并放入Map里
  683 + map = new HashMap<String, Object>();
  684 + map.put("jhlc", format.format(jhlc+jcclc));
  685 + map.put("yygljh", format.format(jhlc));
  686 + map.put("ssgl", format.format(remMileage));
  687 + map.put("ksgl", format.format(ksgl));
  688 + map.put("yyglsj", format.format(yygl+remMileage));
  689 + map.put("jhbc", jhbc);
  690 + map.put("jcclc", jcclc);
  691 +
  692 + map.put("ljgl", format.format(addMileage));
  693 + map.put("ssbc", cjbc);
  694 + map.put("ysgl", format.format(yygl));
  695 + map.put("sjbc", jhbc-cjbc+ljbc);
  696 + map.put("zgl", format.format(yygl+remMileage+ksgl+jcclc));
  697 + map.put("ljbc", ljbc);
  698 +
  699 + String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
  700 +
  701 + list.add(listMap.iterator());
  702 + ee.excelReplace(list, new Object[] { scheduleRealInfos.get(0),map }, path+"mould\\waybill_qingpu.xls",
  703 + path+"export\\" + date+"-"+clZbh+"-行车路单.xls");
577 return scheduleRealInfos; 704 return scheduleRealInfos;
578 } 705 }
579 706
@@ -1165,8 +1292,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1165,8 +1292,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1165 1292
1166 @Override 1293 @Override
1167 public Map<String, Object> findKMBC(String jName, String clZbh, 1294 public Map<String, Object> findKMBC(String jName, String clZbh,
1168 - String lpName,String date) {  
1169 - List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date); 1295 + String lpName,String date,String line) {
  1296 + List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date,line);
1170 DecimalFormat format = new DecimalFormat("0.00"); 1297 DecimalFormat format = new DecimalFormat("0.00");
1171 // int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName); 1298 // int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
1172 // int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName); 1299 // int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
@@ -1182,7 +1309,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1182,7 +1309,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1182 //计划班次，烂班班次，增加班次 1309 //计划班次，烂班班次，增加班次
1183 tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc(); 1310 tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
1184 if(scheduleRealInfo.isSflj()){ 1311 if(scheduleRealInfo.isSflj()){
1185 - addMileage += tempJhlc;  
1186 ljbc++; 1312 ljbc++;
1187 }else{ 1313 }else{
1188 if( !(scheduleRealInfo.getBcType().equals("in") 1314 if( !(scheduleRealInfo.getBcType().equals("in")
@@ -1209,6 +1335,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1209,6 +1335,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1209 // } 1335 // }
1210 else{ 1336 else{
1211 if(scheduleRealInfo.getStatus() != -1){ 1337 if(scheduleRealInfo.getStatus() != -1){
  1338 + if(scheduleRealInfo.isSflj()){
  1339 + addMileage += tempJhlc;
  1340 + }
1212 yygl += tempJhlc; 1341 yygl += tempJhlc;
1213 } 1342 }
1214 } 1343 }
@@ -1220,6 +1349,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1220,6 +1349,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1220 if(childTaskPlan.isDestroy()){ 1349 if(childTaskPlan.isDestroy()){
1221 remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage(); 1350 remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
1222 }else{ 1351 }else{
  1352 + if(scheduleRealInfo.isSflj()){
  1353 + addMileage += tempJhlc;
  1354 + }
1223 ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage(); 1355 ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
1224 } 1356 }
1225 }else{ 1357 }else{
@@ -1227,6 +1359,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1227,6 +1359,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1227 remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage(); 1359 remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
1228 // cjbc++; 1360 // cjbc++;
1229 }else{ 1361 }else{
  1362 + if(scheduleRealInfo.isSflj()){
  1363 + addMileage += tempJhlc;
  1364 + }
1230 yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage(); 1365 yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
1231 } 1366 }
1232 } 1367 }
@@ -1248,6 +1383,106 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1248,6 +1383,106 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1248 map.put("zkslc", format.format(ksgl+jcclc)); 1383 map.put("zkslc", format.format(ksgl+jcclc));
1249 return map; 1384 return map;
1250 } 1385 }
  1386 +
  1387 +
  1388 +
  1389 + @Override
  1390 + public Map<String, Object> findKMBCQp( String clZbh,
  1391 + String date,String line) {
  1392 + List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill2( clZbh,date,line);
  1393 + DecimalFormat format = new DecimalFormat("0.00");
  1394 +// int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
  1395 +// int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
  1396 + int jhbc = 0,cjbc = 0,ljbc = 0;
  1397 + double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0,jcclc=0;
  1398 + float addMileage = 0l,remMileage = 0l;
  1399 + Map<String,Object> map = new HashMap<String, Object>();
  1400 + for(ScheduleRealInfo scheduleRealInfo : list){
  1401 + if(scheduleRealInfo != null){
  1402 + //计划里程（主任务过滤掉临加班次），
  1403 + //烂班里程（主任务烂班），
  1404 + //临加里程（主任务临加），
  1405 + //计划班次，烂班班次，增加班次
  1406 + tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
  1407 + if(scheduleRealInfo.isSflj()){
  1408 + ljbc++;
  1409 + }else{
  1410 + if( !(scheduleRealInfo.getBcType().equals("in")
  1411 + ||scheduleRealInfo.getBcType().equals("out")) ){
  1412 + jhbc++;
  1413 + jhlc += tempJhlc;
  1414 + }
  1415 +
  1416 + if(scheduleRealInfo.getStatus() == -1){
  1417 + remMileage += tempJhlc;
  1418 + cjbc++;
  1419 + }
  1420 + }
  1421 + Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
  1422 + //计算营运里程，空驶里程
  1423 + if(childTaskPlans.isEmpty()){
  1424 + if(scheduleRealInfo.getBcType().equals("in") ||
  1425 + scheduleRealInfo.getBcType().equals("out")){
  1426 + jcclc +=tempJhlc;
  1427 + }
  1428 +
  1429 + //主任务 放空班次属于营运
  1430 +// else if(scheduleRealInfo.getBcType().equals("venting")){
  1431 +// ksgl += tempJhlc;
  1432 +// }
  1433 + else{
  1434 + if(scheduleRealInfo.getStatus() != -1){
  1435 + if(scheduleRealInfo.isSflj()){
  1436 + addMileage += tempJhlc;
  1437 + }
  1438 + yygl += tempJhlc;
  1439 + }
  1440 + }
  1441 + }else{
  1442 + Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  1443 + while(it.hasNext()){
  1444 + ChildTaskPlan childTaskPlan = it.next();
  1445 + if(childTaskPlan.getMileageType().equals("empty")){
  1446 + if(childTaskPlan.isDestroy()){
  1447 + remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
  1448 + }else{
  1449 + if(scheduleRealInfo.isSflj()){
  1450 + addMileage += tempJhlc;
  1451 + }
  1452 + ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
  1453 + }
  1454 + }else{
  1455 + if(childTaskPlan.isDestroy()){
  1456 + remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
  1457 +// cjbc++;
  1458 + }else{
  1459 + if(scheduleRealInfo.isSflj()){
  1460 + addMileage += tempJhlc;
  1461 + }
  1462 + yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
  1463 + }
  1464 + }
  1465 + }
  1466 + }
  1467 + }
  1468 + }
  1469 + map.put("jhlc", format.format(jhlc+jcclc));
  1470 + map.put("yygljh", format.format(jhlc));
  1471 + map.put("ssgl", format.format(remMileage));
  1472 + map.put("ksgl", format.format(ksgl));
  1473 + map.put("yyglsj", format.format(yygl+remMileage));
  1474 + map.put("jhbc", jhbc);
  1475 + map.put("jcclc", jcclc);
  1476 +
  1477 + map.put("ljgl", format.format(addMileage));
  1478 + map.put("ssbc", cjbc);
  1479 + map.put("ysgl", format.format(yygl));
  1480 + map.put("sjbc", jhbc-cjbc+ljbc);
  1481 + map.put("zgl", format.format(yygl+remMileage+ksgl+jcclc));
  1482 + map.put("ljbc", ljbc);
  1483 + return map;
  1484 + }
  1485 +
1251 1486
1252 @Override 1487 @Override
1253 public List<Map<String, Object>> account(String line, String date, 1488 public List<Map<String, Object>> account(String line, String date,
@@ -1332,13 +1567,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1332,13 +1567,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1332 1567
1333 @Override 1568 @Override
1334 public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh, 1569 public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
1335 - String lpName,String date,String type) {  
1336 - List <ScheduleRealInfo> list=null;  
1337 - if(type.equals("qp")){  
1338 - list= scheduleRealInfoRepository.queryListWaybill2(jName,clZbh,lpName,date);  
1339 - }else{  
1340 - list= scheduleRealInfoRepository.queryListWaybill(jName,clZbh,lpName,date);  
1341 - } 1570 + String lpName,String date,String line) {
  1571 + List <ScheduleRealInfo> list= scheduleRealInfoRepository.queryListWaybill(jName,clZbh,lpName,date,line);
1342 for (int i = 0; i < list.size(); i++) { 1572 for (int i = 0; i < list.size(); i++) {
1343 ScheduleRealInfo s=list.get(i); 1573 ScheduleRealInfo s=list.get(i);
1344 String remarks=""; 1574 String remarks="";
@@ -1361,6 +1591,38 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1361,6 +1591,38 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1361 1591
1362 return list; 1592 return list;
1363 } 1593 }
  1594 +
  1595 + @Override
  1596 + public List<ScheduleRealInfo> queryListWaybillQp( String clZbh,String date,String line) {
  1597 + List <ScheduleRealInfo> list=null;
  1598 + list= scheduleRealInfoRepository.queryListWaybill2(clZbh,date,line);
  1599 + List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
  1600 + for (int i = 0; i < list.size(); i++) {
  1601 + ScheduleRealInfo s=list.get(i);
  1602 + if(!(s.getBcType().equals("in")||s.getBcType().equals("out"))){
  1603 + String remarks="";
  1604 + if(s.getRemarks()!=null){
  1605 + remarks +=s.getRemarks();
  1606 + }
  1607 + Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
  1608 + if(!childTaskPlans.isEmpty()){
  1609 + Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  1610 + while(it.hasNext()){
  1611 + ChildTaskPlan c = it.next();
  1612 + if(c.getRemarks()!=null && c.getRemarks().length()>0){
  1613 + remarks += c.getRemarks();
  1614 + }
  1615 +
  1616 + }
  1617 + }
  1618 + s.setRemarks(remarks);
  1619 + newList.add(s);
  1620 + }
  1621 +
  1622 + }
  1623 +
  1624 + return newList;
  1625 + }
1364 1626
1365 @Override 1627 @Override
1366 public Map<String, Object> removeChildTask(Long taskId) { 1628 public Map<String, Object> removeChildTask(Long taskId) {
@@ -2056,4 +2318,53 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2056,4 +2318,53 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2056 return null; 2318 return null;
2057 } 2319 }
2058 2320
  2321 + @Override
  2322 + public Map<String, Object> MapById(Long id) {
  2323 + // TODO Auto-generated method stub
  2324 + Map<String, Object> map=new HashMap<String, Object>();
  2325 + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
  2326 + ScheduleRealInfo s=scheduleRealInfoRepository.findOne(id);
  2327 + String xlbm=s.getXlBm();
  2328 + String fcrq=s.getScheduleDateStr();
  2329 +
  2330 +
  2331 + map.put("xlName", s.getXlName());
  2332 + map.put("clZbh", s.getClZbh());
  2333 + map.put("fcsjActual", s.getFcsjActual());
  2334 + map.put("zdzName", s.getZdzName());
  2335 + map.put("scheduleDate", s.getScheduleDateStr());
  2336 + String zdp="",zwdp="",wdp="";
  2337 +
  2338 + List<DutyEmployee> list= dutyEmployeeService.getDutyEmployee(xlbm, fcrq+"00:00", fcrq+"23:59");
  2339 + try {
  2340 + Long fcsj1=sdf.parse(fcrq+" 03:00").getTime();
  2341 + Long fcsj2=sdf.parse(fcrq+" 11:00").getTime();
  2342 + Long fcsj3=sdf.parse(fcrq+" 22:00").getTime();
  2343 + for(int i=0;i<list.size();i++){
  2344 + DutyEmployee t=list.get(i);
  2345 + Long ts=t.getTs();
  2346 + if(ts>fcsj1&&ts<fcsj2){
  2347 + if(zdp.indexOf(t.getuName())==-1){
  2348 + zdp +=t.getuName()+",";
  2349 + }
  2350 + }else if(ts>fcsj2 && ts<fcsj3){
  2351 + if(zwdp.indexOf(t.getuName())==-1){
  2352 + zwdp +=t.getuName()+",";
  2353 + }
  2354 + }else{
  2355 + if(wdp.indexOf(t.getuName())==-1){
  2356 + wdp +=t.getuName()+",";
  2357 + }
  2358 + }
  2359 + }
  2360 + } catch (ParseException e) {
  2361 + // TODO Auto-generated catch block
  2362 + e.printStackTrace();
  2363 + }
  2364 + map.put("zdp", zdp);
  2365 + map.put("zwdp", zwdp);
  2366 + map.put("wdp", wdp);
  2367 + return map;
  2368 + }
  2369 +
2059 } 2370 }
src/main/resources/static/pages/forms/mould/waybill_minhang.xls
View file @4f3f73e
No preview for this file type
src/main/resources/static/pages/forms/mould/waybill_qingpu.xls 0 → 100644
View file @4f3f73e
No preview for this file type
src/main/resources/static/pages/forms/statement/waybill.html
  View file @4f3f73e
@@ -148,8 +148,9 @@ @@ -148,8 +148,9 @@
148 */ 148 */
149 149
150 var date = ''; 150 var date = '';
  151 + var line ='';
151 $("#query").on("click",function(){ 152 $("#query").on("click",function(){
152 - var line = $("#line").val(); 153 + line = $("#line").val();
153 date = $("#date").val(); 154 date = $("#date").val();
154 $(".hidden").removeClass("hidden"); 155 $(".hidden").removeClass("hidden");
155 $get('/realSchedule/queryUserInfo',{line:line,date:date,state:2},function(result){ 156 $get('/realSchedule/queryUserInfo',{line:line,date:date,state:2},function(result){
@@ -174,21 +175,18 @@ @@ -174,21 +175,18 @@
174 jName = params[0].split("\\")[0]; 175 jName = params[0].split("\\")[0];
175 var id = $("#"+params[1]).val(); 176 var id = $("#"+params[1]).val();
176 $get('/realSchedule/'+id,null,function(result){ 177 $get('/realSchedule/'+id,null,function(result){
177 - console.log(result);  
178 result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD"); 178 result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
179 var ludan_1 = template('ludan_1',result); 179 var ludan_1 = template('ludan_1',result);
180 - //var ludan_4 = template('ludan_4',result);  
181 // 把渲染好的模版html文本追加到表格中 180 // 把渲染好的模版html文本追加到表格中
182 $('#forms .ludan_1').html(ludan_1); 181 $('#forms .ludan_1').html(ludan_1);
183 - //$('#forms .ludan_4').html(ludan_4);  
184 }); 182 });
185 - $post('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){ 183 + $post('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
186 getTime(result); 184 getTime(result);
187 var ludan_2 = template('ludan_2',{list:result}); 185 var ludan_2 = template('ludan_2',{list:result});
188 // 把渲染好的模版html文本追加到表格中 186 // 把渲染好的模版html文本追加到表格中
189 $('#forms .ludan_2').html(ludan_2); 187 $('#forms .ludan_2').html(ludan_2);
190 }); 188 });
191 - $post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){ 189 + $post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
192 var ludan_3 = template('ludan_3',result); 190 var ludan_3 = template('ludan_3',result);
193 $('#forms .ludan_3').html(ludan_3); 191 $('#forms .ludan_3').html(ludan_3);
194 }); 192 });
@@ -199,8 +197,8 @@ @@ -199,8 +197,8 @@
199 if(params.length < 1){ 197 if(params.length < 1){
200 return; 198 return;
201 } 199 }
202 - $post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){  
203 - window.open("/downloadFile/download?fileName="+jName); 200 + $post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
  201 + window.open("/downloadFile/download?fileName="+date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单");
204 }); 202 });
205 }); 203 });
206 204
@@ -321,7 +319,13 @@ @@ -321,7 +319,13 @@
321 <td>{{obj.fast}}</td> 319 <td>{{obj.fast}}</td>
322 <td>{{obj.slow}}</td> 320 <td>{{obj.slow}}</td>
323 <td>{{obj.jhlc}}</td> 321 <td>{{obj.jhlc}}</td>
324 - <td>{{obj.remarks}}</td> 322 + <td title={{obj.remarks}}>
  323 + {{if obj.remarks !=""}}
  324 + <div class="caption">
  325 + <i class="fa fa-search"></i>
  326 + </div>
  327 + {{/if}}
  328 + </td>
325 </tr> 329 </tr>
326 {{/each}} 330 {{/each}}
327 {{if list.length == 0}} 331 {{if list.length == 0}}
@@ -362,99 +366,3 @@ @@ -362,99 +366,3 @@
362 <td colspan="2"></td> 366 <td colspan="2"></td>
363 </tr> 367 </tr>
364 </script> 368 </script>
365 -<script type="text/html" id="ludan_4">  
366 - <tr>  
367 - <td colspan="12">认真做好终点项目的例保保修工作，杜绝机械火警事故！</td>  
368 - <td>轮胎</td>  
369 - <td>&nbsp;</td>  
370 - </tr>  
371 - <tr>  
372 - <td colspan="3">重点例保项目</td>  
373 - <td>1</td>  
374 - <td>2</td>  
375 - <td>3</td>  
376 - <td colspan="3">重点例保项目</td>  
377 - <td>1</td>  
378 - <td>2</td>  
379 - <td>3</td>  
380 - <td>灭火机</td>  
381 - <td>&nbsp;</td>  
382 - </tr>  
383 - <tr>  
384 - <td colspan="3">各类制动</td>  
385 - <td>&nbsp;</td>  
386 - <td>&nbsp;</td>  
387 - <td>&nbsp;</td>  
388 - <td colspan="3">各类灯光</td>  
389 - <td>&nbsp;</td>  
390 - <td>&nbsp;</td>  
391 - <td>&nbsp;</td>  
392 - <td colspan="2">出场路码表里程</td>  
393 - </tr>  
394 - <tr>  
395 - <td colspan="3">方向机</td>  
396 - <td>&nbsp;</td>  
397 - <td>&nbsp;</td>  
398 - <td>&nbsp;</td>  
399 - <td colspan="3">各类仪表</td>  
400 - <td>&nbsp;</td>  
401 - <td>&nbsp;</td>  
402 - <td>&nbsp;</td>  
403 - <td colspan="2" rowspan="2">&nbsp;</td>  
404 - </tr>  
405 - <tr>  
406 - <td colspan="3">欠压报警器</td>  
407 - <td>&nbsp;</td>  
408 - <td>&nbsp;</td>  
409 - <td>&nbsp;</td>  
410 - <td colspan="3">各类皮带</td>  
411 - <td>&nbsp;</td>  
412 - <td>&nbsp;</td>  
413 - <td>&nbsp;</td>  
414 - </tr>  
415 - <tr>  
416 - <td colspan="3">发动机清洁及响声</td>  
417 - <td>&nbsp;</td>  
418 - <td>&nbsp;</td>  
419 - <td>&nbsp;</td>  
420 - <td colspan="3">油箱及托架</td>  
421 - <td>&nbsp;</td>  
422 - <td>&nbsp;</td>  
423 - <td>&nbsp;</td>  
424 - <td colspan="2">出场路码表里程</td>  
425 - </tr>  
426 - <tr>  
427 - <td colspan="3">地盘响声</td>  
428 - <td>&nbsp;</td>  
429 - <td>&nbsp;</td>  
430 - <td>&nbsp;</td>  
431 - <td colspan="3">轮胎、半轴螺栓螺母</td>  
432 - <td>&nbsp;</td>  
433 - <td>&nbsp;</td>  
434 - <td>&nbsp;</td>  
435 - <td colspan="2" rowspan="3">&nbsp;</td>  
436 - </tr>  
437 - <tr>  
438 - <td colspan="3">化油器及油路</td>  
439 - <td>&nbsp;</td>  
440 - <td>&nbsp;</td>  
441 - <td>&nbsp;</td>  
442 - <td colspan="3">油、电、水、气</td>  
443 - <td>&nbsp;</td>  
444 - <td>&nbsp;</td>  
445 - <td>&nbsp;</td>  
446 - </tr>  
447 - <tr>  
448 - <td colspan="3">进排歧管及排气管</td>  
449 - <td>&nbsp;</td>  
450 - <td>&nbsp;</td>  
451 - <td>&nbsp;</td>  
452 - <td colspan="3">内外车身及附件</td>  
453 - <td>&nbsp;</td>  
454 - <td>&nbsp;</td>  
455 - <td>&nbsp;</td>  
456 - </tr>  
457 - <tr>  
458 - <td colspan="14">1 首次出场，2 复使中途，3 某次进场。√正常，ⓧ报修，×尚未报修</td>  
459 - </tr>  
460 -</script>  
461 \ No newline at end of file 369 \ No newline at end of file
src/main/resources/static/pages/forms/statement/waybillQp.html
  View file @4f3f73e
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
18 18
19 <div class="page-head"> 19 <div class="page-head">
20 <div class="page-title"> 20 <div class="page-title">
  21 + <i class="fa fa-question-circle-o" aria-hidden="true"></i>
21 <h1>行车路单</h1> 22 <h1>行车路单</h1>
22 </div> 23 </div>
23 </div> 24 </div>
@@ -39,20 +40,18 @@ @@ -39,20 +40,18 @@
39 <input class="btn btn-default" type="button" id="query" value="查询"/> 40 <input class="btn btn-default" type="button" id="query" value="查询"/>
40 <input class="btn btn-default" type="button" id="export" value="导出"/> 41 <input class="btn btn-default" type="button" id="export" value="导出"/>
41 <input class="btn btn-default" type="button" id="print" value="打印"/> 42 <input class="btn btn-default" type="button" id="print" value="打印"/>
42 - <input class="btn btn-default" type="button" id="exportMore" value="批量导出"/> 43 +<!-- <input class="btn btn-default" type="button" id="exportMore" value="批量导出"/> -->
43 </div> 44 </div>
44 </form> 45 </form>
45 </div> 46 </div>
46 <div class="portlet-body"> 47 <div class="portlet-body">
47 <div class="row"> 48 <div class="row">
48 - <div class="col-md-3"> 49 + <div class="col-md-2">
49 <div class="" style="margin-top: 10px;overflow:auto;height: 860px"> 50 <div class="" style="margin-top: 10px;overflow:auto;height: 860px">
50 <table class="table table-bordered table-hover table-checkable pre-scrollable" id="info"> 51 <table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
51 <thead> 52 <thead>
52 <tr class="hidden"> 53 <tr class="hidden">
53 - <th>人员</th>  
54 <th>自编号</th> 54 <th>自编号</th>
55 - <th>路牌</th>  
56 </tr> 55 </tr>
57 </thead> 56 </thead>
58 <tbody> 57 <tbody>
@@ -102,7 +101,6 @@ @@ -102,7 +101,6 @@
102 for(var code in result){ 101 for(var code in result){
103 data.push({id: code, text: result[code]}); 102 data.push({id: code, text: result[code]});
104 } 103 }
105 - console.log(data);  
106 initPinYinSelect2('#line',data,''); 104 initPinYinSelect2('#line',data,'');
107 105
108 }) 106 })
@@ -148,8 +146,9 @@ @@ -148,8 +146,9 @@
148 */ 146 */
149 147
150 var date = ''; 148 var date = '';
  149 + var line ='';
151 $("#query").on("click",function(){ 150 $("#query").on("click",function(){
152 - var line = $("#line").val(); 151 + line= $("#line").val();
153 date = $("#date").val(); 152 date = $("#date").val();
154 $(".hidden").removeClass("hidden"); 153 $(".hidden").removeClass("hidden");
155 $get('/realSchedule/queryUserInfo',{line:line,date:date,state:3},function(result){ 154 $get('/realSchedule/queryUserInfo',{line:line,date:date,state:3},function(result){
@@ -163,33 +162,32 @@ @@ -163,33 +162,32 @@
163 var params = new Array(); 162 var params = new Array();
164 var jName = ''; 163 var jName = '';
165 $("#info tbody").on("click","tr",function(){ 164 $("#info tbody").on("click","tr",function(){
166 - if($(this).children().size() < 2){ 165 + if($(this).children().size() < 1){
167 return; 166 return;
168 } 167 }
169 -  
170 $(this).children().each(function(index){ 168 $(this).children().each(function(index){
171 params[index] = $(this).text(); 169 params[index] = $(this).text();
172 }); 170 });
173 - console.log(params);  
174 - jName = params[0].split("\\")[0];  
175 - var id = $("#"+params[1]).val();  
176 - $get('/realSchedule/'+id,null,function(result){ 171 +
  172 + var id = $("#"+params[0]).val();
  173 +
  174 + $get('/realSchedule/MapById',{id:id},function(result){
177 console.log(result); 175 console.log(result);
178 - result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");  
179 - var ludan_1 = template('ludan_1',result); 176 +// result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
  177 + var ludan_1 = template('ludan_1',{map:result});
180 //var ludan_4 = template('ludan_4',result); 178 //var ludan_4 = template('ludan_4',result);
181 // 把渲染好的模版html文本追加到表格中 179 // 把渲染好的模版html文本追加到表格中
182 $('#forms .ludan_1').html(ludan_1); 180 $('#forms .ludan_1').html(ludan_1);
183 //$('#forms .ludan_4').html(ludan_4); 181 //$('#forms .ludan_4').html(ludan_4);
184 }); 182 });
185 - $post('/realSchedule/queryListWaybillQp',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){ 183 + $post('/realSchedule/queryListWaybillQp',{clZbh:params[0],date:date,line:line},function(result){
186 getTime(result); 184 getTime(result);
187 var ludan_2 = template('ludan_2',{list:result}); 185 var ludan_2 = template('ludan_2',{list:result});
188 // 把渲染好的模版html文本追加到表格中 186 // 把渲染好的模版html文本追加到表格中
189 $('#forms .ludan_2').html(ludan_2); 187 $('#forms .ludan_2').html(ludan_2);
190 }); 188 });
191 - $post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){  
192 - var ludan_3 = template('ludan_3',result); 189 + $post('/realSchedule/findKMBCQp',{clZbh:params[0],date:date,line:line},function(result){
  190 + var ludan_3 = template('ludan_3',{map:result});
193 $('#forms .ludan_3').html(ludan_3); 191 $('#forms .ludan_3').html(ludan_3);
194 }); 192 });
195 193
@@ -199,8 +197,8 @@ @@ -199,8 +197,8 @@
199 if(params.length < 1){ 197 if(params.length < 1){
200 return; 198 return;
201 } 199 }
202 - $post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){  
203 - window.open("/downloadFile/download?fileName="+jName); 200 + $post('/realSchedule/exportWaybillQp',{clZbh:params[0],date:date,line:line},function(result){
  201 + window.open("/downloadFile/download?fileName="+date+"-"+params[0]+"-行车路单");
204 }); 202 });
205 }); 203 });
206 204
@@ -234,9 +232,7 @@ @@ -234,9 +232,7 @@
234 <script type="text/html" id="list_info"> 232 <script type="text/html" id="list_info">
235 {{each list as obj i}} 233 {{each list as obj i}}
236 <tr> 234 <tr>
237 - <td width="45%">{{obj[4]}}\{{obj[1]}}</td>  
238 - <td width="32%">{{obj[2]}}</td>  
239 - <td width="23%">{{obj[3]}}<input type="hidden" id="{{obj[2]}}" value="{{obj[0]}}"></td> 235 + <td>{{obj[1]}}<input type="hidden" id="{{obj[1]}}" value="{{obj[0]}}"></td>
240 </tr> 236 </tr>
241 {{/each}} 237 {{/each}}
242 {{if list.length == 0}} 238 {{if list.length == 0}}
@@ -247,43 +243,32 @@ @@ -247,43 +243,32 @@
247 </script> 243 </script>
248 <script type="text/html" id="ludan_1"> 244 <script type="text/html" id="ludan_1">
249 <tr> 245 <tr>
250 - <td colspan="14">行车路单</td> 246 + <td colspan="15">行车路单</td>
251 </tr> 247 </tr>
252 <tr> 248 <tr>
253 - <td colspan="14">路别:{{xlName}} 路牌:{{lpName}} 车号:{{clZbh}} 出场时间:{{fcsjActual}} 到达站名:{{zdzName}} 当班调派:&nbsp; 日期:{{scheduleDate}}</td> 249 + <td colspan="15">路别:{{map.xlName}} 车号:{{map.clZbh}} 出场时间:{{map.fcsjActual}} 到达站名:{{map.zdzName}} 日期:{{map.scheduleDate}}</td>
254 </tr> 250 </tr>
255 <tr> 251 <tr>
256 <td colspan="2">出场存油 &nbsp;升</td> 252 <td colspan="2">出场存油 &nbsp;升</td>
257 - <td colspan="2">加注油量 &nbsp;升</td> 253 + <td colspan="3">加注油量 &nbsp;升</td>
258 <td colspan="2">进场存油 &nbsp;升</td> 254 <td colspan="2">进场存油 &nbsp;升</td>
259 <td colspan="4">加注机油 &nbsp;升</td> 255 <td colspan="4">加注机油 &nbsp;升</td>
260 <td colspan="4">本日耗油 &nbsp;升</td> 256 <td colspan="4">本日耗油 &nbsp;升</td>
261 </tr> 257 </tr>
262 <tr> 258 <tr>
263 - <td rowspan="2">调度章</td>  
264 - <td colspan="1">&nbsp;</td>  
265 - <td rowspan="2">早班</td>  
266 - <td colspan="1">&nbsp;</td>  
267 - <td rowspan="2">夜班</td>  
268 - <td colspan="1">&nbsp;</td>  
269 - <td rowspan="2" colspan="2">交叉</td> 259 + <td colspan="2">调度员</td>
  260 + <td colspan="2">早班(职号)</td>
  261 + <td >{{map.zdp}}</td>
  262 + <td >中班(职号)</td>
  263 + <td >{{map.zwdp}}</td>
  264 + <td colspan="2">夜班(职号)</td>
  265 + <td colspan="2">{{map.wdp}}</td>
  266 + <td colspan="2">其他</td>
270 <td colspan="2">&nbsp;</td> 267 <td colspan="2">&nbsp;</td>
271 - <td rowspan="2">其他</td>  
272 - <td colspan="1">&nbsp;</td>  
273 - <td colspan="1">&nbsp;</td>  
274 - <td colspan="1">&nbsp;</td>  
275 - </tr>  
276 - <tr>  
277 - <td colspan="1">&nbsp;</td>  
278 - <td colspan="1">&nbsp;</td>  
279 - <td colspan="1">&nbsp;</td>  
280 - <td colspan="2">&nbsp;</td>  
281 - <td colspan="1">&nbsp;</td>  
282 - <td colspan="1">&nbsp;</td>  
283 - <td colspan="1">&nbsp;</td>  
284 </tr> 268 </tr>
285 <tr> 269 <tr>
286 <td rowspan="2">车次</td> 270 <td rowspan="2">车次</td>
  271 + <td rowspan="2">路牌</td>
287 <td colspan="2">工号</td> 272 <td colspan="2">工号</td>
288 <td rowspan="2">公里耗油</td> 273 <td rowspan="2">公里耗油</td>
289 <td colspan="2">起讫站</td> 274 <td colspan="2">起讫站</td>
@@ -309,6 +294,7 @@ @@ -309,6 +294,7 @@
309 {{each list as obj i}} 294 {{each list as obj i}}
310 <tr> 295 <tr>
311 <td>{{i+1}}</td> 296 <td>{{i+1}}</td>
  297 + <td>{{obj.lpName}}</td>
312 <td>{{obj.jName}}</td> 298 <td>{{obj.jName}}</td>
313 <td>{{obj.sName}}</td> 299 <td>{{obj.sName}}</td>
314 <td>&nbsp;</td> 300 <td>&nbsp;</td>
@@ -321,7 +307,14 @@ @@ -321,7 +307,14 @@
321 <td>{{obj.fast}}</td> 307 <td>{{obj.fast}}</td>
322 <td>{{obj.slow}}</td> 308 <td>{{obj.slow}}</td>
323 <td>{{obj.jhlc}}</td> 309 <td>{{obj.jhlc}}</td>
324 - <td>{{obj.remarks}}</td> 310 + <td title={{obj.remarks}}>
  311 + {{if obj.remarks !=""}}
  312 + <div class="caption">
  313 + <i class="fa fa-search"></i>
  314 +
  315 + </div>
  316 + {{/if}}
  317 + </td>
325 </tr> 318 </tr>
326 {{/each}} 319 {{/each}}
327 {{if list.length == 0}} 320 {{if list.length == 0}}
@@ -333,134 +326,39 @@ @@ -333,134 +326,39 @@
333 <script type="text/html" id="ludan_3"> 326 <script type="text/html" id="ludan_3">
334 <tr> 327 <tr>
335 <td colspan="2">计划公里</td> 328 <td colspan="2">计划公里</td>
336 - <td>{{jhlc}}</td>  
337 - <td colspan="2">营运公里</td>  
338 - <td >{{yygl}}</td> 329 + <td>{{map.jhlc}}</td>
  330 + <td colspan="2">营运公里(计划)</td>
  331 + <td >{{map.yygljh}}</td>
  332 + <td >损失公里</td>
  333 + <td>{{map.ssgl}}</td>
339 <td colspan="2">空驶公里</td> 334 <td colspan="2">空驶公里</td>
340 - <td>{{ksgl}}</td>  
341 - <td colspan="3">烂班公里</td>  
342 - <td colspan="2">{{remMileage}}</td>  
343 - 335 + <td colspan="1">{{map.ksgl}}</td>
  336 + <td colspan="3">营运公里(实际)</td>
  337 + <td colspan="1">{{map.yyglsj}}</td>
344 338
345 </tr> 339 </tr>
346 <tr> 340 <tr>
347 <td colspan="2">计划班次</td> 341 <td colspan="2">计划班次</td>
348 - <td>{{jhbc}}</td>  
349 - 342 + <td>{{map.jhbc}}</td>
350 <td colspan="2">进出场公里</td> 343 <td colspan="2">进出场公里</td>
351 - <td>{{jcclc}}</td>  
352 - <td colspan="2">临加公里</td>  
353 - <td>{{addMileage}}</td>  
354 - <td colspan="3">烂班班次</td>  
355 - <td colspan="2">{{cjbc}}</td>  
356 - 344 + <td>{{map.jcclc}}</td>
  345 + <td >临加公里</td>
  346 + <td>{{map.ljgl}}</td>
  347 + <td colspan="2">损失班次</td>
  348 + <td colspan="1">{{map.ssbc}}</td>
  349 + <td colspan="3">运送公里</td>
  350 + <td colspan="1">{{map.ysgl}}</td>
357 </tr> 351 </tr>
358 <tr> 352 <tr>
359 353
360 <td colspan="2">实际班次</td> 354 <td colspan="2">实际班次</td>
361 - <td>{{sjbc}}</td> 355 + <td>{{map.sjbc}}</td>
362 <td colspan="2">总公里</td> 356 <td colspan="2">总公里</td>
363 - <td>{{realMileage}}</td>  
364 - <td colspan="2">临加班次</td>  
365 - <td>{{ljbc}}</td> 357 + <td>{{map.zgl}}</td>
  358 + <td >临加班次</td>
  359 + <td>{{map.ljbc}}</td>
366 360
367 <td colspan="3"></td> 361 <td colspan="3"></td>
368 - <td colspan="2"></td> 362 + <td colspan="4"></td>
369 </tr> 363 </tr>
370 </script> 364 </script>
371 -<script type="text/html" id="ludan_4">  
372 - <tr>  
373 - <td colspan="12">认真做好终点项目的例保保修工作，杜绝机械火警事故！</td>  
374 - <td>轮胎</td>  
375 - <td>&nbsp;</td>  
376 - </tr>  
377 - <tr>  
378 - <td colspan="3">重点例保项目</td>  
379 - <td>1</td>  
380 - <td>2</td>  
381 - <td>3</td>  
382 - <td colspan="3">重点例保项目</td>  
383 - <td>1</td>  
384 - <td>2</td>  
385 - <td>3</td>  
386 - <td>灭火机</td>  
387 - <td>&nbsp;</td>  
388 - </tr>  
389 - <tr>  
390 - <td colspan="3">各类制动</td>  
391 - <td>&nbsp;</td>  
392 - <td>&nbsp;</td>  
393 - <td>&nbsp;</td>  
394 - <td colspan="3">各类灯光</td>  
395 - <td>&nbsp;</td>  
396 - <td>&nbsp;</td>  
397 - <td>&nbsp;</td>  
398 - <td colspan="2">出场路码表里程</td>  
399 - </tr>  
400 - <tr>  
401 - <td colspan="3">方向机</td>  
402 - <td>&nbsp;</td>  
403 - <td>&nbsp;</td>  
404 - <td>&nbsp;</td>  
405 - <td colspan="3">各类仪表</td>  
406 - <td>&nbsp;</td>  
407 - <td>&nbsp;</td>  
408 - <td>&nbsp;</td>  
409 - <td colspan="2" rowspan="2">&nbsp;</td>  
410 - </tr>  
411 - <tr>  
412 - <td colspan="3">欠压报警器</td>  
413 - <td>&nbsp;</td>  
414 - <td>&nbsp;</td>  
415 - <td>&nbsp;</td>  
416 - <td colspan="3">各类皮带</td>  
417 - <td>&nbsp;</td>  
418 - <td>&nbsp;</td>  
419 - <td>&nbsp;</td>  
420 - </tr>  
421 - <tr>  
422 - <td colspan="3">发动机清洁及响声</td>  
423 - <td>&nbsp;</td>  
424 - <td>&nbsp;</td>  
425 - <td>&nbsp;</td>  
426 - <td colspan="3">油箱及托架</td>  
427 - <td>&nbsp;</td>  
428 - <td>&nbsp;</td>  
429 - <td>&nbsp;</td>  
430 - <td colspan="2">出场路码表里程</td>  
431 - </tr>  
432 - <tr>  
433 - <td colspan="3">地盘响声</td>  
434 - <td>&nbsp;</td>  
435 - <td>&nbsp;</td>  
436 - <td>&nbsp;</td>  
437 - <td colspan="3">轮胎、半轴螺栓螺母</td>  
438 - <td>&nbsp;</td>  
439 - <td>&nbsp;</td>  
440 - <td>&nbsp;</td>  
441 - <td colspan="2" rowspan="3">&nbsp;</td>  
442 - </tr>  
443 - <tr>  
444 - <td colspan="3">化油器及油路</td>  
445 - <td>&nbsp;</td>  
446 - <td>&nbsp;</td>  
447 - <td>&nbsp;</td>  
448 - <td colspan="3">油、电、水、气</td>  
449 - <td>&nbsp;</td>  
450 - <td>&nbsp;</td>  
451 - <td>&nbsp;</td>  
452 - </tr>  
453 - <tr>  
454 - <td colspan="3">进排歧管及排气管</td>  
455 - <td>&nbsp;</td>  
456 - <td>&nbsp;</td>  
457 - <td>&nbsp;</td>  
458 - <td colspan="3">内外车身及附件</td>  
459 - <td>&nbsp;</td>  
460 - <td>&nbsp;</td>  
461 - <td>&nbsp;</td>  
462 - </tr>  
463 - <tr>  
464 - <td colspan="14">1 首次出场，2 复使中途，3 某次进场。√正常，ⓧ报修，×尚未报修</td>  
465 - </tr>  
466 -</script>  
467 \ No newline at end of file 365 \ No newline at end of file