diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeRel.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeRel.java
index 8e5bc1787..59dc7533c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeRel.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeRel.java
@@ -45,6 +45,10 @@ public class EmisTmsCostFeeRel extends BaseEntity
private String splitType;
/* 分摊成本 */
private BigDecimal costFee;
+ /* 总体积 */
+ private BigDecimal totalVolume;
+ /* 实际重量 */
+ private BigDecimal billWeight;
/* 计算备注 */
private String calcRemark;
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeRelMapper.xml
index ed71d9a3d..ea2b2c90c 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeRelMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeRelMapper.xml
@@ -11,6 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -24,19 +26,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, cost_no, bill_code, fee_type, split_type, cost_fee, calc_remark, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_fee_rel
+ select id, cost_no, bill_code, fee_type, split_type, cost_fee, total_volume, bill_weight, calc_remark, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_fee_rel
+
+
-
-
+
insert into emis_tms_cost_fee_rel
@@ -92,6 +99,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
fee_type,
split_type,
cost_fee,
+ total_volume,
+ bill_weight,
calc_remark,
remark,
del_flag,
@@ -101,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_time,
create_site,
update_site,
-
+
#{id},
#{costNo},
@@ -109,6 +118,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{feeType},
#{splitType},
#{costFee},
+ #{totalVolume},
+ #{billWeight},
#{calcRemark},
#{remark},
#{delFlag},
@@ -118,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{updateTime},
#{createSite},
#{updateSite},
-
+
@@ -129,6 +140,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
fee_type = #{feeType},
split_type = #{splitType},
cost_fee = #{costFee},
+ total_volume = #{totalVolume},
+ bill_weight = #{billWeight},
calc_remark = #{calcRemark},
remark = #{remark},
del_flag = #{delFlag},
@@ -143,11 +156,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from emis_tms_cost_fee_rel where id = #{id}
+ update emis_tms_cost_fee_rel set del_flag='1' where id = #{id}
- delete from emis_tms_cost_fee_rel where id in
+ update emis_tms_cost_fee_rel set del_flag='1' where id in
#{id}