报价：业务员报价-买断料预计损耗接收前端的值

@@ -69,7 +69,8 @@ public class SalesmanQuotationLineServiceImpl
         data.setQuantity(vo.getQuantity());
         data.setPurchasePrice(vo.getPurchasePrice());
         data.setApplicationAttrition(vo.getApplicationAttrition());
-        data.setItemId(StringUtils.defaultIfBlank(vo.getItemId(), IdUtil.getId()));
+        data.setEstimatedLoss(vo.getEstimatedLoss());
+        data.setItemId(vo.getItemId());
 
         getBaseMapper().insert(data);
 
@@ -99,6 +100,7 @@ public class SalesmanQuotationLineServiceImpl
                 .set(SalesmanQuotationLine::getQuantity, vo.getQuantity())
                 .set(SalesmanQuotationLine::getPurchasePrice, vo.getPurchasePrice())
                 .set(SalesmanQuotationLine::getApplicationAttrition, vo.getApplicationAttrition())
+                .set(SalesmanQuotationLine::getEstimatedLoss, vo.getEstimatedLoss())
                 .set(SalesmanQuotationLine::getItemId, StringUtils.defaultIfBlank(vo.getItemId(), data.getItemId()))
                 .eq(SalesmanQuotationLine::getId, vo.getId());
 

@@ -362,13 +362,10 @@ public class SalesmanQuotationServiceImpl
             createLineVo.setQuantity(lineVo.getQuantity());
             createLineVo.setPurchasePrice(lineVo.getPurchasePrice());
             createLineVo.setApplicationAttrition(lineVo.getApplicationAttrition());
+            createLineVo.setEstimatedLoss(lineVo.getEstimatedLoss());
             createLineVo.setItemId(lineVo.getItemId());
-            String lineId = salesmanQuotationLineService.create(createLineVo);
 
-            BreedRelationship breedRelationship = breedMap.get(lineVo.getProductId());
-            BigDecimal estimatedLoss = calculateEstimatedLoss(lineVo.getPurchasePrice(),
-                    lineVo.getApplicationAttrition(), breedRelationship.getAttritionRate(), priced);
-            updateLineEstimatedLoss(lineId, estimatedLoss);
+            salesmanQuotationLineService.create(createLineVo);
         }
     }
 
@@ -391,10 +388,6 @@ public class SalesmanQuotationServiceImpl
 
         List<String> existIdList = new ArrayList<>();
         for (UpdateSalesmanQuotationLineVo lineVo : lineList) {
-            BreedRelationship breedRelationship = breedMap.get(lineVo.getProductId());
-            BigDecimal estimatedLoss = calculateEstimatedLoss(lineVo.getPurchasePrice(),
-                    lineVo.getApplicationAttrition(), breedRelationship.getAttritionRate(), priced);
-
             if (StringUtils.isNotBlank(lineVo.getId())) {
                 SalesmanQuotationLine oldLine = oldLineMap.get(lineVo.getId());
                 if (oldLine == null) {
@@ -407,7 +400,6 @@ public class SalesmanQuotationServiceImpl
                     lineVo.setItemId(oldLine.getItemId());
                 }
                 salesmanQuotationLineService.update(lineVo);
-                updateLineEstimatedLoss(lineVo.getId(), estimatedLoss);
             } else {
                 CreateSalesmanQuotationLineVo createLineVo = new CreateSalesmanQuotationLineVo();
                 createLineVo.setQuotationId(quotationId);
@@ -416,9 +408,10 @@ public class SalesmanQuotationServiceImpl
                 createLineVo.setQuantity(lineVo.getQuantity());
                 createLineVo.setPurchasePrice(lineVo.getPurchasePrice());
                 createLineVo.setApplicationAttrition(lineVo.getApplicationAttrition());
-                createLineVo.setItemId(StringUtils.defaultIfBlank(lineVo.getItemId(), IdUtil.getId()));
+                createLineVo.setEstimatedLoss(lineVo.getEstimatedLoss());
+                createLineVo.setItemId(lineVo.getItemId());
                 String lineId = salesmanQuotationLineService.create(createLineVo);
-                updateLineEstimatedLoss(lineId, estimatedLoss);
+
                 existIdList.add(lineId);
             }
         }
@@ -434,19 +427,6 @@ public class SalesmanQuotationServiceImpl
     }
 
     /**
-     * 更新预计损耗
-     *
-     * @param lineId 明细ID
-     * @param estimatedLoss 预计损耗
-     */
-    private void updateLineEstimatedLoss(String lineId, BigDecimal estimatedLoss) {
-        SalesmanQuotationLine updateLine = new SalesmanQuotationLine();
-        updateLine.setId(lineId);
-        updateLine.setEstimatedLoss(estimatedLoss);
-        salesmanQuotationLineService.updateById(updateLine);
-    }
-
-    /**
      * 计算数量合计
      *
      * @param lineList 明细列表
@@ -461,30 +441,6 @@ public class SalesmanQuotationServiceImpl
     }
 
     /**
-     * 计算预计损耗
-     *
-     * @param purchasePrice 采购价
-     * @param applicationAttrition 申请损耗
-     * @param fixedAttrition 固定损耗率
-     * @param priced 是否为点价
-     * @return 预计损耗
-     */
-    private BigDecimal calculateEstimatedLoss(BigDecimal purchasePrice, BigDecimal applicationAttrition,
-                                              BigDecimal fixedAttrition, Boolean priced) {
-        if (!Boolean.TRUE.equals(priced) || purchasePrice == null) {
-            return null;
-        }
-
-        BigDecimal useRate = applicationAttrition != null ? applicationAttrition : fixedAttrition;
-        if (useRate == null) {
-            return null;
-        }
-
-        return purchasePrice.multiply(useRate)
-                .divide(new BigDecimal("100"), 10, RoundingMode.HALF_UP);
-    }
-
-    /**
      * 查询必填品种映射
      *
      * @param productIds 品种ID集合

@@ -61,6 +61,13 @@ public class CreateSalesmanQuotationLineVo implements BaseVo, Serializable {
     private BigDecimal applicationAttrition;
 
     /**
+     * 买断料预计损耗
+     */
+    @ApiModelProperty("买断料预计损耗")
+    @Digits(integer = 8, fraction = 10, message = "买断料预计损耗最多支持8位整数和10位小数！")
+    private BigDecimal estimatedLoss;
+
+    /**
      * 前端行标识
      */
     @ApiModelProperty("前端行标识")