Commit 1652e74d1be84f8bc63ff113df66791827086bd7

Authored by 房远帅
1 parent a269d4e9

发货:发货模板导出问题修改

... ... @@ -144,7 +144,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
144 144 * 填写实际发货日期
145 145 */
146 146 @ApiOperation("填写实际发货日期")
147   - @HasPermission({"shipping-plan-manage:invoice:modify"})
  147 + @HasPermission({"shipping-plan-manage:invoice:fill-date"})
148 148 @PutMapping
149 149 public InvokeResult<Void> update(@Valid UpdateShipmentsOrderInfoVo vo) {
150 150 shipmentsOrderInfoService.updateShipmentDate(vo);
... ... @@ -400,9 +400,9 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
400 400 // 发货单明细开始行
401 401 int startRow = 4;
402 402 DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
403   - for (int i = startRow + 1; i < startRow + detailList.size(); i++) {
404   - ExcelUtil.copyRow(workbook, sheet, startRow, i);
405   - }
  403 +// for (int i = startRow + 1; i < startRow + detailList.size(); i++) {
  404 +// ExcelUtil.copyRow(workbook, sheet, startRow, i);
  405 +// }
406 406 BigDecimal totalQuantity = BigDecimal.ZERO;
407 407 BigDecimal totalActualQuantity = BigDecimal.ZERO;
408 408 BigDecimal totalNum = BigDecimal.ZERO;
... ... @@ -510,9 +510,9 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
510 510 formulaComponent.setSub(detail.getLengthTolNeg());
511 511 formulaComponentList.add(formulaComponent);
512 512 }
513   - String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
  513 + String latex = LatexFormulaExcelExporterUtil.convertToContractSpecLatexSingleLineFixed3(formulaComponentList);
514 514 if (StringUtils.isNotBlank(latex)) {
515   - LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 2, 1, 7);
  515 + LatexFormulaExcelExporterUtil.insertLatexImageToCellLeftAligned(workbook, sheet, latex, startRow, 2, 1, 7);
516 516 }
517 517 String materialCode = resultMaterialMap.get(detail.getOrderSpecId());
518 518 ExcelUtil.setCellValue(sheet, startRow, 9, materialCode);
... ...