“行车路单”根据车辆能耗类型显示油耗和电耗；

yiming
1 parent 7757aa5b
Showing 4 changed files with 91 additions and 23 deletions
src/main/java/com/bsth/entity/Refuel.java
src/main/java/com/bsth/repository/oil/JdlReceptionRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/waybillQp.html
@@ -26,25 +26,26 @@ public class Refuel {
 	private String car;
 	private String driver;
-	
+
+	//出场油量
 	private String outOil;
-	
+	//进场油量
 	private String inOil;
-	
+	//场内0号
 	private String inStation0;
-	
+	//场内B5#
 	private String inStation5;
-	
+	//油卡0号
 	private String oilCard0;
-	
+	//油卡-10#
 	private String oilCard10;
-	
+	//东站0#
 	private String eastStation0;
-	
+	//东站-10#
 	private String eastStation10;
-	
+	//场外0#
 	private String outStation0;
-	
+	//场外-10#
 	private String outStation10;
 	private String createBy;
@@ -13,5 +13,7 @@ public interface JdlReceptionRepository extends PagingAndSortingRepository&lt;JdlRe
 	@Query(value="SELECT j FROM JdlReception j where j.dateStr = ?")
 	List<JdlReception> queryListByDateStr(String dateStr);
-	
+
+	@Query(value="SELECT j FROM JdlReception j where j.dateStr = ?1 and j.carCode like ?2 order by j.createDate")
+	List<JdlReception> queryListByDateStrAndCar(String dateStr,String car);
 }
 \ No newline at end of file
@@ -21,11 +21,9 @@ import com.bsth.data.schedule.edit_logs.loggers.FcxxwtLogger;
 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.data.utils.CustomStringUtils;
-import com.bsth.entity.CarDevice;
-import com.bsth.entity.Cars;
-import com.bsth.entity.Line;
-import com.bsth.entity.Personnel;
+import com.bsth.entity.*;
 import com.bsth.entity.oil.Dlb;
+import com.bsth.entity.oil.JdlReception;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
@@ -43,7 +41,9 @@ import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.CarDeviceRepository;
 import com.bsth.repository.CarsRepository;
 import com.bsth.repository.LineRepository;
+import com.bsth.repository.RefuelRepository;
 import com.bsth.repository.oil.DlbRepository;
+import com.bsth.repository.oil.JdlReceptionRepository;
 import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.repository.realcontrol.ChildTaskPlanRepository;
@@ -164,6 +164,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Autowired
     CarsRepository carsRepository;
+
+    @Autowired
+    JdlReceptionRepository jdlReceptionRepository;
+
+    @Autowired
+    RefuelRepository refuelRepository;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
     SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -4761,6 +4768,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Double yh = 0.0;
         Double jzl = 0.0;
         Double zlc = 0.0;
+        Double ccdl = 0.0;
+        Double jcdl = 0.0;
+        Double dh = 0.0;
+        Double jdl = 0.0;
 //        List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
 //        List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
 //        if(listYlb.size()>0){
@@ -4806,16 +4817,63 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //				
 //			}
 //        }
