楚江ERP：加工标准合同打印

@@ -328,7 +328,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
                 String materialProductRatioName = rawToProdRatioCodeAndNameMap.get(contractStdProcessingLineBo.getMaterialProductRatio());
                 contractStdProcessingLineBo.setRawProductName(rawProductName);
                 contractStdProcessingLineBo.setProductName(productName);
-                contractStdProcessingLine.setMaterialProductRatio(materialProductRatioName);
+                contractStdProcessingLineBo.setMaterialProductRatioName(materialProductRatioName);
                 lineBoList.add(contractStdProcessingLineBo);
             });
 
@@ -751,6 +751,55 @@ public class ContractDistributorStandardController extends DefaultBaseController
                         }
                     }
 
+                    if (CollectionUtils.isNotEmpty(data.getContractStdProcessingLineList())) {
+                        startRow++;
+                        for (GetContractStdProcessingLineBo contractStdProcessingLineBo : data.getContractStdProcessingLineList()) {
+                            setCellValue(sheet, startRow, 1, contractStdProcessingLineBo.getRawProductName() + "、" + contractStdProcessingLineBo.getRawProductGrade()); // B列
+                            setCellValue(sheet, startRow, 4, contractStdProcessingLineBo.getSupplyTime()); // D列
+                            setCellValue(sheet, startRow, 5, contractStdProcessingLineBo.getMaterialProductRatioName()); // D列
+                            setCellValue(sheet, startRow, 6, contractStdProcessingLineBo.getProductName()); // D列
+                            setCellValue(sheet, startRow, 7, contractStdProcessingLineBo.getProductGrade()); // D列
+                            setCellValue(sheet, startRow, 8, contractStdProcessingLineBo.getProductQuantity()); // D列
+
+                            List<LatexFormulaExcelExporterUtil.FormulaComponent> formulaComponentList = new ArrayList<>(3);
+                            if (contractStdProcessingLineBo.getThickness() != null) {
+                                LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                                formulaComponent.setBase(contractStdProcessingLineBo.getThickness());
+                                formulaComponent.setSup(contractStdProcessingLineBo.getThicknessTolPos());
+                                formulaComponent.setSub(contractStdProcessingLineBo.getThicknessTolNeg());
+                                formulaComponentList.add(formulaComponent);
+                            }
+
+                            if (contractStdProcessingLineBo.getWidth() != null) {
+                                LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                                formulaComponent.setBase(contractStdProcessingLineBo.getWidth());
+                                formulaComponent.setSup(contractStdProcessingLineBo.getWidthTolPos());
+                                formulaComponent.setSub(contractStdProcessingLineBo.getWidthTolNeg());
+                                formulaComponentList.add(formulaComponent);
+                            }
+
+                            if (contractStdProcessingLineBo.getLength() != null) {
+                                LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                                formulaComponent.setBase(contractStdProcessingLineBo.getLength());
+                                formulaComponent.setSup(contractStdProcessingLineBo.getLengthTolPos());
+                                formulaComponent.setSub(contractStdProcessingLineBo.getLengthTolNeg());
+                                formulaComponentList.add(formulaComponent);
+                            }
+
+                            String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
+                            if (StringUtils.isNotBlank(latex)) {
+                                LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 9);// E列
+                            }
+
+                            setCellValue(sheet, startRow, 10, contractStdProcessingLineBo.getProductStatus()); // D列
+                            setCellValue(sheet, startRow, 11, contractStdProcessingLineBo.getUnitPrice()); // D列
+                            setCellValue(sheet, startRow, 12, contractStdProcessingLineBo.getAmountExcludingTax()); // D列
+                            setCellValue(sheet, startRow, 13, contractStdProcessingLineBo.getTotalAmount()); // D列
+                            setCellValue(sheet, startRow, 14, contractStdProcessingLineBo.getDeliveryDate() != null ?
+                                    contractStdProcessingLineBo.getDeliveryDate().format(dateFormatter) : ""); // D列
+                        }
+                    }
+
                     Map<String, Object> dataMap = new HashMap<>();
                     dataMap.put("title", contractTitle);
                     dataMap.put("code", data.getCode());