朱园亮 / xingyun-erp · Commits

Commit d8c0b10d378628883d4bfa65e5546e0f72445e38

Authored by 房远帅
2 parents 2b2b8433 1990ea67

Merge branch 'master_after0423' into master_after0506 

# Conflicts:
#	xingyun-sc/src/main/resources/templates/purchaseOrderTemplate.xlsx
#	xingyun-sc/src/main/resources/templates/purchaseOrderTemplateForProduction.xlsx
Inline Side-by-side
Showing 3 changed files with 4 additions and 4 deletions
@@ -190,9 +190,9 @@ public class BusinessDataExportHandler implements ExportHandler { @@ -190,9 +190,9 @@ public class BusinessDataExportHandler implements ExportHandler {
190 BigDecimal totalQuantity = BigDecimal.ZERO; 190 BigDecimal totalQuantity = BigDecimal.ZERO;
191 List<PurchaseOrderLine> purchaseOrderLineList = orderLineMap.get(orderInfo.getId()); 191 List<PurchaseOrderLine> purchaseOrderLineList = orderLineMap.get(orderInfo.getId());
192 if (CollectionUtils.isNotEmpty(purchaseOrderLineList)) { 192 if (CollectionUtils.isNotEmpty(purchaseOrderLineList)) {
193 - for (int i = startRow + 1; i < startRow + purchaseOrderLineList.size(); i++) {  
194 - ExcelUtil.copyRow(workbook, sheet, startRow, i);  
195 - } 193 +// for (int i = startRow + 1; i < startRow + purchaseOrderLineList.size(); i++) {
  194 +// ExcelUtil.copyRow(workbook, sheet, startRow, i);
  195 +// }
196 for (PurchaseOrderLine currentOrderLine : purchaseOrderLineList) { 196 for (PurchaseOrderLine currentOrderLine : purchaseOrderLineList) {
197 ExcelUtil.setCellValue(sheet, startRow, 1, currentOrderLine.getIndustry()); 197 ExcelUtil.setCellValue(sheet, startRow, 1, currentOrderLine.getIndustry());
198 ExcelUtil.setCellValue(sheet, startRow, 2, currentOrderLine.getQuality()); 198 ExcelUtil.setCellValue(sheet, startRow, 2, currentOrderLine.getQuality());
@@ -219,7 +219,7 @@ public class BusinessDataExportHandler implements ExportHandler { @@ -219,7 +219,7 @@ public class BusinessDataExportHandler implements ExportHandler {
219 formulaComponent.setSub(currentOrderLine.getLengthTolNeg()); 219 formulaComponent.setSub(currentOrderLine.getLengthTolNeg());
220 formulaComponentList.add(formulaComponent); 220 formulaComponentList.add(formulaComponent);
221 } 221 }
222 - String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList); 222 + String latex = LatexFormulaExcelExporterUtil.convertToContractSpecLatexSingleLineFixed3(formulaComponentList);
223 if (StringUtils.isNotBlank(latex)) { 223 if (StringUtils.isNotBlank(latex)) {
224 LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 4, 1, 7); 224 LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 4, 1, 7);
225 } 225 }