朱园亮 / xingyun-erp · Commits

Commit 1d9e0338063444511d13f42a381bacd3bcfa2a33

Authored by yeqianyong
2 parents 8fc06b4a c55ed421

Merge remote-tracking branch 'origin/master_cj_zq' into master_cj_zq

Inline Side-by-side
Showing 2 changed files with 7 additions and 3 deletions
@@ -1146,7 +1146,11 @@ public class ContractDistributorStandardController extends DefaultBaseController @@ -1146,7 +1146,11 @@ public class ContractDistributorStandardController extends DefaultBaseController
1146 for (GetContractStdProcessingLineBo line : data.getContractStdProcessingLineList()) { 1146 for (GetContractStdProcessingLineBo line : data.getContractStdProcessingLineList()) {
1147 setCellValue(sheet, startRow, 1, line.getRawProductName() + "、" + line.getRawProductGrade()); 1147 setCellValue(sheet, startRow, 1, line.getRawProductName() + "、" + line.getRawProductGrade());
1148 setCellValue(sheet, startRow, 4, line.getSupplyTime()); 1148 setCellValue(sheet, startRow, 4, line.getSupplyTime());
1149 - setCellValue(sheet, startRow, 5, line.getMaterialProductRatioName()); 1149 + if ("其它".equals(line.getMaterialProductRatioName())) {
  1150 + setCellValue(sheet, startRow, 5, line.getMaterialProductRatioName() + "|" + line.getMaterialProductRatioRemarks());
  1151 + } else {
  1152 + setCellValue(sheet, startRow, 5, line.getMaterialProductRatioName());
  1153 + }
1150 setCellValue(sheet, startRow, 6, line.getProductName()); 1154 setCellValue(sheet, startRow, 6, line.getProductName());
1151 setCellValue(sheet, startRow, 7, line.getProductGrade()); 1155 setCellValue(sheet, startRow, 7, line.getProductGrade());
1152 setCellValue(sheet, startRow, 8, line.getProductQuantity()); 1156 setCellValue(sheet, startRow, 8, line.getProductQuantity());
@@ -1242,8 +1246,8 @@ public class ContractDistributorStandardController extends DefaultBaseController @@ -1242,8 +1246,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
1242 dataMap.put("buyerName", data.getBuyerName()); 1246 dataMap.put("buyerName", data.getBuyerName());
1243 dataMap.put("unitName", data.getUnit()); 1247 dataMap.put("unitName", data.getUnit());
1244 dataMap.put("totalQuantity", data.getTotalQuantity().setScale(0, RoundingMode.HALF_UP).toString()); 1248 dataMap.put("totalQuantity", data.getTotalQuantity().setScale(0, RoundingMode.HALF_UP).toString());
1245 - dataMap.put("totalAmountExcludingTax", data.getTotalAmountExcludingTax().setScale(2, RoundingMode.HALF_UP).toString());  
1246 - 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());
1247 dataMap.put("totalAmountCapital", data.getTotalAmountCapital()); 1251 dataMap.put("totalAmountCapital", data.getTotalAmountCapital());
1248 dataMap.put("specialInstructions", data.getSpecialInstructions()); 1252 dataMap.put("specialInstructions", data.getSpecialInstructions());
1249 dataMap.put("depositInfo", data.getDepositInfo()); 1253 dataMap.put("depositInfo", data.getDepositInfo());