问题处理

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

@@ -101,8 +101,7 @@ public class ExtQuotationProductServiceImpl extends ServiceImpl<ExtQuotationProd
         List<Long> pIds = records.stream().map(ExtQuotationProduct::getId).collect(Collectors.toList());
 
         //获取BOM信息
-        List<ExtQuotationProductBom> bomList = extQuotationProductBomService.list(q -> q.in(ExtQuotationProductBom::getQuotationProductId, pIds));
-        List<ExtQuotationProductBomVo> extQuotationProductBomVos = BeanUtil.copyToList(bomList, ExtQuotationProductBomVo.class);
+        List<ExtQuotationProductBomVo> extQuotationProductBomVos = extQuotationProductBomService.getList(IWrapper.getWrapper().in(ExtQuotationProductBom::getQuotationProductId, pIds));
         productInfoService.attributeAssign(extQuotationProductBomVos, ExtQuotationProductBom::getMaterialId, (item, product) -> {
             item.setProductCode(product.getCustomCode());
             item.setProductName(product.getName());

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

@@ -23,9 +23,11 @@ import com.fjhx.sale.entity.ext.vo.ExtQuotationProductBomVo;
 import com.fjhx.sale.entity.ext.vo.ExtQuotationProductCustomInfoVo;
 import com.fjhx.sale.entity.ext.vo.ExtQuotationProductVo;
 import com.fjhx.sale.entity.ext.vo.ExtQuotationVo;
+import com.fjhx.sale.entity.quotation.po.QuotationProduct;
 import com.fjhx.sale.entity.sale.po.SaleQuotation;
 import com.fjhx.sale.mapper.ext.ExtQuotationMapper;
 import com.fjhx.sale.service.ext.*;
+import com.fjhx.sale.service.quotation.QuotationProductService;
 import com.fjhx.sale.service.sale.SaleQuotationService;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -74,6 +76,8 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
     private ISysUserService sysUserService;
     @Autowired
     private ExtQuotationProductCustomInfoService quotationProductCustomInfoService;
+    @Autowired
+    private QuotationProductService quotationProductService;
 
     @Override
     public Page<ExtQuotationVo> getPage(ExtQuotationSelectDto dto) {
@@ -241,6 +245,23 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
                 .eq(SaleQuotation::getId, saleQuotationId)
                 .set(SaleQuotation::getExtQuotationId, saleQuotationDto.getId())
         );
+
+        //赋值对内报价单总价以及单价
+        saleQuotationService.update(q -> q
+                .eq(SaleQuotation::getId, saleQuotationDto.getSaleQuotationId())
+                .set(SaleQuotation::getAmount, saleQuotationDto.getAmount())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+                .set(BasePo::getUpdateTime, new Date())
+        );
+        //赋值对内报价单产品单价
+        for (ExtQuotationProductDto extQuotationProductDto : quotationProductList) {
+            quotationProductService.update(q -> q
+                    .eq(QuotationProduct::getId, extQuotationProductDto.getQuotationProductId())
+                    .set(QuotationProduct::getPrice, extQuotationProductDto.getPrice())
+                    .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+                    .set(BasePo::getUpdateTime, new Date())
+            );
+        }
     }
 
     @Override