收货列表查询金额;
This commit is contained in:
+12
-1
@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
|
|||||||
import cn.hutool.json.JSONUtil;
|
import cn.hutool.json.JSONUtil;
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.alibaba.fastjson2.JSONObject;
|
import com.alibaba.fastjson2.JSONObject;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.mhd.common.core.constant.SnowFlakeConstants;
|
import com.mhd.common.core.constant.SnowFlakeConstants;
|
||||||
import com.mhd.common.core.domain.po.UserPo;
|
import com.mhd.common.core.domain.po.UserPo;
|
||||||
import com.mhd.common.core.enums.DictCode;
|
import com.mhd.common.core.enums.DictCode;
|
||||||
@@ -36,6 +37,8 @@ import com.mhd.wms.domain.materialMoreDetail.service.MaterialMoreDetailDomainSer
|
|||||||
import com.mhd.wms.domain.receiptMaterialDetail.repository.po.ReceiptMaterialDetailPO;
|
import com.mhd.wms.domain.receiptMaterialDetail.repository.po.ReceiptMaterialDetailPO;
|
||||||
import com.mhd.wms.domain.receiptMaterialDetail.repository.todo.ReceiptMaterialDetailDO;
|
import com.mhd.wms.domain.receiptMaterialDetail.repository.todo.ReceiptMaterialDetailDO;
|
||||||
import com.mhd.wms.domain.receiptMaterialDetail.service.ReceiptMaterialDetailDomainService;
|
import com.mhd.wms.domain.receiptMaterialDetail.service.ReceiptMaterialDetailDomainService;
|
||||||
|
import com.mhd.wms.domain.receiptOrderAccount.entity.ReceiptOrderAccount;
|
||||||
|
import com.mhd.wms.domain.receiptOrderAccount.repository.facade.IReceiptOrderAccountService;
|
||||||
import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
|
import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
|
||||||
import com.mhd.wms.domain.stockReceiptOrder.repository.po.StockReceiptOrderPO;
|
import com.mhd.wms.domain.stockReceiptOrder.repository.po.StockReceiptOrderPO;
|
||||||
import com.mhd.wms.domain.stockReceiptOrder.repository.todo.NoReceiptOrderDO;
|
import com.mhd.wms.domain.stockReceiptOrder.repository.todo.NoReceiptOrderDO;
|
||||||
@@ -91,6 +94,8 @@ public class StockReceiptOrderApplicationService {
|
|||||||
private UserServiceFeign userServiceFeign;
|
private UserServiceFeign userServiceFeign;
|
||||||
@Autowired
|
@Autowired
|
||||||
private IdGenerator idGenerator;
|
private IdGenerator idGenerator;
|
||||||
|
@Autowired
|
||||||
|
private IReceiptOrderAccountService receiptOrderAccountService;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -159,7 +164,13 @@ public class StockReceiptOrderApplicationService {
|
|||||||
log.warn("获取用户关联仓库信息失败,将查询所有仓库数据,用户ID:{},错误:{}", loginUser.getUserid(), e.getMessage());
|
log.warn("获取用户关联仓库信息失败,将查询所有仓库数据,用户ID:{},错误:{}", loginUser.getUserid(), e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return stockReceiptOrderDomainService.queryList(stockReceiptOrderDO);
|
List<StockReceiptOrderPO> stockReceiptOrderPOS = stockReceiptOrderDomainService.queryList(stockReceiptOrderDO);
|
||||||
|
for (StockReceiptOrderPO stockReceiptOrderPO : stockReceiptOrderPOS) {
|
||||||
|
Long receiptOrderId = stockReceiptOrderPO.getReceiptOrderId();
|
||||||
|
List<ReceiptOrderAccount> accounts = receiptOrderAccountService.list(new LambdaQueryWrapper<ReceiptOrderAccount>().eq(ReceiptOrderAccount::getOrderId, receiptOrderId));
|
||||||
|
stockReceiptOrderPO.setReceiptOrderAccountList(accounts);
|
||||||
|
}
|
||||||
|
return stockReceiptOrderPOS;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+4
-1
@@ -3,6 +3,7 @@ package com.mhd.wms.domain.stockReceiptOrder.repository.po;
|
|||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.mhd.common.core.annotation.Excel;
|
import com.mhd.common.core.annotation.Excel;
|
||||||
import com.mhd.wms.domain.receiptMaterialDetail.repository.po.ReceiptMaterialDetailPO;
|
import com.mhd.wms.domain.receiptMaterialDetail.repository.po.ReceiptMaterialDetailPO;
|
||||||
|
import com.mhd.wms.domain.receiptOrderAccount.entity.ReceiptOrderAccount;
|
||||||
import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderBasePO;
|
import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderBasePO;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
@@ -156,4 +157,6 @@ public class StockReceiptOrderPO extends StockInOrderBasePO {
|
|||||||
@ApiModelProperty("总面积(SQM)")
|
@ApiModelProperty("总面积(SQM)")
|
||||||
@Excel(name = "总面积(SQM)")
|
@Excel(name = "总面积(SQM)")
|
||||||
private BigDecimal totalArea;
|
private BigDecimal totalArea;
|
||||||
}
|
@ApiModelProperty("费用")
|
||||||
|
List<ReceiptOrderAccount> receiptOrderAccountList;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user