md

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;

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());

emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml

@@ -70,17 +70,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
              del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="costNo != null  and costNo != ''"> and cost_no=#{costNo}</if>
+            <if test="batchNo != null  and batchNo != ''"> and batch_no=#{batchNo}</if>
             <if test="feeItemId != null "> and fee_item_id = #{feeItemId}</if>
             <if test="billCode != null  and billCode != ''"> and bill_code=#{billCode}</if>
             <if test="mainBillCode != null  and mainBillCode != ''"> and main_bill_code=#{mainBillCode}</if>
-
+            <if test="sendPlace != null  and sendPlace != ''"> and send_place=#{sendPlace}</if>
+            <if test="destPlace != null  and destPlace != ''"> and dest_place=#{destPlace}</if>
+            <if test="billMonth != null  and billMonth != ''"> and bill_month=#{billMonth}</if>
+            <if test="tradeDate != null "> and trade_date = #{tradeDate}</if>
+            <if test="transSignNo != null  and transSignNo != ''"> and trans_sign_no=#{transSignNo}</if>
+            <if test="supplierCode != null  and supplierCode != ''"> and supplier_code=#{supplierCode}</if>
             <if test="feeType != null  and feeType != ''"> and fee_type=#{feeType}</if>
             <if test="splitType != null  and splitType != ''"> and split_type=#{splitType}</if>
+            <if test="splitValue != null "> and split_value = #{splitValue}</if>
             <if test="costFee != null "> and cost_fee = #{costFee}</if>
             <if test="totalVolume != null "> and total_volume = #{totalVolume}</if>
             <if test="billWeight != null "> and bill_weight = #{billWeight}</if>
+            <if test="transWeight != null "> and trans_weight = #{transWeight}</if>
+            <if test="transVolume != null "> and trans_volume = #{transVolume}</if>
+            <if test="transCostFee != null "> and trans_cost_fee = #{transCostFee}</if>
+            <if test="currency != null  and currency != ''"> and currency=#{currency}</if>
+            <if test="currecyToCnyRate != null "> and currecy_to_cny_rate = #{currecyToCnyRate}</if>
+            <if test="cnyFee != null "> and cny_fee = #{cnyFee}</if>
+            <if test="feeItemId != null "> and fee_item_id = #{feeItemId}</if>
+            <if test="price != null "> and price = #{price}</if>
+            <if test="calcExpr != null  and calcExpr != ''"> and calc_expr like concat('%', #{calcExpr}, '%')</if>
             <if test="calcRemark != null  and calcRemark != ''"> and calc_remark like concat('%', #{calcRemark}, '%')</if>
+            <if test="blManual != null  and blManual != ''"> and bl_manual=#{blManual}</if>
+            <if test="blVirtual != null  and blVirtual != ''"> and bl_virtual=#{blVirtual}</if>
+            <if test="blSub != null  and blSub != ''"> and bl_sub=#{blSub}</if>
             <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
+
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
             <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>

emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
         <result property="batchNo"    column="batch_no"    />
+        <result property="carNo"    column="car_no"    />
         <result property="etd"    column="etd"    />
         <result property="transWeight"    column="trans_weight"    />
         <result property="totalVolume"    column="total_volume"    />
@@ -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