Browse Source

[fix] 采购管理

按照万材要求:采购订单导出详情页面的数据+单号+单据创建时间
dev
liuxiaoxu 2 months ago
parent
commit
e8276adccb
  1. 30
      ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/Vo/ExportPurchaseOrderVo.java
  2. 7
      ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java

30
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;

7
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());

Loading…
Cancel
Save