Commit bd5dbbd13f3415483e8003f18ff30b3f9383049b
1 parent
cc334fea
路单油量添加总里程
Showing
1 changed file
with
4 additions
and
1 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| @@ -3742,6 +3742,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -3742,6 +3742,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 3742 | Double jcyl = 0.0; | 3742 | Double jcyl = 0.0; |
| 3743 | Double yh = 0.0; | 3743 | Double yh = 0.0; |
| 3744 | Double jzl = 0.0; | 3744 | Double jzl = 0.0; |
| 3745 | + Double zlc=0.0; | ||
| 3745 | List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(),xlbm); | 3746 | List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(),xlbm); |
| 3746 | List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(),xlbm); | 3747 | List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(),xlbm); |
| 3747 | if(listYlb.size()>0){ | 3748 | if(listYlb.size()>0){ |
| @@ -3752,6 +3753,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -3752,6 +3753,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 3752 | jcyl=Arith.add(jcyl, y.getJzyl()); | 3753 | jcyl=Arith.add(jcyl, y.getJzyl()); |
| 3753 | yh =Arith.add(yh ,y.getYh()); | 3754 | yh =Arith.add(yh ,y.getYh()); |
| 3754 | jzl =Arith.add(jzl, y.getJzl()); | 3755 | jzl =Arith.add(jzl, y.getJzl()); |
| 3756 | + zlc =Arith.add(zlc, y.getZlc()); | ||
| 3755 | } | 3757 | } |
| 3756 | }else{ | 3758 | }else{ |
| 3757 | type=1; | 3759 | type=1; |
| @@ -3761,6 +3763,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -3761,6 +3763,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 3761 | jcyl=Arith.add(jcyl, d.getJzcd()); | 3763 | jcyl=Arith.add(jcyl, d.getJzcd()); |
| 3762 | yh =Arith.add(yh ,d.getHd()); | 3764 | yh =Arith.add(yh ,d.getHd()); |
| 3763 | jzl =Arith.add(jzl, d.getCdl()); | 3765 | jzl =Arith.add(jzl, d.getCdl()); |
| 3766 | + zlc =Arith.add(zlc, d.getZlc()); | ||
| 3764 | } | 3767 | } |
| 3765 | } | 3768 | } |
| 3766 | 3769 | ||
| @@ -3771,7 +3774,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -3771,7 +3774,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 3771 | map.put("ccyl", ccyl); | 3774 | map.put("ccyl", ccyl); |
| 3772 | map.put("jcyl", jcyl); | 3775 | map.put("jcyl", jcyl); |
| 3773 | map.put("type", type); | 3776 | map.put("type", type); |
| 3774 | - | 3777 | + map.put("zlc", zlc); |
| 3775 | map.put("xlName", s.getXlName()); | 3778 | map.put("xlName", s.getXlName()); |
| 3776 | map.put("clZbh", s.getClZbh()); | 3779 | map.put("clZbh", s.getClZbh()); |
| 3777 | map.put("plate", BasicData.nbbmCompanyPlateMap.get(s.getClZbh())); | 3780 | map.put("plate", BasicData.nbbmCompanyPlateMap.get(s.getClZbh())); |