fetch: add disassemble receipt export api eairps#245

Jzow · Jzow · commit 693d5a586a31 · 2023-12-02T15:28:08.000+08:00
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
@@ -19,14 +19,8 @@
 import com.wansenai.utils.response.Response;
 import com.wansenai.vo.warehouse.DisassembleReceiptDetailVO;
 import com.wansenai.vo.warehouse.DisassembleReceiptVO;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.PostMapping;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -64,4 +58,9 @@ public Response<String> deleteDisAssembleReceiptByIds(@RequestParam("ids") List<
     public Response<String> updateDisAssembleReceiptStatusByIds(@RequestParam("ids") List<Long> ids, @RequestParam("status") Integer status) {
         return disassembleService.updateDisassembleReceiptStatus(ids, status);
     }
+
+    @GetMapping("export")
+    public void exportDisAssembleReceipt(@ModelAttribute QueryDisassembleReceiptDTO queryDisassembleReceiptDTO, HttpServletResponse response) throws Exception {
+        disassembleService.exportDisAssembleReceipt(queryDisassembleReceiptDTO, response);
+    }
 }
diff --git a/core/domain/src/main/java/com/wansenai/vo/warehouse/DisassembleReceiptVO.java b/core/domain/src/main/java/com/wansenai/vo/warehouse/DisassembleReceiptVO.java
@@ -15,6 +15,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.wansenai.bo.BigDecimalSerializerBO;
+import com.wansenai.utils.excel.ExcelExport;
 import lombok.Builder;
 import lombok.Data;
 
@@ -28,19 +29,26 @@ public class DisassembleReceiptVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
+    @ExcelExport(value = "单据编号")
     private String receiptNumber;
 
+    @ExcelExport(value = "商品信息")
     private String productInfo;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ExcelExport(value = "单据日期")
     private LocalDateTime receiptDate;
 
-    private String operator;
-
+    @ExcelExport(value = "商品数量")
     private Integer productNumber;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
+    @ExcelExport(value = "金额合计")
     private BigDecimal totalAmount;
 
+    @ExcelExport(value = "操作员")
+    private String operator;
+
+    @ExcelExport(value = "状态", kv = "0-未审核;1-已审核")
     private Integer status;
 }
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
@@ -20,6 +20,7 @@
 import com.wansenai.utils.response.Response;
 import com.wansenai.vo.warehouse.DisassembleReceiptDetailVO;
 import com.wansenai.vo.warehouse.DisassembleReceiptVO;
+import jakarta.servlet.http.HttpServletResponse;
 
 import java.util.List;
 
@@ -34,4 +35,6 @@ public interface DisassembleReceiptService extends IService<WarehouseReceiptMain
     Response<String> deleteBatchDisassembleReceipt(List<Long> ids);
 
     Response<String> updateDisassembleReceiptStatus(List<Long> ids, Integer status);
+
+    void exportDisAssembleReceipt(QueryDisassembleReceiptDTO queryDisassembleReceiptDTO, HttpServletResponse response) throws Exception;
 }
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
@@ -38,11 +38,13 @@
 import com.wansenai.utils.enums.AssembleReceiptCodeEnum;
 import com.wansenai.utils.enums.BaseCodeEnum;
 import com.wansenai.utils.enums.DisassembleReceiptCodeEnum;
+import com.wansenai.utils.excel.ExcelUtils;
 import com.wansenai.utils.response.Response;
 import com.wansenai.vo.warehouse.AssembleReceiptDetailVO;
 import com.wansenai.vo.warehouse.AssembleReceiptVO;
 import com.wansenai.vo.warehouse.DisassembleReceiptDetailVO;
 import com.wansenai.vo.warehouse.DisassembleReceiptVO;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -181,6 +183,44 @@ public Response<Page<DisassembleReceiptVO>> getDisassembleReceiptPageList(QueryD
         return Response.responseData(result);
     }
 
