src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -367,14 +367,14 @@ @ApiOperation("销售发货历史数据导入-已发货导入模板下载") public void shippingImportTemplate(HttpServletResponse response) { ExcelUtil<SalesShippingImportDto> excelUtil = new ExcelUtil<>(SalesShippingImportDto.class); excelUtil.importTemplateExcel(response, "已发货导入模板下载"); excelUtil.importTemplateExcel(response, "已出库导入模板下载"); } @PostMapping("/salesHistory/notShippingImportTemplate") @ApiOperation("销售发货历史数据导入-未发货导入模板下载") public void notShippingImportTemplate(HttpServletResponse response) { ExcelUtil<SalesNotShippingImportDto> excelUtil = new ExcelUtil<>(SalesNotShippingImportDto.class); excelUtil.importTemplateExcel(response, "未发货导入模板下载"); excelUtil.importTemplateExcel(response, "未出库导入模板下载"); } } src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -465,9 +465,10 @@ salesLedger.setReceiptPaymentAmountTotal(receiptPaymentAmountTotal); salesLedger.setNoReceiptAmount(noReceiptPaymentAmountTotal); boolean hasInvoiceOperation = invoiceTotal.compareTo(BigDecimal.ZERO) > 0; boolean hasReceiptOperation = receiptPaymentAmountTotal.compareTo(BigDecimal.ZERO) > 0; salesLedger.setIsEdit(!(hasInvoiceOperation || hasReceiptOperation)); boolean isFh = salesLedger.getDeliveryStatus() != null && salesLedger.getDeliveryStatus() == 5; salesLedger.setIsFh(isFh); salesLedger.setIsEdit(!isFh); } if (salesLedgerDto.getStatus() != null && salesLedgerDto.getStatus()) {