朱园亮 / xingyun-erp · Commits

Commit c55ed421ad6c687438974cad6671b9e7c2693156

Authored by 房远帅
2 parents b396992f 3c3a11d0

Merge branch 'master_after20' into master_cj_zq

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -1246,8 +1246,8 @@ public class ContractDistributorStandardController extends DefaultBaseController @@ -1246,8 +1246,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
1246 dataMap.put("buyerName", data.getBuyerName()); 1246 dataMap.put("buyerName", data.getBuyerName());
1247 dataMap.put("unitName", data.getUnit()); 1247 dataMap.put("unitName", data.getUnit());
1248 dataMap.put("totalQuantity", data.getTotalQuantity().setScale(0, RoundingMode.HALF_UP).toString()); 1248 dataMap.put("totalQuantity", data.getTotalQuantity().setScale(0, RoundingMode.HALF_UP).toString());
1249 - dataMap.put("totalAmountExcludingTax", data.getTotalAmountExcludingTax().setScale(2, RoundingMode.HALF_UP).toString());  
1250 - dataMap.put("totalAmountIncludingTax", data.getTotalAmountIncludingTax().setScale(2, RoundingMode.HALF_UP).toString()); 1249 + dataMap.put("totalAmountExcludingTax", data.getTotalAmountExcludingTax() == null ? "" : data.getTotalAmountExcludingTax().setScale(2, RoundingMode.HALF_UP).toString());
  1250 + dataMap.put("totalAmountIncludingTax", data.getTotalAmountIncludingTax() == null ? "" : data.getTotalAmountIncludingTax().setScale(2, RoundingMode.HALF_UP).toString());
1251 dataMap.put("totalAmountCapital", data.getTotalAmountCapital()); 1251 dataMap.put("totalAmountCapital", data.getTotalAmountCapital());
1252 dataMap.put("specialInstructions", data.getSpecialInstructions()); 1252 dataMap.put("specialInstructions", data.getSpecialInstructions());
1253 dataMap.put("depositInfo", data.getDepositInfo()); 1253 dataMap.put("depositInfo", data.getDepositInfo());