From 4db56fd77aba32eb7f59b00d10edcc1615d8443b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 2 Jul 2024 10:40:16 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisQuotePrice.java       |  3 ++-
 .../resources/mapper/EmisQuotePriceMapper.xml | 20 +++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java
index f5988066b..d2e7f0d36 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java
@@ -35,7 +35,6 @@ public class EmisQuotePrice extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-
     /* 序号 */
     private Long quoteId;
     /* 报价编码 */
@@ -54,6 +53,8 @@ public class EmisQuotePrice extends BaseEntity
     private String transLineCode;
     /* 费用类型 运输费 */
     private String feeType;
+    /* 费用币种 */
+    private String currency;
     /* 产品类型代码 */
     private String prodCode;
     /* 录入收费项 */
diff --git a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
index 920b0ea82..bc5d40918 100644
--- a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
@@ -14,6 +14,7 @@
         <result property="useSiteCode"    column="use_site_code"    />
         <result property="transLineCode"    column="trans_line_code"    />
         <result property="feeType"    column="fee_type"    />
+        <result property="currency"    column="currency"    />
         <result property="prodCode"    column="prod_code"    />
         <result property="recPayType"    column="rec_pay_type"    />
         <result property="billType"    column="bill_type"    />
@@ -51,11 +52,9 @@
 
 
     <sql id="selectEmisQuotePriceVo">
-        select quote_id, quote_code, quote_name, quote_type, customer_code, cust_no, use_site_code, trans_line_code, fee_type, prod_code, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_name, disp_area_site, disp_area_site_code, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_code, send_area_site_id, carries_number, discards_number, least_price, price_type, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_price a
+        select quote_id, quote_code, quote_name, quote_type, customer_code, cust_no, use_site_code, trans_line_code, fee_type, currency, prod_code, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_name, disp_area_site, disp_area_site_code, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_code, send_area_site_id, carries_number, discards_number, least_price, price_type, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_price a
     </sql>
 
-<!--    and FIND_IN_SET(quote_type,#{quoteType})-->
-
 
     <select id="selectEmisQuotePriceList" parameterType="EmisQuotePrice" resultMap="EmisQuotePriceResult">
         <include refid="selectEmisQuotePriceVo"/>
@@ -78,6 +77,8 @@
             </if>
 
             <if test="feeType != null  and feeType != ''"> and fee_type=#{feeType}</if>
+            <if test="currency != null  and currency != ''"> and currency=#{currency}</if>
+
             <if test="prodCode != null  and prodCode != ''"> and  FIND_IN_SET(#{prodCode}, prod_code)</if>
             <if test="recPayType != null  and recPayType != ''"> and rec_pay_type=#{recPayType}</if>
             <if test="billType != null  and billType != ''"> and bill_type= #{billType}</if>
@@ -159,7 +160,7 @@
     </select>
 
     <select id="selectEmisQuotePriceByQuoteId" parameterType="Long" resultMap="EmisQuotePriceResult">
-        select quote_id, quote_code, quote_name, quote_type, customer_code, cust_no, use_site_code, trans_line_code, fee_type, prod_code, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_name, disp_area_site, disp_area_site_code, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_code, send_area_site_id, carries_number, discards_number, least_price, price_type, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select quote_id, quote_code, quote_name, quote_type, customer_code, cust_no, use_site_code, trans_line_code, fee_type, currency, prod_code, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_name, disp_area_site, disp_area_site_code, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_code, send_area_site_id, carries_number, discards_number, least_price, price_type, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_quote_price a
         where a.quote_id = #{quoteId}
     </select>
@@ -203,6 +204,7 @@
             <if test="useSiteCode != null and useSiteCode != ''">use_site_code,</if>
             <if test="transLineCode != null and transLineCode != ''">trans_line_code,</if>
             <if test="feeType != null and feeType != ''">fee_type,</if>
+            <if test="currency != null and currency != ''">currency,</if>
             <if test="prodCode != null and prodCode != ''">prod_code,</if>
             <if test="recPayType != null and recPayType != ''">rec_pay_type,</if>
             <if test="billType != null and billType != ''">bill_type,</if>
@@ -247,6 +249,7 @@
             <if test="useSiteCode != null and useSiteCode != ''">#{useSiteCode},</if>
             <if test="transLineCode != null and transLineCode != ''">#{transLineCode},</if>
             <if test="feeType != null and feeType != ''">#{feeType},</if>
+            <if test="currency != null and currency != ''">#{currency},</if>
             <if test="prodCode != null and prodCode != ''">#{prodCode},</if>
             <if test="recPayType != null and recPayType != ''">#{recPayType},</if>
             <if test="billType != null and billType != ''">#{billType},</if>
@@ -286,7 +289,6 @@
     <update id="updateEmisQuotePrice" parameterType="EmisQuotePrice">
         update emis_quote_price
         <trim prefix="SET" suffixOverrides=",">
-            <if test="quoteCode != null and quoteCode != ''">quote_code = #{quoteCode},</if>
             <if test="quoteName != null and quoteName != ''">quote_name = #{quoteName},</if>
             <if test="quoteType != null and quoteType != ''">quote_type = #{quoteType},</if>
             <if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
@@ -294,6 +296,7 @@
             <if test="useSiteCode != null and useSiteCode != ''">use_site_code = #{useSiteCode},</if>
             <if test="transLineCode != null and transLineCode != ''">trans_line_code = #{transLineCode},</if>
             <if test="feeType != null and feeType != ''">fee_type = #{feeType},</if>
+            <if test="currency != null and currency != ''">currency = #{currency},</if>
             <if test="prodCode != null and prodCode != ''">prod_code = #{prodCode},</if>
             <if test="recPayType != null and recPayType != ''">rec_pay_type = #{recPayType},</if>
             <if test="billType != null and billType != ''">bill_type = #{billType},</if>
@@ -321,22 +324,19 @@
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
-            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
             <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
         </trim>
         where quote_id = #{quoteId}
     </update>
 
     <delete id="deleteEmisQuotePriceByQuoteId" parameterType="Long">
-        delete from emis_quote_price where quote_id = #{quoteId}
+        update emis_quote_price set del_flag='1' where quote_id = #{quoteId}
     </delete>
 
     <delete id="deleteEmisQuotePriceByQuoteIds" parameterType="String">
-        delete from emis_quote_price where quote_id in
+        update emis_quote_price set del_flag='1' where quote_id in
         <foreach item="quoteId" collection="array" open="(" separator="," close=")">
             #{quoteId}
         </foreach>