朱园亮 / xingyun-erp · Commits

Commit 1ac46e3400bc9cd975432a4b43785c99438e85b6

Authored by 房远帅
1 parent 66d67479

楚江ERP:合同-导出问题修改

Inline Side-by-side
Showing 2 changed files with 5 additions and 1 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());