|
@@ -126,14 +126,10 @@ public class TwinRzCalcMonthController extends BaseController {
|
|
cells[26].setCellValue(vo.getTotalPrice().doubleValue());
|
|
cells[26].setCellValue(vo.getTotalPrice().doubleValue());
|
|
if (vo.getLength() != null) {
|
|
if (vo.getLength() != null) {
|
|
cells[27].setCellValue(vo.getLength().doubleValue());
|
|
cells[27].setCellValue(vo.getLength().doubleValue());
|
|
- }
|
|
|
|
- if (vo.getLengthPrice() != null) {
|
|
|
|
- cells[28].setCellValue(vo.getLengthPrice().doubleValue());
|
|
|
|
|
|
+ cells[29].setCellValue(vo.getLengthPrice().doubleValue());
|
|
}
|
|
}
|
|
if (vo.getWeight() != null) {
|
|
if (vo.getWeight() != null) {
|
|
- cells[29].setCellValue(vo.getWeight().doubleValue());
|
|
|
|
- }
|
|
|
|
- if (vo.getWeightPrice() != null) {
|
|
|
|
|
|
+ cells[28].setCellValue(vo.getWeight().doubleValue());
|
|
cells[30].setCellValue(vo.getWeightPrice().doubleValue());
|
|
cells[30].setCellValue(vo.getWeightPrice().doubleValue());
|
|
}
|
|
}
|
|
colNum.getAndIncrement();
|
|
colNum.getAndIncrement();
|