导出实体类创建

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/doc/BionutritionDocHeaderController.java

@@ -8,26 +8,36 @@ import com.ruoyi.ams.asn.domain.WmsDocAsnHeader;
 import com.ruoyi.ams.bionutrition.doc.dto.BionutritionDocBaseDTO;
 import com.ruoyi.ams.bionutrition.doc.dto.BionutritionDocDetailsDTO;
 import com.ruoyi.ams.bionutrition.doc.dto.BionutritionDocHeaderDTO;
+import com.ruoyi.ams.bionutrition.doc.dto.header.PurchaseOrderHeaderDTO;
+import com.ruoyi.ams.bionutrition.doc.excel.PurchaseOrderExcel;
+import com.ruoyi.ams.bionutrition.doc.excel.detail.PurchaseOrderDetailsExcel;
+import com.ruoyi.ams.bionutrition.doc.excel.header.PurchaseOrderHeaderExcel;
 import com.ruoyi.ams.bionutrition.doc.service.BionutritionDocDetailsService;
 import com.ruoyi.ams.bionutrition.doc.service.BionutritionDocHeaderService;
 import com.ruoyi.ams.bionutrition.org.bean.dto.OrgDTO;
+import com.ruoyi.base.constant.type.BizEnum;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.ConvertUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
+@Slf4j
 @RestController
 @RequestMapping("/docHeader/docHeader")
 public class BionutritionDocHeaderController extends BaseController {
@@ -106,7 +116,22 @@ public class BionutritionDocHeaderController extends BaseController {
         return list;
     }
 
-    /***************************** 单据明细 *********************************************/
+    /**
+     * 导出采购单列表
+     */
+//    @PreAuthorize("@ss.hasPermi('docAsn:docAsn:export')")
+    @Log(title = "导出采购单", businessType = BusinessType.EXPORT)
+    @PostMapping("/purchase/export")
+    public void purchaseExport(HttpServletResponse response, BionutritionDocHeaderDTO docHeaderDTO) {
+
+        docHeaderDTO.setDocType(BizEnum.BionutritionHeaderDocTypeEnum.PURCHASE_ORDER.getDocType());
+        List<BionutritionDocBaseDTO> docList = bionutritionDocHeaderService.getDocList(docHeaderDTO);
+        log.info("---{}",docList);
+        /*ExcelUtil<PurchaseOrderExcel> exportUtil = new ExcelUtil<>(PurchaseOrderExcel.class);
+        exportUtil.exportExcel(response, excelList, "采购单", "采购单");*/
+    }
+
+    /********************************** 单据明细 *********************************************/
 
     /**
      * 新增单据明细

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/FinishedProductReceiptExcel.java

@@ -0,0 +1,21 @@
+package com.ruoyi.ams.bionutrition.doc.excel;
+
+import com.ruoyi.ams.bionutrition.doc.excel.detail.FinishedProductReceiptDetailsExcel;
+import com.ruoyi.ams.bionutrition.doc.excel.header.FinishedProductReceiptHeaderExcel;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class FinishedProductReceiptExcel implements Serializable {
+
+    private static final long serialVersionUID = -3010237686378441980L;
+
+    @Excel(name = "单头")
+    private FinishedProductReceiptHeaderExcel finishedProductReceiptHeaderExcel;
+
+    @Excel(name = "明细")
+    private List<FinishedProductReceiptDetailsExcel> detailsExcelList;
+}

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/ProductionPickingReceiptExcel.java

@@ -0,0 +1,19 @@
+package com.ruoyi.ams.bionutrition.doc.excel;
+
+import com.ruoyi.ams.bionutrition.doc.excel.detail.ProductionPickingReceiptDetailsExcel;
+import com.ruoyi.ams.bionutrition.doc.excel.header.ProductionPickingReceiptHeaderExcel;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class ProductionPickingReceiptExcel implements Serializable {
+    private static final long serialVersionUID = 8034996096098859764L;
+
+    @Excel(name = "单头")
+    private ProductionPickingReceiptHeaderExcel productionPickingReceiptHeaderExcel;
+    @Excel(name = "明细")
+    private List<ProductionPickingReceiptDetailsExcel> detailsExcels;
+}

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/ProductionReturnOrderExcel.java

@@ -0,0 +1,21 @@
+package com.ruoyi.ams.bionutrition.doc.excel;
+
+import com.ruoyi.ams.bionutrition.doc.excel.detail.ProductionReturnOrderDetailsExcel;
+import com.ruoyi.ams.bionutrition.doc.excel.header.ProductionPickingReceiptHeaderExcel;
+import com.ruoyi.ams.bionutrition.doc.excel.header.ProductionReturnOrderHeaderExcel;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class ProductionReturnOrderExcel implements Serializable {
+    private static final long serialVersionUID = 5209118764435821705L;
+
+    @Excel(name = "单头")
+    private ProductionReturnOrderHeaderExcel productionReturnOrderHeaderExcel;
+
+    @Excel(name = "明细")
+    private List<ProductionReturnOrderDetailsExcel> detailsExcels;
+}

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/PurchaseOrderExcel.java

@@ -0,0 +1,21 @@
+package com.ruoyi.ams.bionutrition.doc.excel;
+
+import com.ruoyi.ams.bionutrition.doc.excel.detail.PurchaseOrderDetailsExcel;
+import com.ruoyi.ams.bionutrition.doc.excel.header.PurchaseOrderHeaderExcel;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class PurchaseOrderExcel implements Serializable {
+
+    private static final long serialVersionUID = 8278143828971487117L;
+
+    @Excel(name = "单头")
+    private PurchaseOrderHeaderExcel purchaseOrderHeaderExcel;
+
+    @Excel(name = "明细")
+    private List<PurchaseOrderDetailsExcel> detailsExcelList;
+}

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/PurchaseReceiptExcel.java

@@ -0,0 +1,21 @@
+package com.ruoyi.ams.bionutrition.doc.excel;
+
+import com.ruoyi.ams.bionutrition.doc.excel.detail.PurchaseReceiptDetailsExcel;
+import com.ruoyi.ams.bionutrition.doc.excel.header.PurchaseOrderHeaderExcel;
+import com.ruoyi.ams.bionutrition.doc.excel.header.PurchaseReceiptHeaderExcel;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class PurchaseReceiptExcel implements Serializable {
+    private static final long serialVersionUID = 5521453657256275364L;
+
+    @Excel(name = "单头")
+    private PurchaseReceiptHeaderExcel purchaseReceiptHeaderExcel;
+
+    @Excel(name = "明细")
+    private List<PurchaseReceiptDetailsExcel> detailsExcels;
+}

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/SaleOutboundOrderExcel.java

@@ -0,0 +1,20 @@
+package com.ruoyi.ams.bionutrition.doc.excel;
+
+import com.ruoyi.ams.bionutrition.doc.excel.detail.SaleOutboundOrderDetailsExcel;
+import com.ruoyi.ams.bionutrition.doc.excel.header.SaleOutboundOrderHeaderExcel;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class SaleOutboundOrderExcel implements Serializable {
+    private static final long serialVersionUID = -7556938536266851824L;
+
+    @Excel(name = "单头")
+    private SaleOutboundOrderHeaderExcel saleOutboundOrderHeaderExcel;
+
+    @Excel(name = "明细")
+    private List<SaleOutboundOrderDetailsExcel> detailsExcels;
+}

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/SaleReturnOrderExcel.java

@@ -0,0 +1,21 @@
+package com.ruoyi.ams.bionutrition.doc.excel;
+
+import com.ruoyi.ams.bionutrition.doc.excel.detail.SaleReturnOrderDetailsExcel;
+import com.ruoyi.ams.bionutrition.doc.excel.header.SaleReturnOrderHeaderExcel;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class SaleReturnOrderExcel implements Serializable {
+
+    private static final long serialVersionUID = -8838318178207197395L;
+
+    @Excel(name = "单头")
+    private SaleReturnOrderHeaderExcel saleReturnOrderHeaderExcel;
+
+    @Excel(name = "明细")
+    private List<SaleReturnOrderDetailsExcel> detailsExcels;
+}

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/detail/FinishedProductReceiptDetailsExcel.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.bionutrition.doc.excel.detail;
 
 import com.ruoyi.ams.bionutrition.doc.dto.detail.BionutritionDocDetailsBaseDTO;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,23 +10,23 @@ import lombok.Data;
  */
 
 @Data
-public class FinishedProductReceiptDetailsExcel extends BionutritionDocDetailsBaseDTO {
+public class FinishedProductReceiptDetailsExcel extends BionutritionDocDetailsBaseExcel {
 
-    @ApiModelProperty("产品批号")
+    @Excel(name = "产品批号")
     private String productLotNumber;
 
-    @ApiModelProperty("收货人")
+    @Excel(name = "收货人")
     private String receiver;
 
-    @ApiModelProperty("入库人")
+    @Excel(name = "入库人")
     private String warehousePerson;
 
-    @ApiModelProperty("复审人")
+    @Excel(name = "复审人")
     private String reviewerNext;
 
-    @ApiModelProperty("规格")
+    @Excel(name = "规格")
     private String specification;
 
-    @ApiModelProperty("质检单号/检验单号")
+    @Excel(name = "质检单号/检验单号")
     private String qualityInspectionDoc;
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/detail/ProductionPickingReceiptDetailsExcel.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.bionutrition.doc.excel.detail;
 
 import com.ruoyi.ams.bionutrition.doc.dto.detail.BionutritionDocDetailsBaseDTO;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,18 +9,18 @@ import lombok.Data;
  * 生产领料单明细
  */
 @Data
-public class ProductionPickingReceiptDetailsExcel extends BionutritionDocDetailsBaseDTO {
+public class ProductionPickingReceiptDetailsExcel extends BionutritionDocDetailsBaseExcel {
 
-    @ApiModelProperty("进厂批号")
+    @Excel(name = "进厂批号")
     private String incomeLotNumber;
 
-    @ApiModelProperty("产品批号")
+    @Excel(name = "产品批号")
     private String productLotNumber;
 
-    @ApiModelProperty("计量单位")
+    @Excel(name = "计量单位")
     private String measureUnit;
 
-    @ApiModelProperty("生产日期")
+    @Excel(name = "生产日期")
     private String manufactureDate;
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/detail/ProductionReturnOrderDetailsExcel.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.bionutrition.doc.excel.detail;
 
 import com.ruoyi.ams.bionutrition.doc.dto.detail.BionutritionDocDetailsBaseDTO;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,18 +10,18 @@ import lombok.Data;
  */
 
 @Data
-public class ProductionReturnOrderDetailsExcel extends BionutritionDocDetailsBaseDTO {
+public class ProductionReturnOrderDetailsExcel extends BionutritionDocDetailsBaseExcel {
 
-    @ApiModelProperty("进厂批号")
+    @Excel(name = "进厂批号")
     private String incomeLotNumber;
 
-    @ApiModelProperty("计量单位")
+    @Excel(name = "计量单位")
     private String measureUnit;
 
-    @ApiModelProperty("收货人")
+    @Excel(name = "收货人")
     private String receiver;
 
-    @ApiModelProperty("退库人")
+    @Excel(name = "退库人")
     private String returner;
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/detail/PurchaseOrderDetailsExcel.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.bionutrition.doc.excel.detail;
 
 import com.ruoyi.ams.bionutrition.doc.dto.detail.BionutritionDocDetailsBaseDTO;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,21 +9,21 @@ import lombok.Data;
  * 采购单明细
  */
 @Data
-public class PurchaseOrderDetailsExcel extends BionutritionDocDetailsBaseDTO {
+public class PurchaseOrderDetailsExcel extends BionutritionDocDetailsBaseExcel {
 
-    @ApiModelProperty("原厂批号")
+    @Excel(name = "原厂批号")
     private String originalLotNumber;
 
-    @ApiModelProperty("进厂批号")
+    @Excel(name = "进厂批号")
     private String incomeLotNumber;
 
-    @ApiModelProperty("计量单位")
+    @Excel(name = "计量单位")
     private String measureUnit;
 
-    @ApiModelProperty("生产日期")
+    @Excel(name = "生产日期")
     private String manufactureDate;
 
-    @ApiModelProperty("含税价")
+    @Excel(name = "含税价")
     private String priceIncludeTax;
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/detail/PurchaseReceiptDetailsExcel.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.bionutrition.doc.excel.detail;
 
 import com.ruoyi.ams.bionutrition.doc.dto.detail.BionutritionDocDetailsBaseDTO;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,21 +10,21 @@ import lombok.Data;
  */
 
 @Data
-public class PurchaseReceiptDetailsExcel extends BionutritionDocDetailsBaseDTO {
+public class PurchaseReceiptDetailsExcel extends BionutritionDocDetailsBaseExcel {
 
-    @ApiModelProperty("原厂批号")
+    @Excel(name = "原厂批号")
     private String originalLotNumber;
 
-    @ApiModelProperty("进厂批号")
+    @Excel(name = "进厂批号")
     private String incomeLotNumber;
 
-    @ApiModelProperty("计量单位")
+    @Excel(name = "计量单位")
     private String measureUnit;
 
-    @ApiModelProperty("生产日期")
+    @Excel(name = "生产日期")
     private String manufactureDate;
 
-    @ApiModelProperty("含税价")
+    @Excel(name = "含税价")
     private String priceIncludeTax;
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/detail/SaleOutboundOrderDetailsExcel.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.bionutrition.doc.excel.detail;
 
 import com.ruoyi.ams.bionutrition.doc.dto.detail.BionutritionDocDetailsBaseDTO;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,21 +10,21 @@ import lombok.Data;
  */
 
 @Data
-public class SaleOutboundOrderDetailsExcel extends BionutritionDocDetailsBaseDTO {
+public class SaleOutboundOrderDetailsExcel extends BionutritionDocDetailsBaseExcel {
 
-    @ApiModelProperty("产品名称")
+    @Excel(name = "产品名称")
     private String productName;
 
-    @ApiModelProperty("产品批号")
+    @Excel(name = "产品批号")
     private String productLotNumber;
 
-    @ApiModelProperty("计量单位")
+    @Excel(name = "计量单位")
     private String measureUnit;
 
-    @ApiModelProperty("规格")
+    @Excel(name = "规格")
     private String specification;
 
-    @ApiModelProperty("质检单号/检验单号")
+    @Excel(name = "质检单号/检验单号")
     private String qualityInspectionDoc;
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/detail/SaleReturnOrderDetailsExcel.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.bionutrition.doc.excel.detail;
 
 import com.ruoyi.ams.bionutrition.doc.dto.detail.BionutritionDocDetailsBaseDTO;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,18 +10,18 @@ import lombok.Data;
  */
 
 @Data
-public class SaleReturnOrderDetailsExcel extends BionutritionDocDetailsBaseDTO {
+public class SaleReturnOrderDetailsExcel extends BionutritionDocDetailsBaseExcel {
 
-    @ApiModelProperty("产品批号")
+    @Excel(name = "产品批号")
     private String productLotNumber;
 
-    @ApiModelProperty("计量单位")
+    @Excel(name = "计量单位")
     private String measureUnit;
 
-    @ApiModelProperty("规格")
+    @Excel(name = "规格")
     private String specification;
 
-    @ApiModelProperty("质检单号/检验单号")
+    @Excel(name = "质检单号/检验单号")
     private String qualityInspectionDoc;
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/header/FinishedProductReceiptHeaderExcel.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.bionutrition.doc.excel.header;
 
 import com.ruoyi.ams.bionutrition.doc.dto.header.BionutritionDocHeaderBaseDTO;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,9 +10,11 @@ import lombok.Data;
  */
 
 @Data
-public class FinishedProductReceiptHeaderExcel extends BionutritionDocHeaderBaseDTO {
+public class FinishedProductReceiptHeaderExcel extends BionutritionDocHeaderBaseExcel {
 
-    @ApiModelProperty("部门名称")
+    private static final long serialVersionUID = 2212371670234029386L;
+
+    @Excel(name = "部门名称")
     private String dept;
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/header/ProductionPickingReceiptHeaderExcel.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.bionutrition.doc.excel.header;
 
 import com.ruoyi.ams.bionutrition.doc.dto.header.BionutritionDocHeaderBaseDTO;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,9 +10,9 @@ import lombok.Data;
  */
 
 @Data
-public class ProductionPickingReceiptHeaderExcel extends BionutritionDocHeaderBaseDTO {
+public class ProductionPickingReceiptHeaderExcel extends BionutritionDocHeaderBaseExcel {
 
-    @ApiModelProperty("部门名称")
+    @Excel(name = "部门名称")
     private String dept;
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/header/ProductionReturnOrderHeaderExcel.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.bionutrition.doc.excel.header;
 
 import com.ruoyi.ams.bionutrition.doc.dto.header.BionutritionDocHeaderBaseDTO;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,9 +10,9 @@ import lombok.Data;
  */
 
 @Data
-public class ProductionReturnOrderHeaderExcel extends BionutritionDocHeaderBaseDTO {
+public class ProductionReturnOrderHeaderExcel extends BionutritionDocHeaderBaseExcel {
 
-    @ApiModelProperty("部门名称")
+    @Excel(name = "部门名称")
     private String dept;
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/header/PurchaseOrderHeaderExcel.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.bionutrition.doc.excel.header;
 
 import com.ruoyi.ams.bionutrition.doc.dto.header.BionutritionDocHeaderBaseDTO;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,18 +10,18 @@ import lombok.Data;
  */
 
 @Data
-public class PurchaseOrderHeaderExcel extends BionutritionDocHeaderBaseDTO {
+public class PurchaseOrderHeaderExcel extends BionutritionDocHeaderBaseExcel {
 
-    @ApiModelProperty("供应商编码")
+    @Excel(name = "供应商编码")
     private String vendorCode;
 
-    @ApiModelProperty("供应商全称")
+    @Excel(name = "供应商全称")
     private String vendorName;
 
-    @ApiModelProperty("采购人")
+    @Excel(name = "采购人")
     private String purchaser;
 
-    @ApiModelProperty("税率")
+    @Excel(name = "税率")
     private String taxRate;
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/header/PurchaseReceiptHeaderExcel.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.bionutrition.doc.excel.header;
 
 import com.ruoyi.ams.bionutrition.doc.dto.header.BionutritionDocHeaderBaseDTO;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,15 +10,15 @@ import lombok.Data;
  */
 
 @Data
-public class PurchaseReceiptHeaderExcel extends BionutritionDocHeaderBaseDTO {
+public class PurchaseReceiptHeaderExcel extends BionutritionDocHeaderBaseExcel {
 
-    @ApiModelProperty("供应商编码")
+    @Excel(name = "供应商编码")
     private String vendorCode;
 
-    @ApiModelProperty("供应商全称")
+    @Excel(name = "供应商全称")
     private String vendorName;
 
-    @ApiModelProperty("税率")
+    @Excel(name = "税率")
     private String taxRate;
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/header/SaleOutboundOrderHeaderExcel.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.bionutrition.doc.excel.header;
 
 import com.ruoyi.ams.bionutrition.doc.dto.header.BionutritionDocHeaderBaseDTO;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,33 +10,33 @@ import lombok.Data;
  */
 
 @Data
-public class SaleOutboundOrderHeaderExcel extends BionutritionDocHeaderBaseDTO {
+public class SaleOutboundOrderHeaderExcel extends BionutritionDocHeaderBaseExcel {
 
-    @ApiModelProperty("客户名称")
+    @Excel(name = "客户名称")
     private String customName;
 
-    @ApiModelProperty("接收人")
+    @Excel(name ="接收人")
     private String receiver;
 
-    @ApiModelProperty("收货地址")
+    @Excel(name ="收货地址")
     private String receiveAddress;
 
-    @ApiModelProperty("收货人电话")
+    @Excel(name ="收货人电话")
     private String receivePhone;
 
-    @ApiModelProperty("制单人")
+    @Excel(name ="制单人")
     private String docCreator;
 
-    @ApiModelProperty("审核人")
+    @Excel(name ="审核人")
     private String reviewer;
 
-    @ApiModelProperty("发货人")
+    @Excel(name ="发货人")
     private String shipper;
 
-    @ApiModelProperty("复审人")
+    @Excel(name ="复审人")
     private String reviewerNext;
 
-    @ApiModelProperty("销售合同")
+    @Excel(name ="销售合同")
     private String saleContract;
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/excel/header/SaleReturnOrderHeaderExcel.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.bionutrition.doc.excel.header;
 
 import com.ruoyi.ams.bionutrition.doc.dto.header.BionutritionDocHeaderBaseDTO;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,21 +10,21 @@ import lombok.Data;
  */
 
 @Data
-public class SaleReturnOrderHeaderExcel extends BionutritionDocHeaderBaseDTO {
+public class SaleReturnOrderHeaderExcel extends BionutritionDocHeaderBaseExcel {
 
-    @ApiModelProperty("销售退货单位")
+    @Excel(name = "销售退货单位")
     private String saleReturnUnit;
 
-    @ApiModelProperty("销售退货人")
+    @Excel(name = "销售退货人")
     private String saleReturner;
 
-    @ApiModelProperty("接收人")
+    @Excel(name = "接收人")
     private String receiver;
 
-    @ApiModelProperty("复审人")
+    @Excel(name = "复审人")
     private String reviewerNext;
 
-    @ApiModelProperty("仓库类别")
+    @Excel(name = "仓库类别")
     private String warehouseType;
 
 }

warewms-base/src/main/java/com/ruoyi/base/constant/type/BizEnum.java

@@ -91,7 +91,7 @@ public class BizEnum {
         /**
          * 采购单
          */
-        PURCHASE_ORDER("PurchaseOrder","PurchaseOrderHeaderDTO");
+        PURCHASE_ORDER("PurchaseOrder","com.ruoyi.ams.bionutrition.doc.dto.header.PurchaseOrderHeaderDTO");
 
         private String docType;
 
@@ -144,7 +144,11 @@ public class BizEnum {
         /**
          * 销售退库单
          */
-        SALE_RETURN_ORDER("SaleReturnOrder", "com.ruoyi.ams.bionutrition.doc.dto.detail.SaleReturnOrderDetailsDTO");
+        SALE_RETURN_ORDER("SaleReturnOrder", "com.ruoyi.ams.bionutrition.doc.dto.detail.SaleReturnOrderDetailsDTO"),
+        /**
+         * 采购单
+         */
+        PURCHASE_ORDER("PurchaseOrder","com.ruoyi.ams.bionutrition.doc.dto.detail.PurchaseOrderDetailsDTO");
 
         private String docType;