20241115

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

@@ -138,6 +138,14 @@ public class QuoteDetail {
 
     private BigDecimal quoteTaxUnitPrice;
 
+    private String currency1;// 币种1
+
+    private BigDecimal exchangeRate1;// 兑换率1
+
+    private String currency2; // 币种2
+
+    private BigDecimal exchangeRate2;// 兑换率2
+
     @TableField(exist = false)
     private Integer engChgLevel;
 

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

@@ -343,8 +343,8 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
             for (QuoteDetailBom bom : bomList) {
                 // 获取半成品 价格
                 if (Objects.nonNull(root) && root.getPartNo().equals(bom.getComponentPart())) {
-                    BigDecimal bomYield = root.getBomYield();
-                    BigDecimal bomActualYield = root.getBomActualYield();
+                    BigDecimal bomYield = Objects.isNull(root.getBomYield())?BigDecimal.ONE:root.getBomYield();
+                    BigDecimal bomActualYield = Objects.isNull(root.getBomActualYield())?BigDecimal.ONE:root.getBomActualYield();
                     BigDecimal qtyPerAssembly = bom.getQtyPerAssembly();
                     bomUnYield = bomUnYield.add(qtyPerAssembly.multiply(bomYield));
                     bomActualUnYield = bomActualUnYield.add(qtyPerAssembly.multiply(bomActualYield));

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

@@ -61,7 +61,11 @@
                qd.quote_unit_price,
                qd.quote_tax_rate,
                qd.quote_tax_total_price,
-               qd.quote_tax_unit_price
+               qd.quote_tax_unit_price,
+               qd.currency1,
+               qd.exchange_rate1,
+               qd.currency2,
+               qd.exchange_rate2
         from plm_quote_detail qd
                  left join part pp on qd.part_id = pp.id
         <where>
@@ -146,7 +150,11 @@
                qd.quote_unit_price,
                qd.quote_tax_rate,
                qd.quote_tax_total_price,
-               qd.quote_tax_unit_price
+               qd.quote_tax_unit_price,
+               qd.currency1,
+               qd.exchange_rate1,
+               qd.currency2,
+               qd.exchange_rate2
         from plm_quote_detail qd
                  left join plm_project_part pp on qd.part_id = pp.id
         <where>