fetch: add retail module view receipt detail export function and api eairps#245

Jzow · Jzow · commit 1e0b9bfc4e03 · 2023-12-05T13:36:57.000+08:00
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
@@ -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/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<ReceiptRetailMain> {
      */
     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<ReceiptRetailMain> {
      *                  异常
      */
     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/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<ShipmentsDataExportBO>();
+            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<String, List<List<Object>>>();
@@ -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<ShipmentsDataExportBO>();
+            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/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
@@ -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<BaseDataResp<Blob>>(
+        {
+            url: `${API.ExportDetail}/${receiptNumber}`,
+            responseType: "blob"
+        }
+    );
 }
diff --git 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<BaseDataResp<Blob>>(
+        {
+            url: `${API.ExportDetail}/${receiptNumber}`,
+            responseType: "blob"
+        }
+    );
 }
diff --git a/web/src/views/retail/refund/components/ViewRefundModal.vue b/web/src/views/retail/refund/components/ViewRefundModal.vue
@@ -59,7 +59,7 @@
 import {defineComponent, ref} from 'vue';
 import {BasicTable, useTable} from '/src/components/Table';
 import {BasicModal, useModal, useModalInner} from "@/components/Modal";
-import {getLinkRefundDetail} from "@/api/retail/refund";
+import {getLinkRefundDetail, exportRefundDetail} from "@/api/retail/refund";
 import {
   Descriptions,
   DescriptionsItem,
@@ -69,6 +69,7 @@ import {
 import {retailShipmentsTableColumns} from "@/views/retail/shipments/shipments.data";
 import ViewShipmentModal from "@/views/retail/shipments/components/ViewShipmentModal.vue";
 import printJS from "print-js";
+import {getTimestamp} from "@/utils/dateUtil";
 
 export default defineComponent({
   name: 'ViewRefundModal',
@@ -135,8 +136,17 @@ export default defineComponent({
       });
     }
 
-    function exportTable() {
-
+    async function exportTable() {
+      const file: any = await exportRefundDetail(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/retail/shipments/components/ViewShipmentModal.vue b/web/src/views/retail/shipments/components/ViewShipmentModal.vue
@@ -59,7 +59,7 @@
 import {defineComponent, ref} from 'vue';
 import {BasicTable, useTable} from '/src/components/Table';
 import {BasicModal, useModalInner} from "@/components/Modal";
-import {getLinkShipmentsDetail} from "@/api/retail/shipments";
+import {getLinkShipmentsDetail, exportShipmentsDetail} from "@/api/retail/shipments";
 import printJS from 'print-js';
 import {
   Descriptions,
@@ -68,6 +68,7 @@ import {
   Statistic,
 } from 'ant-design-vue';
 import {retailShipmentsTableColumns} from "@/views/retail/shipments/shipments.data";
+import {getTimestamp} from "@/utils/dateUtil";
 
 export default defineComponent({
   name: 'ViewShipmentModal',
@@ -82,18 +83,18 @@ export default defineComponent({
   setup() {
     const receiptNumber = ref('');
     const otherReceipt = ref('');
-    const memberName = ref(0);
+    const memberName = ref<any>('');
     const paymentType = ref('');
     const receiptDate = ref('');
     const receiptType = ref('');
-    const receiptAmount = ref('');
+    const receiptAmount = ref<any>('');
     const collectAmount = ref('');
-    const backAmount = ref('');
+    const backAmount = ref<any>('');
     const accountName = ref('');
     const remark = ref('')
     const status = ref();
 
-    const tableData = ref([]);
+    const tableData = ref<any>([]);
     const [registerTable] = useTable({
       title: '出库商品表数据',
       columns: retailShipmentsTableColumns,
@@ -106,7 +107,6 @@ export default defineComponent({
     const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
       setModalProps({confirmLoading: false, destroyOnClose: true, width: 1200, showOkBtn: false});
       const res = await getLinkShipmentsDetail(data.receiptNumber);
-      console.info(res.data);
       tableData.value = res.data.tableData;
       receiptNumber.value = res.data.receiptNumber;
       memberName.value = res.data.memberName;
@@ -129,8 +129,17 @@ export default defineComponent({
       closeModal();
     }
 
-    function exportTable() {
-
+    async function exportTable() {
+      const file: any = await exportShipmentsDetail(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;';
