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 @@
+
@@ -51,11 +52,9 @@
- 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
-
-
@@ -203,6 +204,7 @@
use_site_code,
trans_line_code,
fee_type,
+ currency,
prod_code,
rec_pay_type,
bill_type,
@@ -247,6 +249,7 @@
#{useSiteCode},
#{transLineCode},
#{feeType},
+ #{currency},
#{prodCode},
#{recPayType},
#{billType},
@@ -286,7 +289,6 @@
update emis_quote_price
- quote_code = #{quoteCode},
quote_name = #{quoteName},
quote_type = #{quoteType},
customer_code = #{customerCode},
@@ -294,6 +296,7 @@
use_site_code = #{useSiteCode},
trans_line_code = #{transLineCode},
fee_type = #{feeType},
+ currency = #{currency},
prod_code = #{prodCode},
rec_pay_type = #{recPayType},
bill_type = #{billType},
@@ -321,22 +324,19 @@
remark = #{remark},
tenant_id = #{tenantId},
del_flag = #{delFlag},
- create_by = #{createBy},
- create_time = #{createTime},
update_by = #{updateBy},
update_time = #{updateTime},
- create_site = #{createSite},
update_site = #{updateSite},
where quote_id = #{quoteId}
- delete from emis_quote_price where quote_id = #{quoteId}
+ update emis_quote_price set del_flag='1' where quote_id = #{quoteId}
- delete from emis_quote_price where quote_id in
+ update emis_quote_price set del_flag='1' where quote_id in
#{quoteId}