20241113

src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetail.java

@@ -72,7 +72,7 @@ public class QuoteDetail {
 
     private BigDecimal totalCost;
 
-    private Integer profitRate;
+    private BigDecimal profitRate;
 
     private BigDecimal profitAmount;
 
@@ -80,7 +80,7 @@ public class QuoteDetail {
 
     private BigDecimal unitPrice;
 
-    private Integer taxRate;
+    private BigDecimal taxRate;
 
     private BigDecimal taxTotalPrice;
 
@@ -122,6 +122,22 @@ public class QuoteDetail {
 
     private BigDecimal adjustQuoteCost;
 
+    private BigDecimal quoteTotalCost;
+
+    private BigDecimal quoteProfitRate;
+
+    private BigDecimal quoteProfitAmount;
+
+    private BigDecimal quoteTotalPrice;
+
+    private BigDecimal quoteUnitPrice;
+
+    private BigDecimal quoteTaxRate;
+
+    private BigDecimal quoteTaxTotalPrice;
+
+    private BigDecimal quoteTaxUnitPrice;
+
     @TableField(exist = false)
     private Integer engChgLevel;
 

src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java

@@ -246,7 +246,7 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
             detail.setCreateBy(quote.getCreateBy());
             detail.setCreateDate(quote.getCreateDate());
 
-            detail.setTaxRate(13);
+            detail.setTaxRate(BigDecimal.ZERO); // 税率
             detail.setPartCost(BigDecimal.ZERO);
             detail.setAdjustPartCost(BigDecimal.ZERO);
             detail.setLabourCost(BigDecimal.ZERO);
@@ -260,7 +260,7 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
             detail.setOtherCost(BigDecimal.ZERO);
             detail.setMachineCost(BigDecimal.ZERO);
             detail.setTotalPrice(BigDecimal.ZERO);
-            detail.setProfitRate(0);
+            detail.setProfitRate(BigDecimal.ZERO); // 利润率
             detail.setProfitAmount(BigDecimal.ZERO);
             detail.setTotalPrice(BigDecimal.ZERO);
             detail.setUnitPrice(BigDecimal.ZERO);
@@ -269,6 +269,19 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
 
             detail.setPackCost(BigDecimal.ZERO);
             detail.setShippingCost(BigDecimal.ZERO);
+
+            detail.setQuoteTotalCost(BigDecimal.ZERO);
+            detail.setQuoteProfitRate(BigDecimal.ZERO);
+            detail.setQuoteProfitAmount(BigDecimal.ZERO);
+
+
+            detail.setQuoteTotalPrice(BigDecimal.ZERO);
+            detail.setQuoteUnitPrice(BigDecimal.ZERO);
+            detail.setQuoteTaxRate(BigDecimal.ZERO);
+            detail.setQuoteTaxTotalPrice(BigDecimal.ZERO);
+            detail.setQuoteTaxUnitPrice(BigDecimal.ZERO);
+
+
             quoteDetailService.saveQuoteDetail(detail);
 
             ids.add(quote.getId());

src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml

@@ -174,7 +174,7 @@
     <select id="queryYieldRate" resultType="java.math.BigDecimal">
         select d.yield_rate from plm_quote_detail_bom_tree t
                           left join part p on t.part_no = p.part_no and p.site = t.site
-                          left join part_product_group d on p.site = d.site and p.product_group_id2 = d.product_group_id
+                          left join part_product_group d on p.site = d.site and p.product_group_id2 = d.product_group_id and d.type = 2
         where t.site = #{site} and quote_id = #{quoteId} and quote_detail_id = #{quoteDetailId} and t.part_no = #{partNo}
     </select>
 </mapper>

src/main/resources/mapper/quote/QuoteDetailMapper.xml

@@ -53,7 +53,15 @@
                qd.child_attrition_rate,
                qd.adjust_bom_un_yield,
                qd.quote_cost,
-               qd.adjust_quote_cost
+               qd.adjust_quote_cost,
+               qd.quote_total_cost,
+               qd.quote_profit_rate,
+               qd.quote_profit_amount,
+               qd.quote_total_price,
+               qd.quote_unit_price,
+               qd.quote_tax_rate,
+               qd.quote_tax_total_price,
+               qd.quote_tax_unit_price
         from plm_quote_detail qd
                  left join part pp on qd.part_id = pp.id
         <where>
@@ -130,7 +138,15 @@
                qd.child_attrition_rate,
                qd.adjust_bom_un_yield,
                qd.quote_cost,
-               qd.adjust_quote_cost
+               qd.adjust_quote_cost,
+               qd.quote_total_cost,
+               qd.quote_profit_rate,
+               qd.quote_profit_amount,
+               qd.quote_total_price,
+               qd.quote_unit_price,
+               qd.quote_tax_rate,
+               qd.quote_tax_total_price,
+               qd.quote_tax_unit_price
         from plm_quote_detail qd
                  left join plm_project_part pp on qd.part_id = pp.id
         <where>