|
@@ -1,10 +1,14 @@
|
|
|
package com.fjhx.purchase.service.purchase.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fjhx.common.constant.SourceConstant;
|
|
|
+import com.fjhx.common.utils.Assert;
|
|
|
+import com.fjhx.item.entity.product.po.ProductInfo;
|
|
|
+import com.fjhx.item.service.product.ProductInfoService;
|
|
|
import com.fjhx.purchase.entity.purchase.dto.PurchaseDetailDto;
|
|
|
import com.fjhx.purchase.entity.purchase.dto.PurchaseDetailSelectDto;
|
|
|
import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
|
|
@@ -12,6 +16,7 @@ import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
|
|
|
import com.fjhx.purchase.mapper.purchase.PurchaseDetailMapper;
|
|
|
import com.fjhx.purchase.service.purchase.PurchaseDetailService;
|
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.List;
|
|
@@ -29,6 +34,9 @@ import java.util.List;
|
|
|
@Service
|
|
|
public class PurchaseDetailServiceImpl extends ServiceImpl<PurchaseDetailMapper, PurchaseDetail> implements PurchaseDetailService {
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ProductInfoService productInfoService;
|
|
|
+
|
|
|
@Override
|
|
|
public Page<PurchaseDetailVo> getPage(PurchaseDetailSelectDto dto) {
|
|
|
IWrapper<PurchaseDetail> wrapper = getWrapper();
|
|
@@ -40,7 +48,15 @@ public class PurchaseDetailServiceImpl extends ServiceImpl<PurchaseDetailMapper,
|
|
|
@Override
|
|
|
public PurchaseDetailVo detail(Long id) {
|
|
|
PurchaseDetail PurchaseDetail = this.getById(id);
|
|
|
+ Assert.notEmpty(PurchaseDetail,"查询不到采购明细信息!");
|
|
|
PurchaseDetailVo result = BeanUtil.toBean(PurchaseDetail, PurchaseDetailVo.class);
|
|
|
+ //赋值产品信息
|
|
|
+ ProductInfo productInfo = productInfoService.getById(result.getBussinessId());
|
|
|
+ if(ObjectUtil.isNotEmpty(productInfo)){
|
|
|
+ result.setProductName(productInfo.getName());
|
|
|
+ result.setProductSpec(productInfo.getSpec());
|
|
|
+ result.setProductUnit(productInfo.getUnit());
|
|
|
+ }
|
|
|
return result;
|
|
|
}
|
|
|
|