+    public List<DisassembleReceiptVO> getDisassembleReceiptList(QueryDisassembleReceiptDTO queryDisassembleReceiptDTO) {
+        var wrapperMainMapper = lambdaQuery()
+                .eq(queryDisassembleReceiptDTO.getOperatorId() != null, WarehouseReceiptMain::getCreateBy, queryDisassembleReceiptDTO.getOperatorId())
+                .eq(queryDisassembleReceiptDTO.getStatus() != null, WarehouseReceiptMain::getStatus, queryDisassembleReceiptDTO.getStatus())
+                .eq(StringUtils.hasLength(queryDisassembleReceiptDTO.getReceiptNumber()), WarehouseReceiptMain::getReceiptNumber, queryDisassembleReceiptDTO.getReceiptNumber())
+                .like(StringUtils.hasLength(queryDisassembleReceiptDTO.getRemark()), WarehouseReceiptMain::getRemark, queryDisassembleReceiptDTO.getRemark())
+                .ge(StringUtils.hasLength(queryDisassembleReceiptDTO.getStartDate()), WarehouseReceiptMain::getCreateTime, queryDisassembleReceiptDTO.getStartDate())
+                .le(StringUtils.hasLength(queryDisassembleReceiptDTO.getEndDate()), WarehouseReceiptMain::getCreateTime, queryDisassembleReceiptDTO.getEndDate())
+                .eq(WarehouseReceiptMain::getType, "拆卸单")
+                .eq(WarehouseReceiptMain::getDeleteFlag, CommonConstants.NOT_DELETED)
+                .list();
+
+        var disAssembleReceiptVOList = new ArrayList<DisassembleReceiptVO>(wrapperMainMapper.size() + 1);
+        wrapperMainMapper.forEach(item -> {
+
+            var product = productService.getById(item.getProductId());
+            var productInfo = "";
+            if(product != null) {
+                productInfo = product.getProductName() + "|" + product.getProductStandard() + "|" + product.getProductModel() + "|" + product.getProductUnit();
+            }
+
+            var operator = userService.getById(item.getCreateBy());
+            var disAssembleReceiptVO = DisassembleReceiptVO.builder()
+                    .id(item.getId())
+                    .receiptNumber(item.getReceiptNumber())
+                    .productInfo(productInfo)
+                    .receiptDate(item.getReceiptDate())
+                    .operator(Optional.ofNullable(operator).map(SysUser::getName).orElse(""))
+                    .productNumber(item.getTotalProductNumber())
+                    .totalAmount(item.getTotalAmount())
+                    .status(item.getStatus())
+                    .build();
+
+            disAssembleReceiptVOList.add(disAssembleReceiptVO);
+        });
+        return disAssembleReceiptVOList;
+    }
+
     @Override
     public Response<DisassembleReceiptDetailVO> getDisassembleReceiptDetail(Long id) {
         if (id == null) {
@@ -432,4 +472,13 @@ public Response<String> updateDisassembleReceiptStatus(List<Long> ids, Integer s
         }
         return Response.responseMsg(DisassembleReceiptCodeEnum.UPDATE_DISASSEMBLE_RECEIPT_SUCCESS);
     }
+
+    @Override
+    public void exportDisAssembleReceipt(QueryDisassembleReceiptDTO queryDisassembleReceiptDTO, HttpServletResponse response) throws Exception {
+        var data = getDisassembleReceiptList(queryDisassembleReceiptDTO);
+        if (!data.isEmpty()) {
+            var file = ExcelUtils.exportFile(ExcelUtils.DEFAULT_FILE_PATH, "拆卸单", data);
+            ExcelUtils.downloadExcel(file, "拆卸单", response);
+        }
+    }
 }
diff --git a/web/src/api/warehouse/disassemble.ts b/web/src/api/warehouse/disassemble.ts
@@ -14,6 +14,7 @@ enum API {
     DeleteBatch = '/warehouse/disassemble/deleteByIds',
     UpdateStatus = '/warehouse/disassemble/updateStatusByIds',
     GetDetail = '/warehouse/disassemble/getDetailById',
+    Export = '/warehouse/disassemble/export',
 }
 
 export function getDisAssemblePageList(params: QueryDisAssembleReq) {
@@ -65,4 +66,14 @@ export function getDisAssembleDetailById(id: number) {
             url: `${API.GetDetail}/${id}`
         },
     );
+}
+
+export function exportDisAssemble(params: QueryDisAssembleReq) {
+    return defHttp.get<BaseDataResp<Blob>>(
+        {
+            url: `${API.Export}`,
+            params,
+            responseType: "blob"
+        }
+    );
 }
diff --git a/web/src/views/warehouse/disassemble/index.vue b/web/src/views/warehouse/disassemble/index.vue
@@ -52,9 +52,8 @@ import {defineComponent, ref} from "vue";
 import {BasicTable, TableAction, useTable} from "@/components/Table";
 import {useMessage} from "@/hooks/web/useMessage";
 import {columns, searchFormSchema} from "@/views//warehouse/disassemble/disassemble.data";
-import {exportXlsx} from "@/api/basic/common";
 import {useI18n} from "vue-i18n";
-import {getDisAssemblePageList, deleteBatchDisAssemble, updateDisAssembleStatus} from "@/api/warehouse/disassemble";
+import {getDisAssemblePageList, deleteBatchDisAssemble, updateDisAssembleStatus, exportDisAssemble} from "@/api/warehouse/disassemble";
 import AddEditDisassembleModal from "@/views/warehouse/disassemble/components/AddEditDisassembleModal.vue"
 import ViewDisassembleModal from "@/views/warehouse/disassemble/components/ViewDisassembleModal.vue";
 import {Tag} from "ant-design-vue";
@@ -67,7 +66,7 @@ export default defineComponent({
     const { createMessage } = useMessage();
     const addEditModalRef = ref(null);
     const [receiptViewModal, {openModal: openReceiptViewModal}] = useModal();
-    const [registerTable, { reload, getSelectRows }] = useTable({
+    const [registerTable, { reload, getSelectRows, getForm }] = useTable({
       title: '拆卸单列表',
       rowKey: 'id',
       api: getDisAssemblePageList,
@@ -170,14 +169,17 @@ export default defineComponent({
     }
 
     async function handleExport() {
-      const file = await exportXlsx("拆卸单列表")
-      const blob = new Blob([file]);
-      const link = document.createElement("a");
-      link.href = URL.createObjectURL(blob);
-      const timestamp = getTimestamp(new Date());
-      link.download = "拆卸单数据" + timestamp + ".xlsx";
-      link.target = "_blank";
-      link.click();
+      const data = getForm().getFieldsValue();
+      const file: any = await exportDisAssemble(data)
+      if (file.size > 0) {
+        const blob = new Blob([file]);
+        const link = document.createElement("a");
+        link.href = URL.createObjectURL(blob);
+        const timestamp = getTimestamp(new Date());
+        link.download = "拆卸单数据" + timestamp + ".xlsx";
+        link.target = "_blank";
+        link.click();
+      }
     }
 
 
