diff --git a/core/api/src/main/java/com/wansenai/api/financial/CollectionReceiptController.java b/core/api/src/main/java/com/wansenai/api/financial/CollectionReceiptController.java index 9d431ebf..86fdd319 100644 --- a/core/api/src/main/java/com/wansenai/api/financial/CollectionReceiptController.java +++ b/core/api/src/main/java/com/wansenai/api/financial/CollectionReceiptController.java @@ -71,4 +71,9 @@ public Response updateCollectionReceiptStatusByIds(@RequestParam("ids") public void exportCollectionReceipt(@ModelAttribute QueryCollectionDTO queryCollectionDTO, HttpServletResponse response) { collectionReceiptService.exportCollectionReceipt(queryCollectionDTO, response); } + + @GetMapping("exportDetail/{receiptNumber}") + public void exportCollectionReceiptDetail(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) { + collectionReceiptService.exportCollectionReceiptDetail(receiptNumber, response); + } } diff --git a/core/api/src/main/java/com/wansenai/api/financial/ExpenseReceiptController.java b/core/api/src/main/java/com/wansenai/api/financial/ExpenseReceiptController.java index dd50ddc8..d5239f35 100644 --- a/core/api/src/main/java/com/wansenai/api/financial/ExpenseReceiptController.java +++ b/core/api/src/main/java/com/wansenai/api/financial/ExpenseReceiptController.java @@ -71,4 +71,9 @@ public Response updateExpenseReceiptStatusByIds(@RequestParam("ids") Lis public void exportExpenseReceipt(@ModelAttribute QueryExpenseDTO queryExpenseDTO, HttpServletResponse response) { expenseReceiptService.exportExpenseReceipt(queryExpenseDTO, response); } + + @GetMapping("exportDetail/{receiptNumber}") + public void exportExpenseReceiptDetail(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) { + expenseReceiptService.exportExpenseReceiptDetail(receiptNumber, response); + } } diff --git a/core/api/src/main/java/com/wansenai/api/financial/IncomeReceiptController.java b/core/api/src/main/java/com/wansenai/api/financial/IncomeReceiptController.java index b6c7e70e..f28b8f7e 100644 --- a/core/api/src/main/java/com/wansenai/api/financial/IncomeReceiptController.java +++ b/core/api/src/main/java/com/wansenai/api/financial/IncomeReceiptController.java @@ -71,4 +71,9 @@ public Response updateIncomeReceiptStatusByIds(@RequestParam("ids") List public void exportIncomeReceipt(@ModelAttribute QueryIncomeDTO queryIncomeDTO, HttpServletResponse response) { incomeReceiptService.exportIncomeReceipt(queryIncomeDTO, response); } + + @GetMapping("exportDetail/{receiptNumber}") + public void exportIncomeReceiptDetail(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) { + incomeReceiptService.exportIncomeReceiptDetail(receiptNumber, response); + } } diff --git a/core/api/src/main/java/com/wansenai/api/financial/PaymentReceiptController.java b/core/api/src/main/java/com/wansenai/api/financial/PaymentReceiptController.java index 1b34584f..e974a8fc 100644 --- a/core/api/src/main/java/com/wansenai/api/financial/PaymentReceiptController.java +++ b/core/api/src/main/java/com/wansenai/api/financial/PaymentReceiptController.java @@ -71,4 +71,9 @@ public Response updatePaymentReceiptStatusByIds(@RequestParam("ids") Lis public void exportPaymentReceipt(@ModelAttribute QueryPaymentDTO queryPaymentDTO, HttpServletResponse response) { paymentReceiptService.exportPaymentReceipt(queryPaymentDTO, response); } + + @GetMapping("exportDetail/{receiptNumber}") + public void exportPaymentReceiptDetail(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) { + paymentReceiptService.exportPaymentReceiptDetail(receiptNumber, response); + } } diff --git a/core/api/src/main/java/com/wansenai/api/financial/TransferReceiptController.java b/core/api/src/main/java/com/wansenai/api/financial/TransferReceiptController.java index 9ee4b8f6..c10189c5 100644 --- a/core/api/src/main/java/com/wansenai/api/financial/TransferReceiptController.java +++ b/core/api/src/main/java/com/wansenai/api/financial/TransferReceiptController.java @@ -71,4 +71,9 @@ public Response updateTransferReceiptStatusByIds(@RequestParam("ids") Li public void exportTransferReceipt(@ModelAttribute QueryTransferDTO queryTransferDTO, HttpServletResponse response) { transferReceiptService.exportTransferReceipt(queryTransferDTO, response); } + + @GetMapping("exportDetail/{receiptNumber}") + public void exportTransferReceiptDetail(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) { + transferReceiptService.exportTransferReceiptDetail(receiptNumber, response); + } } diff --git a/core/api/src/main/java/com/wansenai/api/receipt/PurchaseController.java b/core/api/src/main/java/com/wansenai/api/receipt/PurchaseController.java index 62ddf183..131a74e4 100644 --- a/core/api/src/main/java/com/wansenai/api/receipt/PurchaseController.java +++ b/core/api/src/main/java/com/wansenai/api/receipt/PurchaseController.java @@ -140,13 +140,28 @@ public void exportOrderExcel(@ModelAttribute QueryPurchaseOrderDTO queryPurchase purchaseService.exportPurchaseOrderExcel(queryPurchaseOrderDTO, response); } + @GetMapping("/order/exportDetail/{receiptNumber}") + public void exportOrderDetailExcel(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) throws Exception { + purchaseService.exportPurchaseOrderDetailExcel(receiptNumber, response); + } + @GetMapping("/storage/export") public void exportStorageExcel(@ModelAttribute QueryPurchaseStorageDTO queryPurchaseStorageDTO, HttpServletResponse response) throws Exception { purchaseService.exportPurchaseStorageExcel(queryPurchaseStorageDTO, response); } + @GetMapping("/storage/exportDetail/{receiptNumber}") + public void exportStorageDetailExcel(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) throws Exception { + purchaseService.exportPurchaseStorageDetailExcel(receiptNumber, response); + } + @GetMapping("/refund/export") public void exportRefundExcel(@ModelAttribute QueryPurchaseRefundDTO queryPurchaseRefundDTO, HttpServletResponse response) throws Exception { purchaseService.exportPurchaseRefundExcel(queryPurchaseRefundDTO, response); } + + @GetMapping("/refund/exportDetail/{receiptNumber}") + public void exportRefundDetailExcel(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) throws Exception { + purchaseService.exportPurchaseRefundDetailExcel(receiptNumber, response); + } } diff --git a/core/api/src/main/java/com/wansenai/api/receipt/RetailController.java b/core/api/src/main/java/com/wansenai/api/receipt/RetailController.java index 9566de8e..6467bca2 100644 --- a/core/api/src/main/java/com/wansenai/api/receipt/RetailController.java +++ b/core/api/src/main/java/com/wansenai/api/receipt/RetailController.java @@ -27,6 +27,7 @@ import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.bind.annotation.*; +import java.io.IOException; import java.util.List; @RestController @@ -109,8 +110,18 @@ public void exportShipmentsExcel(@ModelAttribute QueryShipmentsDTO queryShipment receiptRetailService.exportRetailShipmentsExcel(queryShipmentsDTO, response); } + @GetMapping("/shipments/exportDetail/{receiptNumber}") + public void exportShipmentsDetailExcel(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) throws IOException { + receiptRetailService.exportShipmentsDetailExcel(receiptNumber, response); + } + @GetMapping("/refund/export") public void exportRefundExcel(@ModelAttribute QueryRetailRefundDTO queryRetailRefundDTO, HttpServletResponse response) throws Exception { receiptRetailService.exportRetailRefundExcel(queryRetailRefundDTO, response); } + + @GetMapping("/refund/exportDetail/{receiptNumber}") + public void exportRefundDetailExcel(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) throws IOException { + receiptRetailService.exportRefundDetailExcel(receiptNumber, response); + } } diff --git a/core/api/src/main/java/com/wansenai/api/receipt/SalesController.java b/core/api/src/main/java/com/wansenai/api/receipt/SalesController.java index fb9a5123..11594b33 100644 --- a/core/api/src/main/java/com/wansenai/api/receipt/SalesController.java +++ b/core/api/src/main/java/com/wansenai/api/receipt/SalesController.java @@ -132,13 +132,30 @@ public void exportOrderExcel(@ModelAttribute QuerySaleOrderDTO querySaleOrderDTO receiptSaleService.exportSaleOrderExcel(querySaleOrderDTO, response); } + @GetMapping("/order/exportDetail/{receiptNumber}") + public void exportSaleOrderDetailExcel(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) throws Exception { + receiptSaleService.exportSaleOrderDetailExcel(receiptNumber, response); + } + @GetMapping("/shipments/export") - public void exportStorageExcel(@ModelAttribute QuerySaleShipmentsDTO querySaleShipmentsDTO, HttpServletResponse response) throws Exception { + public void exportSaleShipmentsExcel(@ModelAttribute QuerySaleShipmentsDTO querySaleShipmentsDTO, HttpServletResponse response) throws Exception { receiptSaleService.exportSaleShipmentsExcel(querySaleShipmentsDTO, response); } + @GetMapping("/shipments/exportDetail/{receiptNumber}") + public void exportSaleShipmentsDetailExcel(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) throws Exception { + receiptSaleService.exportSaleShipmentsDetailExcel(receiptNumber, response); + } + + @GetMapping("/refund/export") public void exportRefundExcel(@ModelAttribute QuerySaleRefundDTO querySaleRefundDTO, HttpServletResponse response) throws Exception { receiptSaleService.exportSaleRefundExcel(querySaleRefundDTO, response); } + + @GetMapping("/refund/exportDetail/{receiptNumber}") + public void exportSaleRefundDetailExcel(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) throws Exception { + receiptSaleService.exportSaleRefundDetailExcel(receiptNumber, response); + } + } diff --git a/core/api/src/main/java/com/wansenai/api/warehouse/AllotShipmentsController.java b/core/api/src/main/java/com/wansenai/api/warehouse/AllotShipmentsController.java index febb2e14..555c2acb 100644 --- a/core/api/src/main/java/com/wansenai/api/warehouse/AllotShipmentsController.java +++ b/core/api/src/main/java/com/wansenai/api/warehouse/AllotShipmentsController.java @@ -64,4 +64,8 @@ public void exportAllotShipments(@ModelAttribute QueryAllotReceiptDTO queryAllot allotShipmentsService.exportAllotReceipt(queryAllotReceiptDTO, response); } + @GetMapping("exportDetail/{receiptNumber}") + public void exportAllotShipmentsDetail(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) throws Exception { + allotShipmentsService.exportAllotReceiptDetail(receiptNumber, response); + } } diff --git a/core/api/src/main/java/com/wansenai/api/warehouse/AssembleController.java b/core/api/src/main/java/com/wansenai/api/warehouse/AssembleController.java index 3f40cc47..7c96d681 100644 --- a/core/api/src/main/java/com/wansenai/api/warehouse/AssembleController.java +++ b/core/api/src/main/java/com/wansenai/api/warehouse/AssembleController.java @@ -63,4 +63,9 @@ public Response updateAssembleReceiptStatusByIds(@RequestParam("ids") Li public void exportAssembleReceipt(@ModelAttribute QueryAssembleReceiptDTO queryAssembleReceiptDTO, HttpServletResponse response) throws Exception { assembleService.exportAssembleReceipt(queryAssembleReceiptDTO, response); } + + @GetMapping("exportDetail/{receiptNumber}") + public void exportAssembleReceiptDetail(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) throws Exception { + assembleService.exportAssembleReceiptDetail(receiptNumber, response); + } } diff --git a/core/api/src/main/java/com/wansenai/api/warehouse/DisAssembleController.java b/core/api/src/main/java/com/wansenai/api/warehouse/DisAssembleController.java index 8f737fc4..0ee9ffb4 100644 --- a/core/api/src/main/java/com/wansenai/api/warehouse/DisAssembleController.java +++ b/core/api/src/main/java/com/wansenai/api/warehouse/DisAssembleController.java @@ -63,4 +63,9 @@ public Response updateDisAssembleReceiptStatusByIds(@RequestParam("ids") public void exportDisAssembleReceipt(@ModelAttribute QueryDisassembleReceiptDTO queryDisassembleReceiptDTO, HttpServletResponse response) throws Exception { disassembleService.exportDisAssembleReceipt(queryDisassembleReceiptDTO, response); } + + @GetMapping("exportDetail/{receiptNumber}") + public void exportDisAssembleReceiptDetail(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) throws Exception { + disassembleService.exportDisAssembleReceiptDetail(receiptNumber, response); + } } diff --git a/core/api/src/main/java/com/wansenai/api/warehouse/OtherShipmentsController.java b/core/api/src/main/java/com/wansenai/api/warehouse/OtherShipmentsController.java index 5fe77806..0e2ebaa6 100644 --- a/core/api/src/main/java/com/wansenai/api/warehouse/OtherShipmentsController.java +++ b/core/api/src/main/java/com/wansenai/api/warehouse/OtherShipmentsController.java @@ -63,4 +63,9 @@ public Response updateOtherShipmentsStatusByIds(@RequestParam("ids") Lis public void exportOtherShipments(@ModelAttribute QueryOtherShipmentDTO queryOtherShipmentDTO, HttpServletResponse response) throws Exception { otherShipmentsService.exportOtherShipments(queryOtherShipmentDTO, response); } + + @GetMapping("exportDetail/{receiptNumber}") + public void exportOtherShipmentsDetail(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) throws Exception { + otherShipmentsService.exportOtherShipmentsDetail(receiptNumber, response); + } } diff --git a/core/api/src/main/java/com/wansenai/api/warehouse/OtherStorageController.java b/core/api/src/main/java/com/wansenai/api/warehouse/OtherStorageController.java index 23f61aea..5bd25814 100644 --- a/core/api/src/main/java/com/wansenai/api/warehouse/OtherStorageController.java +++ b/core/api/src/main/java/com/wansenai/api/warehouse/OtherStorageController.java @@ -64,4 +64,9 @@ public void exportOtherStorage(@ModelAttribute QueryOtherStorageDTO queryOtherSt otherStorageService.exportOtherStorage(queryOtherStorageDTO, response); } + @GetMapping("exportDetail/{receiptNumber}") + public void exportOtherStorageDetail(@PathVariable("receiptNumber") String receiptNumber, HttpServletResponse response) throws Exception { + otherStorageService.exportOtherStorageDetail(receiptNumber, response); + } + } diff --git a/core/api/src/main/kotlin/com/wansenai/api/financial/AdvanceChargeController.kt b/core/api/src/main/kotlin/com/wansenai/api/financial/AdvanceChargeController.kt index ee16b21b..cb3d3a93 100644 --- a/core/api/src/main/kotlin/com/wansenai/api/financial/AdvanceChargeController.kt +++ b/core/api/src/main/kotlin/com/wansenai/api/financial/AdvanceChargeController.kt @@ -63,4 +63,9 @@ class AdvanceChargeController(private val advanceChargeService: AdvanceChargeSer fun export(@ModelAttribute advanceChargeDTO: QueryAdvanceChargeDTO, response: HttpServletResponse) { advanceChargeService.exportAdvanceCharge(advanceChargeDTO, response) } + + @GetMapping("exportDetail/{receiptNumber}") + fun exportDetail(@PathVariable receiptNumber: String, response: HttpServletResponse) { + advanceChargeService.exportAdvanceChargeDetail(receiptNumber, response) + } } \ No newline at end of file diff --git a/core/domain/src/main/java/com/wansenai/bo/AllotStockDataExportBO.java b/core/domain/src/main/java/com/wansenai/bo/AllotStockDataExportBO.java index 5e5ba8d5..e9bdf003 100644 --- a/core/domain/src/main/java/com/wansenai/bo/AllotStockDataExportBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/AllotStockDataExportBO.java @@ -13,13 +13,17 @@ package com.wansenai.bo; import com.wansenai.utils.excel.ExcelExport; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class AllotStockDataExportBO { @ExcelExport(value = "调拨单号") diff --git a/core/domain/src/main/java/com/wansenai/bo/AssembleStockDataExportBO.java b/core/domain/src/main/java/com/wansenai/bo/AssembleStockDataExportBO.java index 79bfab39..7c5178dc 100644 --- a/core/domain/src/main/java/com/wansenai/bo/AssembleStockDataExportBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/AssembleStockDataExportBO.java @@ -13,8 +13,10 @@ package com.wansenai.bo; import com.wansenai.utils.excel.ExcelExport; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; @@ -23,6 +25,8 @@ */ @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class AssembleStockDataExportBO { @ExcelExport("单据编号") diff --git a/core/domain/src/main/java/com/wansenai/bo/CollectionDataExportBO.java b/core/domain/src/main/java/com/wansenai/bo/CollectionDataExportBO.java index 47ffddf7..cd47fb04 100644 --- a/core/domain/src/main/java/com/wansenai/bo/CollectionDataExportBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/CollectionDataExportBO.java @@ -13,13 +13,17 @@ package com.wansenai.bo; import com.wansenai.utils.excel.ExcelExport; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class CollectionDataExportBO { @ExcelExport(value = "客户") diff --git a/core/domain/src/main/java/com/wansenai/bo/IncomeExpenseDataExportBO.java b/core/domain/src/main/java/com/wansenai/bo/IncomeExpenseDataExportBO.java index b20e714c..99c6c4e7 100644 --- a/core/domain/src/main/java/com/wansenai/bo/IncomeExpenseDataExportBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/IncomeExpenseDataExportBO.java @@ -13,13 +13,17 @@ package com.wansenai.bo; import com.wansenai.utils.excel.ExcelExport; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class IncomeExpenseDataExportBO { @ExcelExport(value = "单据编号") diff --git a/core/domain/src/main/java/com/wansenai/bo/PaymentDataExportBO.java b/core/domain/src/main/java/com/wansenai/bo/PaymentDataExportBO.java index 95ea1502..fdcab797 100644 --- a/core/domain/src/main/java/com/wansenai/bo/PaymentDataExportBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/PaymentDataExportBO.java @@ -13,13 +13,17 @@ package com.wansenai.bo; import com.wansenai.utils.excel.ExcelExport; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class PaymentDataExportBO { @ExcelExport(value = "供应商") diff --git a/core/domain/src/main/java/com/wansenai/bo/PurchaseDataExportBO.java b/core/domain/src/main/java/com/wansenai/bo/PurchaseDataExportBO.java index 38f4c5ca..93061ee5 100644 --- a/core/domain/src/main/java/com/wansenai/bo/PurchaseDataExportBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/PurchaseDataExportBO.java @@ -13,13 +13,17 @@ package com.wansenai.bo; import com.wansenai.utils.excel.ExcelExport; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class PurchaseDataExportBO { @ExcelExport(value = "供应商") diff --git a/core/domain/src/main/java/com/wansenai/bo/SalesDataExportBO.java b/core/domain/src/main/java/com/wansenai/bo/SalesDataExportBO.java index ec842eef..d5858e76 100644 --- a/core/domain/src/main/java/com/wansenai/bo/SalesDataExportBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/SalesDataExportBO.java @@ -13,13 +13,17 @@ package com.wansenai.bo; import com.wansenai.utils.excel.ExcelExport; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class SalesDataExportBO { @ExcelExport(value = "客户") diff --git a/core/domain/src/main/java/com/wansenai/bo/ShipmentsDataExportBO.java b/core/domain/src/main/java/com/wansenai/bo/ShipmentsDataExportBO.java index ab901426..b3bb4d32 100644 --- a/core/domain/src/main/java/com/wansenai/bo/ShipmentsDataExportBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/ShipmentsDataExportBO.java @@ -13,13 +13,17 @@ package com.wansenai.bo; import com.wansenai.utils.excel.ExcelExport; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class ShipmentsDataExportBO { @ExcelExport(value = "会员") diff --git a/core/domain/src/main/java/com/wansenai/bo/StorageShipmentStockExportBO.java b/core/domain/src/main/java/com/wansenai/bo/StorageShipmentStockExportBO.java index 7f58797f..a9689e98 100644 --- a/core/domain/src/main/java/com/wansenai/bo/StorageShipmentStockExportBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/StorageShipmentStockExportBO.java @@ -1,8 +1,10 @@ package com.wansenai.bo; import com.wansenai.utils.excel.ExcelExport; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; @@ -11,6 +13,8 @@ */ @Data @Builder +@AllArgsConstructor +@NoArgsConstructor public class StorageShipmentStockExportBO { @ExcelExport(value = "单据编号") diff --git a/core/domain/src/main/java/com/wansenai/bo/TransferAccountDataExportBO.java b/core/domain/src/main/java/com/wansenai/bo/TransferAccountDataExportBO.java index 3158ae16..a397c044 100644 --- a/core/domain/src/main/java/com/wansenai/bo/TransferAccountDataExportBO.java +++ b/core/domain/src/main/java/com/wansenai/bo/TransferAccountDataExportBO.java @@ -13,13 +13,17 @@ package com.wansenai.bo; import com.wansenai.utils.excel.ExcelExport; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class TransferAccountDataExportBO { @ExcelExport(value = "单据编号") diff --git a/core/domain/src/main/kotlin/com/wansenai/vo/financial/AdvanceChargeDetailVO.kt b/core/domain/src/main/kotlin/com/wansenai/vo/financial/AdvanceChargeDetailVO.kt index 9b7e6270..832ab43b 100644 --- a/core/domain/src/main/kotlin/com/wansenai/vo/financial/AdvanceChargeDetailVO.kt +++ b/core/domain/src/main/kotlin/com/wansenai/vo/financial/AdvanceChargeDetailVO.kt @@ -29,7 +29,7 @@ data class AdvanceChargeDetailVO ( @JsonFormat(shape = JsonFormat.Shape.STRING) var memberId: Long? = null, - var memberName: String? = null, + var memberName: String, var receiptNumber: String, diff --git a/core/service/src/main/java/com/wansenai/service/financial/CollectionReceiptService.java b/core/service/src/main/java/com/wansenai/service/financial/CollectionReceiptService.java index 4c968e48..31f15bbc 100644 --- a/core/service/src/main/java/com/wansenai/service/financial/CollectionReceiptService.java +++ b/core/service/src/main/java/com/wansenai/service/financial/CollectionReceiptService.java @@ -37,4 +37,6 @@ public interface CollectionReceiptService extends IService { Response updateCollectionReceiptStatus(List ids, Integer status); void exportCollectionReceipt(QueryCollectionDTO queryCollectionDTO, HttpServletResponse response); + + void exportCollectionReceiptDetail(String receiptNumber, HttpServletResponse response); } diff --git a/core/service/src/main/java/com/wansenai/service/financial/ExpenseReceiptService.java b/core/service/src/main/java/com/wansenai/service/financial/ExpenseReceiptService.java index d62a03f9..46ee0376 100644 --- a/core/service/src/main/java/com/wansenai/service/financial/ExpenseReceiptService.java +++ b/core/service/src/main/java/com/wansenai/service/financial/ExpenseReceiptService.java @@ -37,4 +37,6 @@ public interface ExpenseReceiptService extends IService { Response updateExpenseReceiptStatus(List ids, Integer status); void exportExpenseReceipt(QueryExpenseDTO queryExpenseDTO, HttpServletResponse response); + + void exportExpenseReceiptDetail(String receiptNumber, HttpServletResponse response); } diff --git a/core/service/src/main/java/com/wansenai/service/financial/IncomeReceiptService.java b/core/service/src/main/java/com/wansenai/service/financial/IncomeReceiptService.java index f156b7f0..55f26cf4 100644 --- a/core/service/src/main/java/com/wansenai/service/financial/IncomeReceiptService.java +++ b/core/service/src/main/java/com/wansenai/service/financial/IncomeReceiptService.java @@ -37,4 +37,6 @@ public interface IncomeReceiptService extends IService { Response updateIncomeReceiptStatus(List ids, Integer status); void exportIncomeReceipt(QueryIncomeDTO queryIncomeDTO, HttpServletResponse response); + + void exportIncomeReceiptDetail(String receiptNumber, HttpServletResponse response); } diff --git a/core/service/src/main/java/com/wansenai/service/financial/PaymentReceiptService.java b/core/service/src/main/java/com/wansenai/service/financial/PaymentReceiptService.java index 1a2a4174..dd1bd3b3 100644 --- a/core/service/src/main/java/com/wansenai/service/financial/PaymentReceiptService.java +++ b/core/service/src/main/java/com/wansenai/service/financial/PaymentReceiptService.java @@ -37,4 +37,6 @@ public interface PaymentReceiptService extends IService { Response updatePaymentReceiptStatus(List ids, Integer status); void exportPaymentReceipt(QueryPaymentDTO queryPaymentDTO, HttpServletResponse response); + + void exportPaymentReceiptDetail(String receiptNumber, HttpServletResponse response); } diff --git a/core/service/src/main/java/com/wansenai/service/financial/TransferReceiptService.java b/core/service/src/main/java/com/wansenai/service/financial/TransferReceiptService.java index 930fc616..dfb67fd5 100644 --- a/core/service/src/main/java/com/wansenai/service/financial/TransferReceiptService.java +++ b/core/service/src/main/java/com/wansenai/service/financial/TransferReceiptService.java @@ -37,4 +37,6 @@ public interface TransferReceiptService extends IService { Response updateTransferReceiptStatus(List ids, Integer status); void exportTransferReceipt(QueryTransferDTO queryTransferDTO, HttpServletResponse response); + + void exportTransferReceiptDetail(String receiptNumber, HttpServletResponse response); } diff --git a/core/service/src/main/java/com/wansenai/service/financial/impl/CollectionReceiptServiceImpl.java b/core/service/src/main/java/com/wansenai/service/financial/impl/CollectionReceiptServiceImpl.java index 253983a6..5a07d0fd 100644 --- a/core/service/src/main/java/com/wansenai/service/financial/impl/CollectionReceiptServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/financial/impl/CollectionReceiptServiceImpl.java @@ -17,6 +17,7 @@ import com.wansenai.bo.CollectionBO; import com.wansenai.bo.CollectionDataExportBO; import com.wansenai.bo.FileDataBO; +import com.wansenai.bo.IncomeExpenseDataExportBO; import com.wansenai.dto.financial.AddOrUpdateCollectionDTO; import com.wansenai.dto.financial.QueryCollectionDTO; import com.wansenai.entities.financial.FinancialMain; @@ -39,6 +40,7 @@ import com.wansenai.vo.financial.CollectionDetailVO; import com.wansenai.vo.financial.CollectionVO; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -421,4 +423,30 @@ public void exportCollectionReceipt(QueryCollectionDTO queryCollectionDTO, HttpS ExcelUtils.exportManySheet(response, "收款单", exportMap); } } + + @Override + public void exportCollectionReceiptDetail(String receiptNumber, HttpServletResponse response) { + var id = lambdaQuery() + .eq(FinancialMain::getReceiptNumber, receiptNumber) + .eq(FinancialMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .eq(FinancialMain::getType, "收款") + .one() + .getId(); + + var detail = getCollectionReceiptDetail(id); + if (detail.getData() != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var collectionDataBO = new CollectionDataExportBO(); + collectionDataBO.setCustomerName(data.getCustomerName()); + collectionDataBO.setReceiptNumber(data.getReceiptNumber()); + BeanUtils.copyProperties(item, collectionDataBO); + exportData.add(collectionDataBO); + }); + var fileName = data.getReceiptNumber() + "-收款单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } } diff --git a/core/service/src/main/java/com/wansenai/service/financial/impl/ExpenseReceiptServiceImpl.java b/core/service/src/main/java/com/wansenai/service/financial/impl/ExpenseReceiptServiceImpl.java index 34664909..b3204a5c 100644 --- a/core/service/src/main/java/com/wansenai/service/financial/impl/ExpenseReceiptServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/financial/impl/ExpenseReceiptServiceImpl.java @@ -40,6 +40,7 @@ import com.wansenai.vo.financial.ExpenseDetailVO; import com.wansenai.vo.financial.ExpenseVO; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -398,4 +399,30 @@ public void exportExpenseReceipt(QueryExpenseDTO queryExpenseDTO, HttpServletRes ExcelUtils.exportManySheet(response, "支出单", exportMap); } } + + @Override + public void exportExpenseReceiptDetail(String receiptNumber, HttpServletResponse response) { + var id = lambdaQuery() + .eq(FinancialMain::getReceiptNumber, receiptNumber) + .eq(FinancialMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .eq(FinancialMain::getType, "支出") + .one() + .getId(); + + var detail = getExpenseReceiptDetail(id); + if (detail.getData() != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var expenseDataBO = new IncomeExpenseDataExportBO(); + expenseDataBO.setReceiptNumber(data.getReceiptNumber()); + expenseDataBO.setRelatedPerson(data.getRelatedPersonName()); + BeanUtils.copyProperties(item, expenseDataBO); + exportData.add(expenseDataBO); + }); + var fileName = data.getReceiptNumber() + "-支出单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } } diff --git a/core/service/src/main/java/com/wansenai/service/financial/impl/IncomeReceiptServiceImpl.java b/core/service/src/main/java/com/wansenai/service/financial/impl/IncomeReceiptServiceImpl.java index 70e66349..5663863e 100644 --- a/core/service/src/main/java/com/wansenai/service/financial/impl/IncomeReceiptServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/financial/impl/IncomeReceiptServiceImpl.java @@ -40,6 +40,7 @@ import com.wansenai.vo.financial.IncomeDetailVO; import com.wansenai.vo.financial.IncomeVO; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -400,4 +401,30 @@ public void exportIncomeReceipt(QueryIncomeDTO queryIncomeDTO, HttpServletRespon ExcelUtils.exportManySheet(response, "收入单", exportMap); } } + + @Override + public void exportIncomeReceiptDetail(String receiptNumber, HttpServletResponse response) { + var id = lambdaQuery() + .eq(FinancialMain::getReceiptNumber, receiptNumber) + .eq(FinancialMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .eq(FinancialMain::getType, "收入") + .one() + .getId(); + + var detail = getIncomeReceiptDetail(id); + if(detail.getData() != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var incomeDataBO = new IncomeExpenseDataExportBO(); + incomeDataBO.setReceiptNumber(data.getReceiptNumber()); + incomeDataBO.setRelatedPerson(data.getRelatedPersonName()); + BeanUtils.copyProperties(item, incomeDataBO); + exportData.add(incomeDataBO); + }); + var fileName = data.getReceiptNumber() + "-收入单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } } diff --git a/core/service/src/main/java/com/wansenai/service/financial/impl/PaymentReceiptServiceImpl.java b/core/service/src/main/java/com/wansenai/service/financial/impl/PaymentReceiptServiceImpl.java index d43c43b1..8f62e6c3 100644 --- a/core/service/src/main/java/com/wansenai/service/financial/impl/PaymentReceiptServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/financial/impl/PaymentReceiptServiceImpl.java @@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.wansenai.bo.CollectionDataExportBO; import com.wansenai.bo.FileDataBO; import com.wansenai.bo.PaymentBO; import com.wansenai.bo.PaymentDataExportBO; @@ -39,6 +40,7 @@ import com.wansenai.vo.financial.PaymentDetailVO; import com.wansenai.vo.financial.PaymentVO; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -421,4 +423,30 @@ public void exportPaymentReceipt(QueryPaymentDTO queryPaymentDTO, HttpServletRes ExcelUtils.exportManySheet(response, "付款单", exportMap); } } + + @Override + public void exportPaymentReceiptDetail(String receiptNumber, HttpServletResponse response) { + var id = lambdaQuery() + .eq(FinancialMain::getReceiptNumber, receiptNumber) + .eq(FinancialMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .eq(FinancialMain::getType, "付款") + .one() + .getId(); + + var detail = getPaymentReceiptDetail(id); + if (detail.getData() != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var paymentDataBO = new PaymentDataExportBO(); + paymentDataBO.setSupplierName(data.getSupplierName()); + paymentDataBO.setReceiptNumber(data.getReceiptNumber()); + BeanUtils.copyProperties(item, paymentDataBO); + exportData.add(paymentDataBO); + }); + var fileName = data.getReceiptNumber() + "-付款单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } } diff --git a/core/service/src/main/java/com/wansenai/service/financial/impl/TransferReceiptServiceImpl.java b/core/service/src/main/java/com/wansenai/service/financial/impl/TransferReceiptServiceImpl.java index 66fa61d6..2a3dba46 100644 --- a/core/service/src/main/java/com/wansenai/service/financial/impl/TransferReceiptServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/financial/impl/TransferReceiptServiceImpl.java @@ -40,6 +40,7 @@ import com.wansenai.vo.financial.TransferDetailVO; import com.wansenai.vo.financial.TransferVO; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -414,4 +415,29 @@ public void exportTransferReceipt(QueryTransferDTO queryTransferDTO, HttpServlet ExcelUtils.exportManySheet(response, "转账单", exportMap); } } + + @Override + public void exportTransferReceiptDetail(String receiptNumber, HttpServletResponse response) { + var id = lambdaQuery() + .eq(FinancialMain::getReceiptNumber, receiptNumber) + .eq(FinancialMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .eq(FinancialMain::getType, "转账") + .one() + .getId(); + + var detail = getTransferReceiptDetail(id); + if(detail.getData() != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var transferAccountBO = new TransferAccountDataExportBO(); + transferAccountBO.setReceiptNumber(data.getReceiptNumber()); + BeanUtils.copyProperties(item, transferAccountBO); + exportData.add(transferAccountBO); + }); + var fileName = data.getReceiptNumber() + "-转账单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } } diff --git a/core/service/src/main/java/com/wansenai/service/receipt/ReceiptPurchaseService.java b/core/service/src/main/java/com/wansenai/service/receipt/ReceiptPurchaseService.java index 16171358..dc8cc3b5 100644 --- a/core/service/src/main/java/com/wansenai/service/receipt/ReceiptPurchaseService.java +++ b/core/service/src/main/java/com/wansenai/service/receipt/ReceiptPurchaseService.java @@ -241,7 +241,13 @@ public interface ReceiptPurchaseService extends IService { void exportPurchaseOrderExcel(QueryPurchaseOrderDTO queryPurchaseOrderDTO, HttpServletResponse response) throws Exception; + void exportPurchaseOrderDetailExcel(String receiptNumber, HttpServletResponse response) throws Exception; + void exportPurchaseStorageExcel(QueryPurchaseStorageDTO queryPurchaseStorageDTO, HttpServletResponse response) throws Exception; + void exportPurchaseStorageDetailExcel(String receiptNumber, HttpServletResponse response) throws Exception; + void exportPurchaseRefundExcel(QueryPurchaseRefundDTO queryPurchaseRefundDTO, HttpServletResponse response) throws Exception; + + void exportPurchaseRefundDetailExcel(String receiptNumber, HttpServletResponse response) throws Exception; } diff --git a/core/service/src/main/java/com/wansenai/service/receipt/ReceiptRetailService.java b/core/service/src/main/java/com/wansenai/service/receipt/ReceiptRetailService.java index b2e30b25..ed163432 100644 --- a/core/service/src/main/java/com/wansenai/service/receipt/ReceiptRetailService.java +++ b/core/service/src/main/java/com/wansenai/service/receipt/ReceiptRetailService.java @@ -205,6 +205,15 @@ public interface ReceiptRetailService extends IService { */ void exportRetailShipmentsExcel(QueryShipmentsDTO queryShipmentsDTO, HttpServletResponse response) throws Exception; + /** + * + * @param receiptNumber + * @param response + * @throws IOException + */ + void exportShipmentsDetailExcel(String receiptNumber, HttpServletResponse response) throws IOException; + + /** * Query data through public query criteria and export retail refund data files * 根据公共查询条件查询数据并导出零售退货数据文件 @@ -220,4 +229,6 @@ public interface ReceiptRetailService extends IService { * 异常 */ void exportRetailRefundExcel(QueryRetailRefundDTO queryRetailRefundDTO, HttpServletResponse response) throws Exception; + + void exportRefundDetailExcel(String receiptNumber, HttpServletResponse response) throws IOException; } diff --git a/core/service/src/main/java/com/wansenai/service/receipt/ReceiptSaleService.java b/core/service/src/main/java/com/wansenai/service/receipt/ReceiptSaleService.java index a95bcb5e..8de1cb61 100644 --- a/core/service/src/main/java/com/wansenai/service/receipt/ReceiptSaleService.java +++ b/core/service/src/main/java/com/wansenai/service/receipt/ReceiptSaleService.java @@ -240,7 +240,13 @@ public interface ReceiptSaleService extends IService { void exportSaleOrderExcel(QuerySaleOrderDTO querySaleOrderDTO, HttpServletResponse response) throws Exception; + void exportSaleOrderDetailExcel(String receiptNumber, HttpServletResponse response) throws Exception; + void exportSaleShipmentsExcel(QuerySaleShipmentsDTO querySaleShipmentsDTO, HttpServletResponse response) throws Exception; + void exportSaleShipmentsDetailExcel(String receiptNumber, HttpServletResponse response) throws Exception; + void exportSaleRefundExcel(QuerySaleRefundDTO querySaleRefundDTO, HttpServletResponse response) throws Exception; + + void exportSaleRefundDetailExcel(String receiptNumber, HttpServletResponse response) throws Exception; } diff --git a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptPurchaseServiceImpl.java b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptPurchaseServiceImpl.java index 696acaaa..fef6e813 100644 --- a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptPurchaseServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptPurchaseServiceImpl.java @@ -47,6 +47,7 @@ import com.wansenai.utils.response.Response; import com.wansenai.vo.receipt.purchase.*; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import org.w3c.dom.stylesheets.LinkStyle; @@ -1358,6 +1359,30 @@ public void exportPurchaseOrderExcel(QueryPurchaseOrderDTO queryPurchaseOrderDTO } } + @Override + public void exportPurchaseOrderDetailExcel(String receiptNumber, HttpServletResponse response) { + var id = lambdaQuery() + .eq(ReceiptPurchaseMain::getReceiptNumber, receiptNumber) + .eq(ReceiptPurchaseMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .one() + .getId(); + var detail = getPurchaseOrderDetail(id); + if (detail != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var purchaseBo = new PurchaseDataExportBO(); + purchaseBo.setSupplierName(data.getSupplierName()); + purchaseBo.setReceiptNumber(data.getReceiptNumber()); + BeanUtils.copyProperties(item, purchaseBo); + exportData.add(purchaseBo); + }); + var fileName = data.getReceiptNumber() + "-采购订单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } + @Override public void exportPurchaseStorageExcel(QueryPurchaseStorageDTO queryPurchaseStorageDTO, HttpServletResponse response) { var exportMap = new ConcurrentHashMap>>(); @@ -1399,6 +1424,30 @@ public void exportPurchaseStorageExcel(QueryPurchaseStorageDTO queryPurchaseStor } } + @Override + public void exportPurchaseStorageDetailExcel(String receiptNumber, HttpServletResponse response) { + var id = lambdaQuery() + .eq(ReceiptPurchaseMain::getReceiptNumber, receiptNumber) + .eq(ReceiptPurchaseMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .one() + .getId(); + var detail = getPurchaseStorageDetail(id); + if (detail != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var purchaseBo = new PurchaseDataExportBO(); + purchaseBo.setSupplierName(data.getSupplierName()); + purchaseBo.setReceiptNumber(data.getReceiptNumber()); + BeanUtils.copyProperties(item, purchaseBo); + exportData.add(purchaseBo); + }); + var fileName = data.getReceiptNumber() + "-采购入库单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } + @Override public void exportPurchaseRefundExcel(QueryPurchaseRefundDTO queryPurchaseRefundDTO, HttpServletResponse response) { var exportMap = new ConcurrentHashMap>>(); @@ -1439,4 +1488,28 @@ public void exportPurchaseRefundExcel(QueryPurchaseRefundDTO queryPurchaseRefund ExcelUtils.exportManySheet(response, "采购退货", exportMap); } } + + @Override + public void exportPurchaseRefundDetailExcel(String receiptNumber, HttpServletResponse response) { + var id = lambdaQuery() + .eq(ReceiptPurchaseMain::getReceiptNumber, receiptNumber) + .eq(ReceiptPurchaseMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .one() + .getId(); + var detail = getPurchaseRefundDetail(id); + if (detail != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var purchaseBo = new PurchaseDataExportBO(); + purchaseBo.setSupplierName(data.getSupplierName()); + purchaseBo.setReceiptNumber(data.getReceiptNumber()); + BeanUtils.copyProperties(item, purchaseBo); + exportData.add(purchaseBo); + }); + var fileName = data.getReceiptNumber() + "-采购退货单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } } diff --git a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java index 3cdfe204..dfd3949b 100644 --- a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java @@ -50,6 +50,7 @@ import com.wansenai.vo.receipt.retail.*; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; @@ -921,6 +922,30 @@ public void exportRetailShipmentsExcel(QueryShipmentsDTO queryShipmentsDTO, Http } } + @Override + public void exportShipmentsDetailExcel(String receiptNumber, HttpServletResponse response) { + var id = lambdaQuery() + .eq(ReceiptRetailMain::getReceiptNumber, receiptNumber) + .eq(ReceiptRetailMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .one() + .getId(); + var detail = getRetailShipmentsDetail(id); + if (detail != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var shipmentBo = new ShipmentsDataExportBO(); + shipmentBo.setMemberName(data.getMemberName()); + shipmentBo.setReceiptNumber(data.getReceiptNumber()); + BeanUtils.copyProperties(item, shipmentBo); + exportData.add(shipmentBo); + }); + var fileName = data.getReceiptNumber() + "-零售出库单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } + @Override public void exportRetailRefundExcel(QueryRetailRefundDTO queryRetailRefundDTO, HttpServletResponse response) throws Exception { var exportMap = new ConcurrentHashMap>>(); @@ -957,4 +982,28 @@ public void exportRetailRefundExcel(QueryRetailRefundDTO queryRetailRefundDTO, H } } + @Override + public void exportRefundDetailExcel(String receiptNumber, HttpServletResponse response) throws IOException { + var id = lambdaQuery() + .eq(ReceiptRetailMain::getReceiptNumber, receiptNumber) + .eq(ReceiptRetailMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .one() + .getId(); + var detail = getRetailRefundDetail(id); + if (detail != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var shipmentBo = new ShipmentsDataExportBO(); + shipmentBo.setMemberName(data.getMemberName()); + shipmentBo.setReceiptNumber(data.getReceiptNumber()); + BeanUtils.copyProperties(item, shipmentBo); + exportData.add(shipmentBo); + }); + var fileName = data.getReceiptNumber() + "-零售退货单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } + } diff --git a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptSaleServiceImpl.java b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptSaleServiceImpl.java index 30356ad3..bbf0690e 100644 --- a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptSaleServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptSaleServiceImpl.java @@ -47,6 +47,7 @@ import com.wansenai.utils.response.Response; import com.wansenai.vo.receipt.sale.*; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; @@ -1363,6 +1364,30 @@ public void exportSaleOrderExcel(QuerySaleOrderDTO querySaleOrderDTO, HttpServle } } + @Override + public void exportSaleOrderDetailExcel(String receiptNumber, HttpServletResponse response) throws Exception { + var id = lambdaQuery() + .eq(ReceiptSaleMain::getReceiptNumber, receiptNumber) + .eq(ReceiptSaleMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .one() + .getId(); + var detail = getSaleOrderDetail(id); + if (detail != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var saleDataBo = new SalesDataExportBO(); + saleDataBo.setCustomerName(data.getCustomerName()); + saleDataBo.setReceiptNumber(data.getReceiptNumber()); + BeanUtils.copyProperties(item, saleDataBo); + exportData.add(saleDataBo); + }); + var fileName = data.getReceiptNumber() + "-销售订单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } + @Override public void exportSaleShipmentsExcel(QuerySaleShipmentsDTO querySaleShipmentsDTO, HttpServletResponse response) throws Exception { var exportMap = new ConcurrentHashMap>>(); @@ -1405,6 +1430,30 @@ public void exportSaleShipmentsExcel(QuerySaleShipmentsDTO querySaleShipmentsDTO } } + @Override + public void exportSaleShipmentsDetailExcel(String receiptNumber, HttpServletResponse response) throws Exception { + var id = lambdaQuery() + .eq(ReceiptSaleMain::getReceiptNumber, receiptNumber) + .eq(ReceiptSaleMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .one() + .getId(); + var detail = getSaleShipmentsDetail(id); + if (detail != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var saleDataBo = new SalesDataExportBO(); + saleDataBo.setCustomerName(data.getCustomerName()); + saleDataBo.setReceiptNumber(data.getReceiptNumber()); + BeanUtils.copyProperties(item, saleDataBo); + exportData.add(saleDataBo); + }); + var fileName = data.getReceiptNumber() + "-销售出库单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } + @Override public void exportSaleRefundExcel(QuerySaleRefundDTO querySaleRefundDTO, HttpServletResponse response) throws Exception { var exportMap = new ConcurrentHashMap>>(); @@ -1446,4 +1495,28 @@ public void exportSaleRefundExcel(QuerySaleRefundDTO querySaleRefundDTO, HttpSer ExcelUtils.exportManySheet(response, "销售退货", exportMap); } } + + @Override + public void exportSaleRefundDetailExcel(String receiptNumber, HttpServletResponse response) throws Exception { + var id = lambdaQuery() + .eq(ReceiptSaleMain::getReceiptNumber, receiptNumber) + .eq(ReceiptSaleMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .one() + .getId(); + var detail = getSaleRefundDetail(id); + if (detail != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var saleDataBo = new SalesDataExportBO(); + saleDataBo.setCustomerName(data.getCustomerName()); + saleDataBo.setReceiptNumber(data.getReceiptNumber()); + BeanUtils.copyProperties(item, saleDataBo); + exportData.add(saleDataBo); + }); + var fileName = data.getReceiptNumber() + "-销售退货单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } } diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/AllotShipmentsService.java b/core/service/src/main/java/com/wansenai/service/warehouse/AllotShipmentsService.java index f5e9d89c..557607c4 100644 --- a/core/service/src/main/java/com/wansenai/service/warehouse/AllotShipmentsService.java +++ b/core/service/src/main/java/com/wansenai/service/warehouse/AllotShipmentsService.java @@ -37,4 +37,6 @@ public interface AllotShipmentsService extends IService { Response updateAllotReceiptStatus(List ids, Integer status); void exportAllotReceipt(QueryAllotReceiptDTO queryAllotReceiptDTO, HttpServletResponse response) throws Exception; + + void exportAllotReceiptDetail(String receiptNumber, HttpServletResponse response) throws Exception; } diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/AssembleReceiptService.java b/core/service/src/main/java/com/wansenai/service/warehouse/AssembleReceiptService.java index eb016304..232c1343 100644 --- a/core/service/src/main/java/com/wansenai/service/warehouse/AssembleReceiptService.java +++ b/core/service/src/main/java/com/wansenai/service/warehouse/AssembleReceiptService.java @@ -37,4 +37,6 @@ public interface AssembleReceiptService extends IService { Response updateAssembleReceiptStatus(List ids, Integer status); void exportAssembleReceipt(QueryAssembleReceiptDTO queryAssembleReceiptDTO, HttpServletResponse response) throws Exception; + + void exportAssembleReceiptDetail(String receiptNumber, HttpServletResponse response) throws Exception; } diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/DisassembleReceiptService.java b/core/service/src/main/java/com/wansenai/service/warehouse/DisassembleReceiptService.java index f8b9d20b..0044c4f8 100644 --- a/core/service/src/main/java/com/wansenai/service/warehouse/DisassembleReceiptService.java +++ b/core/service/src/main/java/com/wansenai/service/warehouse/DisassembleReceiptService.java @@ -37,4 +37,6 @@ public interface DisassembleReceiptService extends IService updateDisassembleReceiptStatus(List ids, Integer status); void exportDisAssembleReceipt(QueryDisassembleReceiptDTO queryDisassembleReceiptDTO, HttpServletResponse response) throws Exception; + + void exportDisAssembleReceiptDetail(String receiptNumber, HttpServletResponse response) throws Exception; } diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/OtherShipmentsService.java b/core/service/src/main/java/com/wansenai/service/warehouse/OtherShipmentsService.java index 64f2d083..35a0eceb 100644 --- a/core/service/src/main/java/com/wansenai/service/warehouse/OtherShipmentsService.java +++ b/core/service/src/main/java/com/wansenai/service/warehouse/OtherShipmentsService.java @@ -37,4 +37,6 @@ public interface OtherShipmentsService extends IService { Response updateOtherShipmentsStatus(List ids, Integer status); void exportOtherShipments(QueryOtherShipmentDTO queryOtherShipmentDTO, HttpServletResponse response) throws Exception; + + void exportOtherShipmentsDetail(String receiptNumber, HttpServletResponse response) throws Exception; } diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/OtherStorageService.java b/core/service/src/main/java/com/wansenai/service/warehouse/OtherStorageService.java index a130220e..3b7e59ab 100644 --- a/core/service/src/main/java/com/wansenai/service/warehouse/OtherStorageService.java +++ b/core/service/src/main/java/com/wansenai/service/warehouse/OtherStorageService.java @@ -37,4 +37,6 @@ public interface OtherStorageService extends IService { Response updateOtherStorageStatus(List ids, Integer status); void exportOtherStorage(QueryOtherStorageDTO queryOtherStorageDTO, HttpServletResponse response) throws Exception; + + void exportOtherStorageDetail(String receiptNumer, HttpServletResponse response) throws Exception; } diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/impl/AllotShipmentsServiceImpl.java b/core/service/src/main/java/com/wansenai/service/warehouse/impl/AllotShipmentsServiceImpl.java index 6ddebf4c..3beaab4d 100644 --- a/core/service/src/main/java/com/wansenai/service/warehouse/impl/AllotShipmentsServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/warehouse/impl/AllotShipmentsServiceImpl.java @@ -45,6 +45,7 @@ import com.wansenai.vo.warehouse.AllotReceiptDetailVO; import com.wansenai.vo.warehouse.AllotReceiptVO; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; @@ -511,4 +512,28 @@ public void exportAllotReceipt(QueryAllotReceiptDTO queryAllotReceiptDTO, HttpSe ExcelUtils.exportManySheet(response, "调拨出库", exportMap); } } + + @Override + public void exportAllotReceiptDetail(String receiptNumber, HttpServletResponse response) { + var id = lambdaQuery() + .eq(WarehouseReceiptMain::getReceiptNumber, receiptNumber) + .eq(WarehouseReceiptMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .eq(WarehouseReceiptMain::getType, "调拨出库") + .one() + .getId(); + var detail = getAllotReceiptDetail(id); + if (detail != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var allotStockBo = new AllotStockDataExportBO(); + allotStockBo.setReceiptNumber(data.getReceiptNumber()); + BeanUtils.copyProperties(item, allotStockBo); + exportData.add(allotStockBo); + }); + var fileName = data.getReceiptNumber() + "-调拨出库明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } } diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/impl/AssembleReceiptServiceImpl.java b/core/service/src/main/java/com/wansenai/service/warehouse/impl/AssembleReceiptServiceImpl.java index ffef1cad..6206de90 100644 --- a/core/service/src/main/java/com/wansenai/service/warehouse/impl/AssembleReceiptServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/warehouse/impl/AssembleReceiptServiceImpl.java @@ -43,6 +43,7 @@ import com.wansenai.vo.warehouse.AssembleReceiptDetailVO; import com.wansenai.vo.warehouse.AssembleReceiptVO; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; @@ -58,7 +59,6 @@ @Service public class AssembleReceiptServiceImpl extends ServiceImpl implements AssembleReceiptService { - private final WarehouseReceiptSubService warehouseReceiptSubService; private final ProductService productService; private final CommonService commonService; @@ -508,4 +508,28 @@ public void exportAssembleReceipt(QueryAssembleReceiptDTO queryAssembleReceiptDT ExcelUtils.exportManySheet(response, "组装单", exportMap); } } + + @Override + public void exportAssembleReceiptDetail(String receiptNumber, HttpServletResponse response) { + var id = lambdaQuery() + .eq(WarehouseReceiptMain::getReceiptNumber, receiptNumber) + .eq(WarehouseReceiptMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .eq(WarehouseReceiptMain::getType, "组装单") + .one() + .getId(); + var detail = getAssembleReceiptDetail(id); + if (detail != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var assembleStockBO = new AssembleStockDataExportBO(); + assembleStockBO.setReceiptNumber(data.getReceiptNumber()); + BeanUtils.copyProperties(item, assembleStockBO); + exportData.add(assembleStockBO); + }); + var fileName = data.getReceiptNumber() + "-组装单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } } diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/impl/DisassembleReceiptServiceImpl.java b/core/service/src/main/java/com/wansenai/service/warehouse/impl/DisassembleReceiptServiceImpl.java index ad28a10f..5da3d167 100644 --- a/core/service/src/main/java/com/wansenai/service/warehouse/impl/DisassembleReceiptServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/warehouse/impl/DisassembleReceiptServiceImpl.java @@ -46,6 +46,7 @@ import com.wansenai.vo.warehouse.DisassembleReceiptDetailVO; import com.wansenai.vo.warehouse.DisassembleReceiptVO; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; @@ -510,4 +511,28 @@ public void exportDisAssembleReceipt(QueryDisassembleReceiptDTO queryDisassemble ExcelUtils.exportManySheet(response, "拆卸单", exportMap); } } + + @Override + public void exportDisAssembleReceiptDetail(String receiptNumber, HttpServletResponse response) throws Exception { + var id = lambdaQuery() + .eq(WarehouseReceiptMain::getReceiptNumber, receiptNumber) + .eq(WarehouseReceiptMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .eq(WarehouseReceiptMain::getType, "拆卸单") + .one() + .getId(); + var detail = getDisassembleReceiptDetail(id); + if (detail != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var assembleStockBO = new AssembleStockDataExportBO(); + assembleStockBO.setReceiptNumber(data.getReceiptNumber()); + BeanUtils.copyProperties(item, assembleStockBO); + exportData.add(assembleStockBO); + }); + var fileName = data.getReceiptNumber() + "-拆卸单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } } diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherShipmentsServiceImpl.java b/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherShipmentsServiceImpl.java index 30145839..d2a061b7 100644 --- a/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherShipmentsServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherShipmentsServiceImpl.java @@ -43,6 +43,7 @@ import com.wansenai.vo.warehouse.OtherShipmentDetailVO; import com.wansenai.vo.warehouse.OtherShipmentVO; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -466,4 +467,30 @@ public void exportOtherShipments(QueryOtherShipmentDTO queryOtherShipmentDTO, Ht ExcelUtils.exportManySheet(response, "其他出库", exportMap); } } + + @Override + public void exportOtherShipmentsDetail(String receiptNumber, HttpServletResponse response) throws Exception { + var id = lambdaQuery() + .eq(WarehouseReceiptMain::getReceiptNumber, receiptNumber) + .eq(WarehouseReceiptMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .eq(WarehouseReceiptMain::getType, "其他出库") + .one() + .getId(); + var detail = getOtherShipmentsDetail(id); + if (detail != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var storageShipmentStockBO = new StorageShipmentStockExportBO(); + storageShipmentStockBO.setReceiptNumber(data.getReceiptNumber()); + storageShipmentStockBO.setRelatedPersonType("客户"); + storageShipmentStockBO.setRelatedPerson(data.getCustomerName()); + BeanUtils.copyProperties(item, storageShipmentStockBO); + exportData.add(storageShipmentStockBO); + }); + var fileName = data.getReceiptNumber() + "-其他出库单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } } diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherStorageServiceImpl.java b/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherStorageServiceImpl.java index 90b4b10b..e8e252a4 100644 --- a/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherStorageServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherStorageServiceImpl.java @@ -45,6 +45,7 @@ import com.wansenai.vo.warehouse.OtherStorageDetailVO; import com.wansenai.vo.warehouse.OtherStorageVO; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -469,4 +470,30 @@ public void exportOtherStorage(QueryOtherStorageDTO queryOtherStorageDTO, HttpSe ExcelUtils.exportManySheet(response, "其他入库", exportMap); } } + + @Override + public void exportOtherStorageDetail(String receiptNumber, HttpServletResponse response) { + var id = lambdaQuery() + .eq(WarehouseReceiptMain::getReceiptNumber, receiptNumber) + .eq(WarehouseReceiptMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .eq(WarehouseReceiptMain::getType, "其他入库") + .one() + .getId(); + var detail = getOtherStorageDetail(id); + if (detail != null) { + var data = detail.getData(); + var tableData = data.getTableData(); + var exportData = new ArrayList(); + tableData.forEach(item -> { + var storageShipmentStockBO = new StorageShipmentStockExportBO(); + storageShipmentStockBO.setReceiptNumber(data.getReceiptNumber()); + storageShipmentStockBO.setRelatedPersonType("供应商"); + storageShipmentStockBO.setRelatedPerson(data.getSupplierName()); + BeanUtils.copyProperties(item, storageShipmentStockBO); + exportData.add(storageShipmentStockBO); + }); + var fileName = data.getReceiptNumber() + "-其他入库单明细"; + ExcelUtils.export(response, fileName, ExcelUtils.getSheetData(exportData)); + } + } } diff --git a/core/service/src/main/kotlin/com/wansenai/service/financial/AdvanceChargeService.kt b/core/service/src/main/kotlin/com/wansenai/service/financial/AdvanceChargeService.kt index e2c37c30..20a4a210 100644 --- a/core/service/src/main/kotlin/com/wansenai/service/financial/AdvanceChargeService.kt +++ b/core/service/src/main/kotlin/com/wansenai/service/financial/AdvanceChargeService.kt @@ -35,4 +35,6 @@ interface AdvanceChargeService : IService{ fun updateAdvanceChargeStatusById(ids: List, status: Int): Response fun exportAdvanceCharge(advanceChargeDTO: QueryAdvanceChargeDTO, response: HttpServletResponse) + + fun exportAdvanceChargeDetail(receiptNumber: String, response: HttpServletResponse) } \ No newline at end of file diff --git a/core/service/src/main/kotlin/com/wansenai/service/financial/impl/AdvanceChargeServiceImpl.kt b/core/service/src/main/kotlin/com/wansenai/service/financial/impl/AdvanceChargeServiceImpl.kt index 1b3e18d4..61038845 100644 --- a/core/service/src/main/kotlin/com/wansenai/service/financial/impl/AdvanceChargeServiceImpl.kt +++ b/core/service/src/main/kotlin/com/wansenai/service/financial/impl/AdvanceChargeServiceImpl.kt @@ -279,7 +279,7 @@ open class AdvanceChargeServiceImpl( val resultVO = AdvanceChargeDetailVO( memberId = financialMain.relatedPersonId, - memberName = member?.memberName, + memberName = member?.memberName ?: "", receiptNumber = financialMain.receiptNumber, receiptDate = financialMain.receiptDate, financialPersonnel = financialPerson?.name ?: "", @@ -360,4 +360,30 @@ open class AdvanceChargeServiceImpl( ExcelUtils.exportManySheet(response, "收预付款", exportMap) } } + + override fun exportAdvanceChargeDetail(receiptNumber: String, response: HttpServletResponse) { + val id = lambdaQuery() + .eq(FinancialMain::getReceiptNumber, receiptNumber) + .eq(FinancialMain::getDeleteFlag, CommonConstants.NOT_DELETED) + .eq(FinancialMain::getType, "收预付款") + .one() + .id + val detail = getAdvanceChargeDetailById(id) + if (detail.data != null) { + val exportData = ArrayList() + detail.data.tableData.map { item -> + detail.data?.let { + val data = AdvanceChargeDataExportBO( + memberName = detail.data.memberName, + receiptNumber = detail.data.receiptNumber, + accountName = item.accountName, + amount = item.amount, + remark = item.remark + ) + exportData.add(data) + } + } + ExcelUtils.export(response, "收预付款单据明细", ExcelUtils.getSheetData(exportData)) + } + } } \ No newline at end of file diff --git a/web/src/api/financial/advance.ts b/web/src/api/financial/advance.ts index 7d6bcb9f..c3406190 100644 --- a/web/src/api/financial/advance.ts +++ b/web/src/api/financial/advance.ts @@ -14,6 +14,7 @@ enum API { UpdateStatus = '/financial/advance-charge/updateStatusByIds', GetDetail = '/financial/advance-charge/getDetailById', Export = '/financial/advance-charge/export', + ExportDetail = '/financial/advance-charge/exportDetail', } export function getAdvancePageList(params: QueryAdvanceReq, errorMode: ErrorMessageMode = 'message') { @@ -83,4 +84,13 @@ export function exportAdvance(params: QueryAdvanceReq) { responseType: "blob" } ); +} + +export function exportAdvanceDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/financial/collection.ts b/web/src/api/financial/collection.ts index 6c15e4a0..55c51a64 100644 --- a/web/src/api/financial/collection.ts +++ b/web/src/api/financial/collection.ts @@ -16,6 +16,7 @@ enum API { GetDetail = '/financial/collection/getDetailById', GetArrearsPage = '/sale/arrears/pageList', Export = '/financial/collection/export', + ExportDetail = '/financial/collection/exportDetail', } export function getCollectionPageList(params: QueryCollectionReq) { @@ -86,4 +87,13 @@ export function exportCollection(params: QueryCollectionReq) { responseType: "blob" } ); +} + +export function exportCollectionDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/financial/expense.ts b/web/src/api/financial/expense.ts index f533a6e9..95ecb904 100644 --- a/web/src/api/financial/expense.ts +++ b/web/src/api/financial/expense.ts @@ -15,6 +15,7 @@ enum API { UpdateStatus = '/financial/expense/updateStatusByIds', GetDetail = '/financial/expense/getDetailById', Export = '/financial/expense/export', + ExportDetail = '/financial/expense/exportDetail', } export function getExpensePageList(params: QueryExpenseReq) { @@ -76,4 +77,13 @@ export function exportExpense(params: QueryExpenseReq) { responseType: "blob" } ); +} + +export function exportExpenseDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/financial/income.ts b/web/src/api/financial/income.ts index 4114bcfc..7566be0e 100644 --- a/web/src/api/financial/income.ts +++ b/web/src/api/financial/income.ts @@ -14,6 +14,7 @@ enum API { UpdateStatus = '/financial/income/updateStatusByIds', GetDetail = '/financial/income/getDetailById', Export = '/financial/income/export', + ExportDetail = '/financial/income/exportDetail', } export function getIncomePageList(params: QueryIncomeReq, mode: ErrorMessageMode = 'notice') { @@ -75,4 +76,13 @@ export function exportIncome(params: QueryIncomeReq) { responseType: "blob" } ); +} + +export function exportIncomeDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/financial/payment.ts b/web/src/api/financial/payment.ts index b64f0808..92d592ec 100644 --- a/web/src/api/financial/payment.ts +++ b/web/src/api/financial/payment.ts @@ -18,6 +18,7 @@ enum API { GetDetail = '/financial/payment/getDetailById', GetArrearsPage = '/purchase/arrears/pageList', Export = '/financial/payment/export', + ExportDetail = '/financial/payment/exportDetail', } export function getPaymentPageList(params: QueryPaymentReq) { @@ -88,4 +89,13 @@ export function exportPayment(params: QueryPaymentReq) { responseType: "blob" } ); +} + +export function exportPaymentDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/financial/transfer.ts b/web/src/api/financial/transfer.ts index b99a81f2..f7a0e9ec 100644 --- a/web/src/api/financial/transfer.ts +++ b/web/src/api/financial/transfer.ts @@ -15,6 +15,7 @@ enum API { UpdateStatus = '/financial/transfer/updateStatusByIds', GetDetail = '/financial/transfer/getDetailById', Export = '/financial/transfer/export', + ExportDetail = '/financial/transfer/exportDetail', } export function getTransferPageList(params: QueryTransferReq, mode: ErrorMessageMode = 'notice') { @@ -76,4 +77,13 @@ export function exportTransfer(params: QueryTransferReq) { responseType: "blob" } ); +} + +export function exportTransferDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/purchase/order.ts b/web/src/api/purchase/order.ts index ee4f9f0e..4520c092 100644 --- a/web/src/api/purchase/order.ts +++ b/web/src/api/purchase/order.ts @@ -15,6 +15,7 @@ enum API { Delete = '/purchase/order/delete', GetLinkOrderDetail = '/purchase/order/getLinkOrderDetail', Export = '/purchase/order/export', + ExportDetail = '/purchase/order/exportDetail', } export function getPurchaseOrderPageList(params: QueryPurchaseOrderReq) { @@ -84,4 +85,13 @@ export function exportOrder(params: QueryPurchaseOrderReq) { responseType: "blob" } ); +} + +export function exportOrderDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/purchase/refund.ts b/web/src/api/purchase/refund.ts index 826995f0..0e62740d 100644 --- a/web/src/api/purchase/refund.ts +++ b/web/src/api/purchase/refund.ts @@ -15,6 +15,7 @@ enum API { Delete = '/purchase/refund/delete', GetLinkRefundDetail = '/purchase/refund/getLinkRefundDetail', Export = '/purchase/refund/export', + ExportDetail = '/purchase/order/exportDetail', } export function getPurchaseRefundPageList(params: QueryPurchaseRefundReq) { @@ -84,4 +85,13 @@ export function exportRefund(params: QueryPurchaseRefundReq) { responseType: "blob" } ); +} + +export function exportRefundDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/purchase/storage.ts b/web/src/api/purchase/storage.ts index 2b429ea0..56c3f0d5 100644 --- a/web/src/api/purchase/storage.ts +++ b/web/src/api/purchase/storage.ts @@ -15,6 +15,7 @@ enum API { Delete = '/purchase/storage/delete', GetLinkStorageDetail = '/purchase/storage/getLinkStorageDetail', Export = '/purchase/storage/export', + ExportDetail = '/purchase/order/exportDetail', } export function getPurchaseStoragePageList(params: QueryPurchaseStorageReq) { @@ -84,4 +85,13 @@ export function exportStorage(params: QueryPurchaseStorageReq) { responseType: "blob" } ); +} + +export function exportStorageDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/retail/model/shipmentsModel.ts b/web/src/api/retail/model/shipmentsModel.ts index 0eadd94f..96fad02f 100644 --- a/web/src/api/retail/model/shipmentsModel.ts +++ b/web/src/api/retail/model/shipmentsModel.ts @@ -41,6 +41,7 @@ export interface AddOrUpdateShipmentsResp { id: number | string | undefined; memberId: number | string; memberName: string; + paymentType: string; accountId: number | string; accountName: string; receiptDate: string; diff --git a/web/src/api/retail/refund.ts b/web/src/api/retail/refund.ts index 09e8ae41..166243dc 100644 --- a/web/src/api/retail/refund.ts +++ b/web/src/api/retail/refund.ts @@ -15,6 +15,7 @@ enum API { Delete = '/retail/refund/deleteByIds', GetLinkRefundDetail = '/retail/refund/getLinkRefundDetail', Export = '/retail/refund/export', + ExportDetail = '/retail/refund/exportDetail', } export function getRefundPageList(params: QueryShipmentsReq) { @@ -89,4 +90,13 @@ export function exportRefund(params: QueryShipmentsReq) { responseType: "blob" } ); +} + +export function exportRefundDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/retail/shipments.ts b/web/src/api/retail/shipments.ts index 706ec82e..b5127f91 100644 --- a/web/src/api/retail/shipments.ts +++ b/web/src/api/retail/shipments.ts @@ -16,6 +16,7 @@ enum API { GetDetail = '/retail/shipments/detail', GetLinkShipmentDetail = '/retail/shipments/getLinkShipmentDetail', Export = '/retail/shipments/export', + ExportDetail = '/retail/shipments/exportDetail', } export function getShipmentsPageList(params: QueryShipmentsReq) { @@ -105,4 +106,13 @@ export function exportShipments(params: QueryShipmentsReq) { responseType: "blob" } ); +} + +export function exportShipmentsDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/sale/order.ts b/web/src/api/sale/order.ts index d1a28053..c752ecb7 100644 --- a/web/src/api/sale/order.ts +++ b/web/src/api/sale/order.ts @@ -16,6 +16,7 @@ enum API { Delete = '/sale/order/delete', GetLinkOrderDetail = '/sale/order/getLinkOrderDetail', Export = '/sale/order/export', + ExportDetail = '/sale/order/exportDetail', } export function getSaleOrderPageList(params: QuerySaleOrderReq) { @@ -85,4 +86,13 @@ export function exportOrder(params: QuerySaleOrderReq) { responseType: "blob" } ); +} + +export function exportOrderDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/sale/refund.ts b/web/src/api/sale/refund.ts index 590cf209..2a85e2c1 100644 --- a/web/src/api/sale/refund.ts +++ b/web/src/api/sale/refund.ts @@ -16,6 +16,7 @@ enum API { Delete = '/sale/refund/delete', GetLinkRefundDetail = '/sale/refund/getLinkRefundDetail', Export = '/sale/refund/export', + ExportDetail = '/sale/refund/exportDetail', } export function getSaleRefundPageList(params: QuerySaleRefundReq) { @@ -85,4 +86,13 @@ export function exportRefund(params: QuerySaleRefundReq) { responseType: "blob" } ); +} + +export function exportRefundDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/sale/shipments.ts b/web/src/api/sale/shipments.ts index 58541788..426c0642 100644 --- a/web/src/api/sale/shipments.ts +++ b/web/src/api/sale/shipments.ts @@ -16,6 +16,7 @@ enum API { Delete = '/sale/shipments/delete', GetLinkShipmentsDetail = '/sale/shipments/getLinkShipmentDetail', Export = '/sale/shipments/export', + ExportDetail = '/sale/shipments/exportDetail', } export function getSaleShipmentsPageList(params: QuerySaleShipmentsReq) { @@ -85,4 +86,13 @@ export function exportShipments(params: QuerySaleShipmentsReq) { responseType: "blob" } ); +} + +export function exportShipmentsDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/warehouse/allotShipments.ts b/web/src/api/warehouse/allotShipments.ts index 7652c898..3c4acc45 100644 --- a/web/src/api/warehouse/allotShipments.ts +++ b/web/src/api/warehouse/allotShipments.ts @@ -15,6 +15,7 @@ enum API { UpdateStatus = '/warehouse/allotShipments/updateStatusByIds', GetDetail = '/warehouse/allotShipments/getDetailById', Export = '/warehouse/allotShipments/export', + ExportDetail = '/warehouse/allotShipments/exportDetail', } export function getAllotShipmentsPageList(params: QueryAllotShipmentsReq) { @@ -76,4 +77,13 @@ export function exportAllotShipments(params: QueryAllotShipmentsReq) { responseType: "blob" } ); +} + +export function exportAllotShipmentsDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/warehouse/assemble.ts b/web/src/api/warehouse/assemble.ts index 3796c3a8..93e4b7a5 100644 --- a/web/src/api/warehouse/assemble.ts +++ b/web/src/api/warehouse/assemble.ts @@ -15,6 +15,7 @@ enum API { UpdateStatus = '/warehouse/assemble/updateStatusByIds', GetDetail = '/warehouse/assemble/getDetailById', Export = '/warehouse/assemble/export', + ExportDetail = '/warehouse/assemble/exportDetail', } export function getAssemblePageList(params: QueryAssembleReq) { @@ -76,4 +77,13 @@ export function exportAssemble(params: QueryAssembleReq) { responseType: "blob" } ); +} + +export function exportAssembleDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/warehouse/disassemble.ts b/web/src/api/warehouse/disassemble.ts index c5d7bc62..5f80ce2c 100644 --- a/web/src/api/warehouse/disassemble.ts +++ b/web/src/api/warehouse/disassemble.ts @@ -15,6 +15,7 @@ enum API { UpdateStatus = '/warehouse/disassemble/updateStatusByIds', GetDetail = '/warehouse/disassemble/getDetailById', Export = '/warehouse/disassemble/export', + ExportDetail = '/warehouse/disassemble/exportDetail', } export function getDisAssemblePageList(params: QueryDisAssembleReq) { @@ -76,4 +77,13 @@ export function exportDisAssemble(params: ExportDisAssembleReq) { responseType: "blob" } ); +} + +export function exportDisAssembleDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/warehouse/shipments.ts b/web/src/api/warehouse/shipments.ts index 2908e886..83188df2 100644 --- a/web/src/api/warehouse/shipments.ts +++ b/web/src/api/warehouse/shipments.ts @@ -15,6 +15,7 @@ enum API { UpdateStatus = '/warehouse/otherShipments/updateStatusByIds', GetDetail = '/warehouse/otherShipments/getDetailById', Export = '/warehouse/otherShipments/export', + ExportDetail = '/warehouse/otherShipments/exportDetail', } export function getOtherShipmentsPageList(params: QueryOtherShipmentsReq) { @@ -76,4 +77,13 @@ export function exportOtherShipments(params: QueryOtherShipmentsReq) { responseType: "blob" } ); +} + +export function exportOtherShipmentsDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/api/warehouse/storage.ts b/web/src/api/warehouse/storage.ts index 5261088a..1ef9deaa 100644 --- a/web/src/api/warehouse/storage.ts +++ b/web/src/api/warehouse/storage.ts @@ -15,6 +15,7 @@ enum API { UpdateStatus = '/warehouse/otherStorage/updateStatusByIds', GetDetail = '/warehouse/otherStorage/getDetailById', Export = '/warehouse/otherStorage/export', + ExportDetail = '/warehouse/otherStorage/exportDetail', } export function getOtherStoragePageList(params: QueryOtherStorageReq) { @@ -76,4 +77,13 @@ export function exportOtherStorage(params: QueryOtherStorageReq) { responseType: "blob" } ); +} + +export function exportOtherStorageDetail(receiptNumber: string) { + return defHttp.get>( + { + url: `${API.ExportDetail}/${receiptNumber}`, + responseType: "blob" + } + ); } \ No newline at end of file diff --git a/web/src/views/financial/advance-charge/components/ViewAdvanceChargeModal.vue b/web/src/views/financial/advance-charge/components/ViewAdvanceChargeModal.vue index 7b737b9d..0a87be84 100644 --- a/web/src/views/financial/advance-charge/components/ViewAdvanceChargeModal.vue +++ b/web/src/views/financial/advance-charge/components/ViewAdvanceChargeModal.vue @@ -54,7 +54,7 @@ import {defineComponent, ref} from 'vue'; import {BasicTable, useTable} from '/src/components/Table'; import {BasicModal, useModalInner} from "@/components/Modal"; -import {getAdvanceDetail} from "@/api/financial/advance"; +import {getAdvanceDetail, exportAdvanceDetail} from "@/api/financial/advance"; import { Descriptions, DescriptionsItem, @@ -63,6 +63,7 @@ import { } from 'ant-design-vue'; import {advanceChargeTableColumns} from "@/views/financial/advance-charge/advance.data"; import printJS from "print-js"; +import {getTimestamp} from "@/utils/dateUtil"; export default defineComponent({ name: 'ViewIncomeModal', @@ -112,8 +113,17 @@ export default defineComponent({ closeModal(); } - function exportTable() { - + async function exportTable() { + const file: any = await exportAdvanceDetail(receiptNumber.value) + if (file.size > 0) { + const blob = new Blob([file]); + const link = document.createElement("a"); + const timestamp = getTimestamp(new Date()); + link.href = URL.createObjectURL(blob); + link.download = "收预付款单据详情" + timestamp + ".xlsx"; + link.target = "_blank"; + link.click(); + } } const flexContainer = 'display: flex; justify-content: space-between; border-bottom: 1px solid #ddd; padding: 8px;'; diff --git a/web/src/views/financial/collection/components/ViewCollectionModal.vue b/web/src/views/financial/collection/components/ViewCollectionModal.vue index 4bac5ada..26d30930 100644 --- a/web/src/views/financial/collection/components/ViewCollectionModal.vue +++ b/web/src/views/financial/collection/components/ViewCollectionModal.vue @@ -56,7 +56,7 @@ import {defineComponent, ref} from 'vue'; import {BasicTable, useTable} from '/src/components/Table'; import {BasicModal, useModalInner} from "@/components/Modal"; -import {getCollectionDetailById} from "@/api/financial/collection"; +import {getCollectionDetailById, exportCollectionDetail} from "@/api/financial/collection"; import { Descriptions, DescriptionsItem, @@ -65,6 +65,7 @@ import { } from 'ant-design-vue'; import {collectionReceiptTableColumns} from "@/views/financial/collection/collection.data"; import printJS from "print-js"; +import {getTimestamp} from "@/utils/dateUtil"; export default defineComponent({ name: 'ViewExpenseModal', components: { @@ -117,8 +118,17 @@ export default defineComponent({ closeModal(); } - function exportTable() { - + async function exportTable() { + const file: any = await exportCollectionDetail(receiptNumber.value) + if (file.size > 0) { + const blob = new Blob([file]); + const link = document.createElement("a"); + const timestamp = getTimestamp(new Date()); + link.href = URL.createObjectURL(blob); + link.download = "收款单单据详情" + timestamp + ".xlsx"; + link.target = "_blank"; + link.click(); + } } const flexContainer = 'display: flex; justify-content: space-between; border-bottom: 1px solid #ddd; padding: 8px;'; diff --git a/web/src/views/financial/expense/components/ViewExpenseModal.vue b/web/src/views/financial/expense/components/ViewExpenseModal.vue index 58468fda..cb0418eb 100644 --- a/web/src/views/financial/expense/components/ViewExpenseModal.vue +++ b/web/src/views/financial/expense/components/ViewExpenseModal.vue @@ -54,7 +54,7 @@ import {defineComponent, ref} from 'vue'; import {BasicTable, useTable} from '/src/components/Table'; import {BasicModal, useModalInner} from "@/components/Modal"; -import {getExpenseDetailById} from "@/api/financial/expense"; +import {getExpenseDetailById, exportExpenseDetail} from "@/api/financial/expense"; import { Descriptions, DescriptionsItem, @@ -63,6 +63,7 @@ import { } from 'ant-design-vue'; import {expenseReceiptTableColumns} from "@/views/financial/expense/expense.data"; import printJS from "print-js"; +import {getTimestamp} from "@/utils/dateUtil"; export default defineComponent({ name: 'ViewExpenseModal', components: { @@ -111,8 +112,17 @@ export default defineComponent({ closeModal(); } - function exportTable() { - + async function exportTable() { + const file: any = await exportExpenseDetail(receiptNumber.value) + if (file.size > 0) { + const blob = new Blob([file]); + const link = document.createElement("a"); + const timestamp = getTimestamp(new Date()); + link.href = URL.createObjectURL(blob); + link.download = "支出单单据详情" + timestamp + ".xlsx"; + link.target = "_blank"; + link.click(); + } } const flexContainer = 'display: flex; justify-content: space-between; border-bottom: 1px solid #ddd; padding: 8px;'; diff --git a/web/src/views/financial/income/components/ViewIncomeModal.vue b/web/src/views/financial/income/components/ViewIncomeModal.vue index 3fce26bf..5a34810a 100644 --- a/web/src/views/financial/income/components/ViewIncomeModal.vue +++ b/web/src/views/financial/income/components/ViewIncomeModal.vue @@ -53,8 +53,8 @@