Commit f110d51d089998215d42f350394e8861e4c11b61

Authored by 潘钊
1 parent cbdbf9b7

update...

src/main/java/com/bsth/server_ws/util/WSDataConver.java
@@ -295,6 +295,8 @@ public class WSDataConver { @@ -295,6 +295,8 @@ public class WSDataConver {
295 Collections.sort(oilArray, oilComp); 295 Collections.sort(oilArray, oilComp);
296 //出厂存油 296 //出厂存油
297 sn_waybill.setOut_oil(oilArray.get(0).getCzyl()); 297 sn_waybill.setOut_oil(oilArray.get(0).getCzyl());
  298 + //油料加注
  299 + sn_waybill.setAdd_oil(sumAddOil(oilArray));
298 //进场存油 300 //进场存油
299 sn_waybill.setEnd_oil(oilArray.get(oilArray.size() - 1).getJzyl()); 301 sn_waybill.setEnd_oil(oilArray.get(oilArray.size() - 1).getJzyl());
300 //油料消耗 302 //油料消耗
@@ -463,6 +465,14 @@ public class WSDataConver { @@ -463,6 +465,14 @@ public class WSDataConver {
463 return sum; 465 return sum;
464 } 466 }
465 467
  468 + private static double sumAddOil(List<OilInfo> oilArray) {
  469 + double sum = 0;
  470 + for (OilInfo oilInfo : oilArray) {
  471 + sum = Arith.add(sum, oilInfo.getJzl());
  472 + }
  473 + return sum;
  474 + }
  475 +
466 private static double countOilExpend(List<OilInfo> oilArray, String jGh) { 476 private static double countOilExpend(List<OilInfo> oilArray, String jGh) {
467 double sum = 0; 477 double sum = 0;
468 for (OilInfo oilInfo : oilArray) { 478 for (OilInfo oilInfo : oilArray) {