|
|
@ -1971,9 +1971,9 @@ public class PageController { |
|
|
String unit = applicationOutRecordMin.getUnit(); |
|
|
String unit = applicationOutRecordMin.getUnit(); |
|
|
if ("-1".equals(unit)) { |
|
|
if ("-1".equals(unit)) { |
|
|
if (inventoryById.getPrice() != null) { |
|
|
if (inventoryById.getPrice() != null) { |
|
|
sumPrice += (inventoryById.getPrice() * applicationOutRecordMin.getQuantity()); |
|
|
double amounts = inventoryById.getPrice() * applicationOutRecordMin.getQuantity(); |
|
|
} else { |
|
|
sumPrice = ObjectFormatUtil.sum(sumPrice,amounts); |
|
|
sumPrice += 0; |
|
|
|
|
|
} |
|
|
} |
|
|
sumUnit.append(inventoryById.getUnit()).append(","); |
|
|
sumUnit.append(inventoryById.getUnit()).append(","); |
|
|
} else { |
|
|
} else { |
|
|
@ -1989,9 +1989,7 @@ public class PageController { |
|
|
if (inventoryById.getPrice() != null) { |
|
|
if (inventoryById.getPrice() != null) { |
|
|
BigDecimal bd = BigDecimal.valueOf((inventoryById.getPrice() / scale * applicationOutRecordMin.getQuantity())); |
|
|
BigDecimal bd = BigDecimal.valueOf((inventoryById.getPrice() / scale * applicationOutRecordMin.getQuantity())); |
|
|
double v = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); |
|
|
double v = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); |
|
|
sumPrice += v; |
|
|
sumPrice = ObjectFormatUtil.sum(sumPrice,v); |
|
|
} else { |
|
|
|
|
|
sumPrice += 0; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -2395,9 +2393,7 @@ public class PageController { |
|
|
if (inventoryById.getPrice() != null) { |
|
|
if (inventoryById.getPrice() != null) { |
|
|
BigDecimal bd = BigDecimal.valueOf(inventoryById.getPrice() * recordMinP.getQuantity()); |
|
|
BigDecimal bd = BigDecimal.valueOf(inventoryById.getPrice() * recordMinP.getQuantity()); |
|
|
double v = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); |
|
|
double v = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); |
|
|
sumPrice += v; |
|
|
sumPrice = ObjectFormatUtil.sum(sumPrice,v); |
|
|
} else { |
|
|
|
|
|
sumPrice += 0.0; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} else { |
|
|
} else { |
|
|
@ -2414,9 +2410,7 @@ public class PageController { |
|
|
if (inventoryById.getPrice() != null) { |
|
|
if (inventoryById.getPrice() != null) { |
|
|
BigDecimal bd = BigDecimal.valueOf((inventoryById.getPrice() / scale * recordMinP.getQuantity())); |
|
|
BigDecimal bd = BigDecimal.valueOf((inventoryById.getPrice() / scale * recordMinP.getQuantity())); |
|
|
double v = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); |
|
|
double v = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); |
|
|
sumPrice += v; |
|
|
sumPrice = ObjectFormatUtil.sum(sumPrice,v); |
|
|
} else { |
|
|
|
|
|
sumPrice += 0.0; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
recordMinPList.add(recordMinP); |
|
|
recordMinPList.add(recordMinP); |
|
|
|