Commit ce60fe55211c2dfdfc140d7b72325ba5c82aa40a
1 parent
56567f7d
油量计算 一车多单 加判断条件
Showing
1 changed file
with
8 additions
and
2 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
| @@ -607,8 +607,14 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | @@ -607,8 +607,14 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | ||
| 607 | if(j==iterator2.size()-1){ | 607 | if(j==iterator2.size()-1){ |
| 608 | ylxs=czyl; | 608 | ylxs=czyl; |
| 609 | }else{ | 609 | }else{ |
| 610 | - l=Math.round(nextJzyl); | ||
| 611 | - ylxs=l*100/100; | 610 | +// l=Math.round(nextJzyl); |
| 611 | +// ylxs=l*100/100; | ||
| 612 | + if(iterator2.get(j+1).getNbbm().equals(t.getNbbm())){ | ||
| 613 | + l=Math.round(nextJzyl); | ||
| 614 | + ylxs=l*100/100; | ||
| 615 | + }else{ | ||
| 616 | + ylxs=czyl; | ||
| 617 | + } | ||
| 612 | 618 | ||
| 613 | } | 619 | } |
| 614 | yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs)); | 620 | yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs)); |