20250509

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

@@ -101,6 +101,10 @@ public class Quote extends QueryPage {
 
     private String chipPrice;
 
+    private String quoteType;
+
+    private String deltaFlag;
+
     /**
      * ------------------(额外字段)----------------------
      */

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

@@ -162,6 +162,8 @@ public class QuoteDetail {
 
     private String costModel;
 
+    private BigDecimal delta;
+
     @TableField(exist = false)
     private Integer engChgLevel;
 
@@ -234,6 +236,13 @@ public class QuoteDetail {
     @TableField(exist = false)
     private BigDecimal totalCostUSD;
 
+    @TableField(exist = false)
+    private String quoteType;
+    @TableField(exist = false)
+    private String deltaFlag;
+    @TableField(exist = false)
+    private BigDecimal deltaValue;
+
     @TableField(exist = false)
     private List<PropertyModelDetail> list;
 }

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

@@ -162,6 +162,8 @@ public class QuoteGroupDetail {
 
     private String costModel;// 2020/UFIDA
 
+    private BigDecimal delta;
+
     @TableField(exist = false)
     private Integer engChgLevel;
 
@@ -230,6 +232,8 @@ public class QuoteGroupDetail {
     private Integer decimalPlace;
     @TableField(exist = false)
     private BigDecimal totalCostUSD;
+    @TableField(exist = false)
+    private BigDecimal deltaValue;
 
     @TableField(exist = false)
     private List<PropertyModelDetail> list;

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

@@ -74,6 +74,7 @@
                qd.type,
                qd.quote_group_detail_id,
                qd.cost_model,
+               qd.delta,
                CASE
                    WHEN ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR
                          (qd.currency2 = 'USD' AND qd.exchange_rate2 > 0))
@@ -85,6 +86,19 @@
                             END)
                    ELSE NULL
                    END AS totalCostUSD,
+               CASE
+                   when ((isnull(qd.quote_profit_rate, 0) - isnull(qd.delta, 0)) = 0)
+                       then 0
+                   WHEN ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR
+                         (qd.currency2 = 'USD' AND qd.exchange_rate2 > 0))
+                       THEN
+                       (qd.total_cost /
+                        CASE
+                            WHEN qd.currency1 = 'USD' THEN qd.exchange_rate1
+                            ELSE qd.exchange_rate2
+                            END) * ((qd.quote_profit_rate - qd.delta) / 100)
+                   ELSE NULL
+                   END AS deltaValue,
                CASE
                    WHEN qd.qty >= 250000 AND
                         ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR
@@ -213,6 +227,7 @@
                qd.type,
                qd.quote_group_detail_id,
                qd.cost_model,
+               qd.delta,
                CASE
                    WHEN qd.qty >= 250000 AND
                         ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR
@@ -226,6 +241,19 @@
                             END) * qd.quote_profit_rate / 100
                    ELSE NULL
                    END AS weighted,
+               CASE
+                   when ((isnull(qd.quote_profit_rate, 0) - isnull(qd.delta, 0)) = 0)
+                       then 0
+                   WHEN ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR
+                         (qd.currency2 = 'USD' AND qd.exchange_rate2 > 0))
+                       THEN
+                       (qd.total_cost /
+                        CASE
+                            WHEN qd.currency1 = 'USD' THEN qd.exchange_rate1
+                            ELSE qd.exchange_rate2
+                            END) * ((qd.quote_profit_rate - qd.delta) / 100)
+                   ELSE NULL
+                   END AS deltaValue,
                CASE
                    WHEN qd.qty >= 5000000 AND
                         ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR
@@ -393,6 +421,8 @@
                qd.update_date,
                qd.remark,
                q.remark                                      as quoteRemark,
+               q.quote_type,
+               q.delta_flag,
                qd.internal_inquiry_no,
                rh.required_completion_date,
                rh.request_date,
@@ -572,6 +602,19 @@
                             END)
                    ELSE NULL
                    END AS totalCostUSD,
+               CASE
+                   when ((isnull(qd.quote_profit_rate,0) - isnull(qd.delta,0)) = 0)
+                       then 0
+                   WHEN ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR
+                         (qd.currency2 = 'USD' AND qd.exchange_rate2 > 0))
+                       THEN
+                       (qd.total_cost /
+                        CASE
+                            WHEN qd.currency1 = 'USD' THEN qd.exchange_rate1
+                            ELSE qd.exchange_rate2
+                            END) * ((qd.quote_profit_rate - qd.delta) / 100)
+                   ELSE NULL
+                   END AS deltaValue,
                CASE
                    WHEN qd.qty >= 250000 AND
                         ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR

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

@@ -74,6 +74,7 @@
                qd.type,
                qd.current_quote_detail_item_no,
                qd.cost_model,
+               qd.delta,
                CASE
                    WHEN ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR
                          (qd.currency2 = 'USD' AND qd.exchange_rate2 > 0))
@@ -85,6 +86,19 @@
                             END)
                    ELSE NULL
                    END AS totalCostUSD,
+               CASE
+                   when ((isnull(qd.quote_profit_rate, 0) - isnull(qd.delta, 0)) = 0)
+                       then 0
+                   WHEN ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR
+                         (qd.currency2 = 'USD' AND qd.exchange_rate2 > 0))
+                       THEN
+                       (qd.total_cost /
+                        CASE
+                            WHEN qd.currency1 = 'USD' THEN qd.exchange_rate1
+                            ELSE qd.exchange_rate2
+                            END) * ((qd.quote_profit_rate - qd.delta) / 100)
+                   ELSE NULL
+                   END AS deltaValue,
                CASE
                    WHEN qd.qty >= 250000 AND
                         ((qd.currency1 = 'USD' AND qd.exchange_rate1 > 0) OR

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

@@ -36,6 +36,8 @@
                q.cost_model,
                q.markup,
                q.chip_price,
+               q.quote_type,
+               q.delta_flag,
                dbo.plm_get_user_display(q.site, q.quoter)   as quoterName,
                dbo.plm_get_user_display(q.site, q.purchase) as purchaseName
         from plm_quote q
@@ -135,6 +137,8 @@
                q.cost_model,
                q.markup,
                q.chip_price,
+               q.quote_type,
+               q.delta_flag,
                dbo.plm_get_user_display(q.site, q.quoter)   as quoterName,
                dbo.plm_get_user_display(q.site, q.purchase) as purchaseName
         from plm_quote q