-
-        List<Ylxxb> listylxxb = ylxxbRepository.queryListYlxxb(s.getClZbh(), fcrq);
-        for (int i = 0; i < listylxxb.size(); i++) {
-            Ylxxb t = listylxxb.get(i);
-            jzl = Arith.add(jzl, t.getJzl());
+        //加油数据
+        List<Refuel> refuels=refuelRepository.findByDate(fcrq, s.getClZbh(),"%%");
+        for (Refuel refuel : refuels) {
+            if(refuel.getInOil()!=null && !"".equals(refuel.getInOil())){
+                jcyl=Double.parseDouble(refuel.getInOil());
+            }
+            if(ccyl==0 && refuel.getOutOil()!=null && !"".equals(refuel.getOutOil())){
+                ccyl=Double.parseDouble(refuel.getOutOil());
+            }
+            if(refuel.getInStation0()!=null && !"".equals(refuel.getInStation0())){
+                jzl = Arith.add(jzl, refuel.getInStation0());
+            }
+            if(refuel.getInStation5()!=null && !"".equals(refuel.getInStation5())){
+                jzl = Arith.add(jzl, refuel.getInStation5());
+            }
+            if(refuel.getOilCard0()!=null && !"".equals(refuel.getOilCard0())){
+                jzl = Arith.add(jzl, refuel.getOilCard0());
+            }
+            if(refuel.getOilCard10()!=null && !"".equals(refuel.getOilCard10())){
+                jzl = Arith.add(jzl, refuel.getOilCard10());
+            }
+            if(refuel.getEastStation0()!=null && !"".equals(refuel.getEastStation0())){
+                jzl = Arith.add(jzl, refuel.getEastStation0());
+            }
+            if(refuel.getEastStation10()!=null && !"".equals(refuel.getEastStation10())){
+                jzl = Arith.add(jzl, refuel.getEastStation10());
+            }
+            if(refuel.getOutStation0()!=null && !"".equals(refuel.getOutStation0())){
+                jzl = Arith.add(jzl, refuel.getOutStation0());
+            }
+            if(refuel.getOutStation10()!=null && !"".equals(refuel.getOutStation10())){
+                jzl = Arith.add(jzl, refuel.getOutStation10());
+            }
         }
+        yh=Arith.sub(Arith.add(ccyl,jzl),jcyl);
         map.put("jzl", jzl);
         map.put("yh", yh);
         map.put("ccyl", ccyl);
         map.put("jcyl", jcyl);
+        //充电数据
+        List<JdlReception> jdlReceptionList=jdlReceptionRepository.queryListByDateStrAndCar(fcrq, s.getClZbh());
+        for (JdlReception jdlReception : jdlReceptionList) {
+            if(jdlReception.getEndSoc()!=null && !"".equals(jdlReception.getEndSoc())){
+                jcdl=jdlReception.getEndSoc();
+            }
+            if(ccdl==0 && jdlReception.getStartSoc()!=null && !"".equals(jdlReception.getStartSoc())){
+                ccdl=jdlReception.getStartSoc();
+            }
+            if(jdlReception.getChargeCapacity()!=null && !"".equals(jdlReception.getChargeCapacity())){
+                jdl = Arith.add(jdl, jdlReception.getChargeCapacity());
+            }
+        }
+        dh=jdl;
+        map.put("jdl", jdl);
+        map.put("dh", dh);
+        map.put("jcdl", jcdl);
+        map.put("ccdl", ccdl);
         map.put("type", type);
         map.put("zlc", zlc);
         map.put("xlName", s.getXlName());
@@ -272,12 +272,19 @@
           <td colspan="17">路别:{{map.xlName}}    车号:{{map.clZbh}}   出场时间:{{map.fcsjActual}}   到达站名:{{map.zdzName}}     日期:{{map.scheduleDate}}</td>
       </tr>
       <tr>
-          <td colspan="2">出场存油 &nbsp;升</td>
+          <td colspan="2">出场 {{map.ccyl}}升</td>
           <td colspan="3">加注油量 {{map.jzl}}升</td>
-          <td colspan="2">进场存油 &nbsp;升</td>
+          <td colspan="2">进场存油 &nbsp{{map.jcyl}}升</td>
           <td colspan="5">加注机油 &nbsp;升</td>
-          <td colspan="5">本日耗油 &nbsp;升</td>
+          <td colspan="5">本日耗油 &nbsp;{{map.yh}}升</td>
       </tr>
+	  <tr>
+		  <td colspan="2">出场 {{map.ccdl}}</td>
+		  <td colspan="3">加注电量 {{map.jdl}}度</td>
+		  <td colspan="2">进场存电 &nbsp{{map.jcdl}}</td>
+		  <td colspan="5"></td>
+		  <td colspan="5">本日耗电 &nbsp;{{map.dh}}度</td>
+	  </tr>
       <tr>
           <td colspan="2">调度员</td>
           <td colspan="2">早班(职号)</td>