diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostQuotePrice.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostQuotePrice.java
index 5bd1b6b35..39aa6edff 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostQuotePrice.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostQuotePrice.java
@@ -43,10 +43,24 @@ public class EmisTmsCostQuotePrice extends BaseEntity
private BigDecimal distance;
/* 费用类型 运输费 */
private String feeType;
+ /* 总费用 */
+ private BigDecimal fee;
/* 计费单价 */
private BigDecimal price;
/* 费用币种 */
private String currency;
+ /* 起始重量 */
+ private Double startWeight;
+ /* 结束重量 */
+ private Double endWeight;
+ /* 首重 */
+ private Double initialWeight;
+ /* 续重 */
+ private Double additionalWeight;
+ /* 条件表达式 */
+ private String conditionExpression;
+ /* 计算表达式 */
+ private String calculateExpression;
/* 计费类型 1-重量计费 2-体积计费 */
private String billType;
/* 供应商代码 */
@@ -57,6 +71,8 @@ public class EmisTmsCostQuotePrice extends BaseEntity
/* 结束日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
+ /* 启用状态 1-启用 0-停用 */
+ private String blOpen;
// 扩展字段 ------
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml
index 671196bc2..8283994a3 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml
@@ -100,6 +100,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.calc_fee_type = #{params.calcFeeType}
+
+
+ and exists (
+ select 1 from emis_waybill_batch_status ewbs where a.bill_code=ewbs.bill_code
+ )
+
+
+
+ and not exists (
+ select 1 from emis_waybill_batch_status ewbs where a.bill_code=ewbs.bill_code
+ )
+
+
+
+
+ and exists (
+ select 1 from emis_waybill_batch_status ewbs where a.bill_code=ewbs.bill_code
+ )
+
+
+
+ and not exists (
+ select 1 from emis_waybill_batch_status ewbs where a.bill_code=ewbs.bill_code
+ )
+
+
and a.send_date = ]]> #{params.beginSendDate}
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml
index 535eb0a54..e42f4e27a 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml
@@ -10,12 +10,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
+
+
+
+
@@ -32,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, start_site_code, next_site_code, distance, fee_type, price, currency, bill_type, supplier_code, start_date, end_date, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_quote_price
+ select id, start_site_code, next_site_code, distance, fee_type, fee, price, currency, start_weight, end_weight, initial_weight, additional_weight, condition_expression, calculate_expression, bill_type, supplier_code, start_date, end_date, bl_open, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_quote_price
+
-
+
insert into emis_tms_cost_quote_price
@@ -140,12 +159,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
next_site_code,
distance,
fee_type,
+ fee,
price,
currency,
+ start_weight,
+ end_weight,
+ initial_weight,
+ additional_weight,
+ condition_expression,
+ calculate_expression,
bill_type,
supplier_code,
start_date,
end_date,
+ bl_open,
remark,
tenant_id,
del_flag,
@@ -155,19 +182,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_time,
create_site,
update_site,
-
+
#{id},
#{startSiteCode},
#{nextSiteCode},
#{distance},
#{feeType},
+ #{fee},
#{price},
#{currency},
+ #{startWeight},
+ #{endWeight},
+ #{initialWeight},
+ #{additionalWeight},
+ #{conditionExpression},
+ #{calculateExpression},
#{billType},
#{supplierCode},
#{startDate},
#{endDate},
+ #{blOpen},
#{remark},
#{tenantId},
#{delFlag},
@@ -177,7 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{updateTime},
#{createSite},
#{updateSite},
-
+
@@ -187,12 +222,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
next_site_code = #{nextSiteCode},
distance = #{distance},
fee_type = #{feeType},
+ fee = #{fee},
price = #{price},
currency = #{currency},
+ start_weight = #{startWeight},
+ end_weight = #{endWeight},
+ initial_weight = #{initialWeight},
+ additional_weight = #{additionalWeight},
+ condition_expression = #{conditionExpression},
+ calculate_expression = #{calculateExpression},
bill_type = #{billType},
supplier_code = #{supplierCode},
start_date = #{startDate},
end_date = #{endDate},
+ bl_open = #{blOpen},
remark = #{remark},
tenant_id = #{tenantId},
del_flag = #{delFlag},
@@ -207,11 +250,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from emis_tms_cost_quote_price where id = #{id}
+ update emis_tms_cost_quote_price set del_flag='1' where id = #{id}
- delete from emis_tms_cost_quote_price where id in
+ update emis_tms_cost_quote_price set del_flag='1' where id in
#{id}