报价单功能修改

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -434,4 +434,9 @@ public class Contract extends BasePo {
      */
     private Long companyId;
 
+    /**
+     * 报价单
+     */
+    private Long quotationId;
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/ContractProduct.java

@@ -141,4 +141,9 @@ public class ContractProduct extends BasePo {
     @TableField(exist = false)
     private BigDecimal productHeight;
 
+    /**
+     * 报价单商品表id
+     */
+    private Long quotationProductId;
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/ext/po/ExtQuotationProductBom.java

@@ -56,7 +56,7 @@ public class ExtQuotationProductBom extends BasePo {
     private BigDecimal amount;
 
     /**
-     * 付款条件
+     * 备注
      */
     private String remark;
 

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/po/QuotationProductBom.java

@@ -61,7 +61,7 @@ public class QuotationProductBom extends BasePo {
     private BigDecimal amount;
 
     /**
-     * 付款条件
+     * 备注
      */
     private String remark;
 

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

@@ -321,20 +321,23 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
         });
 
         //获取配件列表
+        Map<Long, List<QuotationProductBomVo>> qpbMap = new HashMap<>();
         List<Long> ids = quotationProductVos.stream().map(QuotationProduct::getId).collect(Collectors.toList());
-        List<QuotationProductBom> list = quotationProductBomService.list(q -> q.in(QuotationProductBom::getQuotationProductId, ids));
-        List<QuotationProductBomVo> quotationProductBomVos = BeanUtil.copyToList(list, QuotationProductBomVo.class);
-        //赋值产品信息
-        productInfoService.attributeAssign(quotationProductBomVos, QuotationProductBom::getProductId, (item, productInfo) -> {
-            item.setProductCode(productInfo.getCustomCode());
-            item.setProductName(productInfo.getName());
-            item.setProductLength(productInfo.getLength());
-            item.setProductWidth(productInfo.getWidth());
-            item.setProductHeight(productInfo.getHeight());
-        });
-
-        Map<Long, List<QuotationProductBomVo>> qpbMap = quotationProductBomVos.stream().collect(Collectors.groupingBy(QuotationProductBom::getQuotationProductId));
-
+        if (ObjectUtil.isNotEmpty(ids)) {
+            List<QuotationProductBom> list = quotationProductBomService.list(q -> q.in(QuotationProductBom::getQuotationProductId, ids));
+
+            List<QuotationProductBomVo> quotationProductBomVos = BeanUtil.copyToList(list, QuotationProductBomVo.class);
+            //赋值产品信息
+            productInfoService.attributeAssign(quotationProductBomVos, QuotationProductBom::getProductId, (item, productInfo) -> {
+                item.setProductCode(productInfo.getCustomCode());
+                item.setProductName(productInfo.getName());
+                item.setProductLength(productInfo.getLength());
+                item.setProductWidth(productInfo.getWidth());
+                item.setProductHeight(productInfo.getHeight());
+            });
+
+            qpbMap = quotationProductBomVos.stream().collect(Collectors.groupingBy(QuotationProductBom::getQuotationProductId));
+        }
         for (QuotationProductVo quotationProductVo : quotationProductVos) {
             quotationProductVo.setQuotationProductBomList(qpbMap.get(quotationProductVo.getId()));
         }