添加产品单位字段

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/vo/QuotationProductVo.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class QuotationProductVo extends QuotationProduct {
 
+    /**
+     * 产品单位
+     */
+    private String productUnit;
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/sale/vo/SaleQuotationVo.java

@@ -1,7 +1,7 @@
 package com.fjhx.sale.entity.sale.vo;
 
 import com.fjhx.sale.entity.quotation.po.QuotationPay;
-import com.fjhx.sale.entity.quotation.po.QuotationProduct;
+import com.fjhx.sale.entity.quotation.vo.QuotationProductVo;
 import com.fjhx.sale.entity.sale.po.SaleQuotation;
 import lombok.Getter;
 import lombok.Setter;
@@ -32,7 +32,7 @@ public class SaleQuotationVo extends SaleQuotation {
     /**
      * 商品-报价单关联表信息
      */
-    private List<QuotationProduct> quotationProductList;
+    private List<QuotationProductVo> quotationProductList;
 
     /**
      *报价 -收费项目表

hx-sale/src/main/java/com/fjhx/sale/service/sale/impl/SaleQuotationServiceImpl.java

@@ -19,9 +19,11 @@ import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.entity.customer.vo.CustomerVo;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.flow.service.flow.FlowExampleService;
+import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.sale.entity.contract.vo.ContractVo;
 import com.fjhx.sale.entity.quotation.po.QuotationPay;
 import com.fjhx.sale.entity.quotation.po.QuotationProduct;
+import com.fjhx.sale.entity.quotation.vo.QuotationProductVo;
 import com.fjhx.sale.entity.sale.dto.SaleQuotationDto;
 import com.fjhx.sale.entity.sale.dto.SaleQuotationSelectDto;
 import com.fjhx.sale.entity.sale.po.SaleQuotation;
@@ -78,6 +80,8 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
 
     @Autowired
     private CorporationService corporationService;
+    @Autowired
+    private ProductInfoService productInfoService;
 
     /**
      * 报价表分页
@@ -135,7 +139,12 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
             //查询报价-商品表的详情
             List<QuotationProduct> quotationProductList = quotationProductService.list(Wrappers.<QuotationProduct>lambdaQuery()
                     .eq(QuotationProduct::getSaleQuotationId, result.getId()));
-            result.setQuotationProductList(quotationProductList);
+            List<QuotationProductVo> quotationProductVos = BeanUtil.copyToList(quotationProductList, QuotationProductVo.class);
+            //赋值产品信息
+            productInfoService.attributeAssign(quotationProductVos, QuotationProductVo::getProductId, (item, productInfo) -> {
+                item.setProductUnit(productInfo.getUnit());
+            });
+            result.setQuotationProductList(quotationProductVos);
 
             //查询报价-收费项目表的详情
             List<QuotationPay> quotationPayList = quotationPayService.list(Wrappers.<QuotationPay>lambdaQuery()