|
|
@@ -1878,7 +1878,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
Double imperfectGrainTotal = 0d;//不完善粒合计
|
|
|
Double bulkDensityTotal = 0d;//容重合计
|
|
|
Double jiaorenliTotal = 0d;//热损伤合计
|
|
|
- Double netWeightPriceTotal = 0d;//净重单价合计
|
|
|
+// Double netWeightPriceTotal = 0d;//净重单价合计
|
|
|
Double netWeightTotal = 0d;//净重合计
|
|
|
Double amountIngPayableTotal = 0d;//合计应付合计
|
|
|
for (int i = 0; i < dataList.size(); i++) {
|
|
|
@@ -2021,7 +2021,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
imperfectGrainTotal = imperfectGrainTotal + ((Double.valueOf(String.valueOf(exportVView.getImperfectGrain()!=null?exportVView.getImperfectGrain():"0"))) * (Double.valueOf(String.valueOf(exportVView.getNetWeight()!=null?exportVView.getNetWeight():"0"))));
|
|
|
bulkDensityTotal = bulkDensityTotal + ((Double.valueOf(String.valueOf(exportVView.getBulkDensity()!=null?exportVView.getBulkDensity():"0"))) * (Double.valueOf(String.valueOf(exportVView.getNetWeight()!=null?exportVView.getNetWeight():"0"))));
|
|
|
jiaorenliTotal = jiaorenliTotal + ((Double.valueOf(String.valueOf(exportVView.getJiaorenli()!=null?exportVView.getJiaorenli():"0"))) * (Double.valueOf(String.valueOf(exportVView.getNetWeight()!=null?exportVView.getNetWeight():"0"))));
|
|
|
- netWeightPriceTotal = netWeightPriceTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeightPrice()!=null?exportVView.getNetWeightPrice():"0")));
|
|
|
+// netWeightPriceTotal = netWeightPriceTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeightPrice()!=null?exportVView.getNetWeightPrice():"0")));
|
|
|
netWeightTotal = netWeightTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeight()!=null?exportVView.getNetWeight():"0")));
|
|
|
amountIngPayableTotal = amountIngPayableTotal + exportVView.getAmountIngPayable();
|
|
|
|
|
|
@@ -2084,7 +2084,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
cell = rowp.createCell(23);
|
|
|
cell.setCellStyle(styleDetail);
|
|
|
cell = rowp.createCell(24);
|
|
|
- cell.setCellValue(netWeightPriceTotal/dataList.size());
|
|
|
+ cell.setCellValue(amountIngPayableTotal/netWeightTotal);
|
|
|
cell.setCellStyle(contextstyle);
|
|
|
cell = rowp.createCell(25);
|
|
|
cell.setCellStyle(styleDetail);
|
|
|
@@ -2095,7 +2095,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
//纯重合计
|
|
|
cell = rowp.createCell(28);
|
|
|
cell.setCellValue(netWeightTotal);
|
|
|
- cell.setCellStyle(styleDetail);
|
|
|
+ cell.setCellStyle(contextstyle);
|
|
|
cell = rowp.createCell(29);
|
|
|
cell.setCellStyle(styleDetail);
|
|
|
cell = rowp.createCell(30);
|
|
|
@@ -2112,6 +2112,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
cell.setCellStyle(styleDetail);
|
|
|
cell = rowp.createCell(36);
|
|
|
cell.setCellValue(amountIngPayableTotal);
|
|
|
+ cell.setCellStyle(contextstyle);
|
|
|
cell = rowp.createCell(37);
|
|
|
cell.setCellStyle(styleDetail);
|
|
|
cell = rowp.createCell(38);
|
|
|
@@ -2869,7 +2870,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
//纯重合计
|
|
|
cell = rowp.createCell(30);
|
|
|
cell.setCellValue(netWeightTotal);
|
|
|
- cell.setCellStyle(styleDetail);
|
|
|
+ cell.setCellStyle(contextstyle);
|
|
|
cell = rowp.createCell(31);
|
|
|
cell.setCellStyle(styleDetail);
|
|
|
cell = rowp.createCell(32);
|
|
|
@@ -2888,7 +2889,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
cell.setCellStyle(styleDetail);
|
|
|
cell = rowp.createCell(39);
|
|
|
cell.setCellValue(amountIngPayableTotal);
|
|
|
- cell.setCellStyle(styleDetail);
|
|
|
+ cell.setCellStyle(contextstyle);
|
|
|
cell = rowp.createCell(40);
|
|
|
cell.setCellStyle(styleDetail);
|
|
|
cell = rowp.createCell(41);
|
