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 38040adb0..5bd1b6b35 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
@@ -69,6 +69,7 @@ public class EmisTmsCostQuotePrice extends BaseEntity
/* 关联批次 */
private String batchNo;
+ private String carNo;
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date etd;
private BigDecimal transWeight;
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 161eba21f..711c90d33 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
@@ -379,12 +379,13 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
// 运输成本
splitItem.setBlManual("1"); // 手工计算
splitItem.setCostNo("-1"); // 固定成本
+ splitItem.setBatchNo(quotePrice0.getBatchNo());
splitItem.setTransWeight(quotePrice0.getTransWeight()); // 运输重量
splitItem.setTransVolume(BigDecimal.ZERO); // 运输体积
// 供应商
splitItem.setSupplierCode(quotePrice0.getSupplierCode()); // 供应商
- splitItem.setTransSignNo(quotePrice0.getSupplierCode()); // 运输号
+ splitItem.setTransSignNo(quotePrice0.getCarNo()); // 运输号
// 起点到目的点
splitItem.setSendPlace(quotePrice0.getStartSiteName());
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml
index 3360d4752..fa5b06241 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml
@@ -70,17 +70,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
del_flag='0'
and id = #{id}
and cost_no=#{costNo}
+ and batch_no=#{batchNo}
and fee_item_id = #{feeItemId}
and bill_code=#{billCode}
and main_bill_code=#{mainBillCode}
-
+ and send_place=#{sendPlace}
+ and dest_place=#{destPlace}
+ and bill_month=#{billMonth}
+ and trade_date = #{tradeDate}
+ and trans_sign_no=#{transSignNo}
+ and supplier_code=#{supplierCode}
and fee_type=#{feeType}
and split_type=#{splitType}
+ and split_value = #{splitValue}
and cost_fee = #{costFee}
and total_volume = #{totalVolume}
and bill_weight = #{billWeight}
+ and trans_weight = #{transWeight}
+ and trans_volume = #{transVolume}
+ and trans_cost_fee = #{transCostFee}
+ and currency=#{currency}
+ and currecy_to_cny_rate = #{currecyToCnyRate}
+ and cny_fee = #{cnyFee}
+ and fee_item_id = #{feeItemId}
+ and price = #{price}
+ and calc_expr like concat('%', #{calcExpr}, '%')
and calc_remark like concat('%', #{calcRemark}, '%')
+ and bl_manual=#{blManual}
+ and bl_virtual=#{blVirtual}
+ and bl_sub=#{blSub}
and remark like concat('%', #{remark}, '%')
+
and del_flag like concat('%', #{delFlag}, '%')
and create_by like concat('%', #{createBy}, '%')
and create_time = #{createTime}
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml
index 811d0ecfe..535eb0a54 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml
@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -78,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.end_date,
b.batch_no,
+ b.car_no,
b.etd,
b.trans_weight,
b.total_weight