diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java
index 1c777b812..c6407e012 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java
@@ -121,6 +121,8 @@ public class EmisTmsSiteBatch extends BaseEntity
private BigDecimal totalVolume;
/* 总重量 */
private BigDecimal totalWeight;
+ /* 总结算重量 */
+ private BigDecimal totalSettlementWeight;
/* 操作员 */
private String opMan;
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
index 6119197c8..ca26676c7 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
@@ -602,6 +602,10 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
}
existsMap.put(uniqKey,1);
+ // 获取批次结算重量
+
+
+
// 计算 机场提货费操作费
EmisTmsCostFeeSplit splitItem = new EmisTmsCostFeeSplit();
splitItem.setBillCode(billCode.trim());
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
index a34468616..15c17929b 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
@@ -32,6 +32,9 @@
+
+
+
@@ -146,7 +149,7 @@
- select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site, bl_entering from emis_tms_site_batch
+ select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, total_settlement_weight, bl_profit, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site, bl_entering from emis_tms_site_batch
@@ -375,7 +378,6 @@
insert into emis_tms_site_batch
- id,
batch_no,
batch_name,
batch_date,
@@ -403,6 +405,8 @@
total_waybill_qty,
total_volume,
total_weight,
+ total_settlement_weight,
+ bl_profit,
op_man,
remark,
tenant_id,
@@ -413,9 +417,9 @@
update_time,
create_site,
update_site,
+ bl_entering,
- #{id},
#{batchNo},
#{batchName},
#{batchDate},
@@ -443,6 +447,8 @@
#{totalWaybillQty},
#{totalVolume},
#{totalWeight},
+ #{totalSettlementWeight},
+ #{blProfit},
#{opMan},
#{remark},
#{tenantId},
@@ -453,6 +459,7 @@
#{updateTime},
#{createSite},
#{updateSite},
+ #{blEntering},
@@ -486,6 +493,8 @@
total_waybill_qty = #{totalWaybillQty},
total_volume = #{totalVolume},
total_weight = #{totalWeight},
+ total_settlement_weight = #{totalSettlementWeight},
+ bl_profit = #{blProfit},
op_man = #{opMan},
remark = #{remark},
tenant_id = #{tenantId},
@@ -496,6 +505,7 @@
update_time = #{updateTime},
create_site = #{createSite},
update_site = #{updateSite},
+ bl_entering = #{blEntering},
where id = #{id}