diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/Vo/ExportPurchaseOrderVo.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/Vo/ExportPurchaseOrderVo.java index fb1a86a5..7666e23a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/Vo/ExportPurchaseOrderVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/Vo/ExportPurchaseOrderVo.java @@ -17,6 +17,14 @@ public class ExportPurchaseOrderVo{ @Excel(name = "采购订购单号") private String purchaseOrderCode; + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd") + private Date createTime; + + + /** 采购计划单号*/ + @Excel(name = "采购计划单号") + private String purchasePlanCode; + /** 供应商ID */ @Excel(name = "供应商ID") private String supplierCode; @@ -25,6 +33,28 @@ public class ExportPurchaseOrderVo{ @Excel(name = "供应商名称") private String supplierName; + + /** 仓库ID */ + @Excel(name = "仓库ID") + private String stockNo; + + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String stockName; + + /** 收货人 */ + @Excel(name = "收货人") + private String receivePerson; + + /** 收货电话 */ + @Excel(name = "收货电话") + private String receivePersonPhone; + + /** 收货地址 */ + @Excel(name = "收货地址") + private String receiveAddress; + + /** 不含税总价(RMB) */ @Excel(name = "不含税总价(RMB)") private BigDecimal noRmbSum; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java index df8b9041..25c9a6b9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java @@ -309,6 +309,13 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService for (PurchaseOrderChild child : children) { ExportPurchaseOrderVo exportPurchaseOrderVo = new ExportPurchaseOrderVo(); exportPurchaseOrderVo.setPurchaseOrderCode(purchaseOrder.getPurchaseOrderCode()); + exportPurchaseOrderVo.setCreateTime(purchaseOrder.getCreateTime()); + exportPurchaseOrderVo.setPurchasePlanCode(purchaseOrder.getPurchasePlanCode()); + exportPurchaseOrderVo.setStockNo(purchaseOrder.getStockNo()); + exportPurchaseOrderVo.setStockName(purchaseOrder.getStockName()); + exportPurchaseOrderVo.setReceivePerson(purchaseOrder.getReceivePerson()); + exportPurchaseOrderVo.setReceivePersonPhone(purchaseOrder.getReceivePersonPhone()); + exportPurchaseOrderVo.setReceiveAddress(purchaseOrder.getReceiveAddress()); exportPurchaseOrderVo.setSupplierName(purchaseOrder.getSupplierName()); exportPurchaseOrderVo.setSupplierCode(purchaseOrder.getSupplierCode()); exportPurchaseOrderVo.setNoRmbSum(purchaseOrder.getNoRmbSum());