From 632d105de112f558925df8902c774ed7ac4d238d Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 7 Jul 2025 14:48:16 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/domain/EmisTmsCostQuotePrice.java | 2 ++
 .../main/resources/mapper/EmisTmsCostQuotePriceMapper.xml | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

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 130b4cd5d..604919e1a 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
@@ -77,6 +77,8 @@ public class EmisTmsCostQuotePrice extends BaseEntity
     private Date endDate;
     /* 启用状态 1-启用 0-停用 */
     private String blOpen;
+    /* 自提不计算 1-是 0-否 */
+    private String blIgnoreZt;
 
     //  扩展字段  ------
     /** 起始网点名称 */
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml
index 2748846c2..1d1ec12ed 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml
@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="startDate"    column="start_date"    />
         <result property="endDate"    column="end_date"    />
         <result property="blOpen"    column="bl_open"    />
+        <result property="blIgnoreZt"    column="bl_ignore_zt"    />
 
         <result property="batchNo"    column="batch_no"    />
         <result property="carNo"    column="car_no"    />
@@ -41,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisTmsCostQuotePriceVo">
-        select id, start_site_code, next_site_code, distance, fee_type, fee, least_price, price_type, 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
+        select id, start_site_code, next_site_code, distance, fee_type, fee, least_price, price_type, price, currency, start_weight, end_weight, initial_weight, additional_weight, condition_expression, calculate_expression, bill_type, supplier_code, start_date, end_date, bl_open, bl_ignore_zt, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_quote_price
     </sql>
 
     <select id="selectEmisTmsCostQuotePriceList" parameterType="EmisTmsCostQuotePrice" resultMap="EmisTmsCostQuotePriceResult">
@@ -151,7 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
   
     <select id="selectEmisTmsCostQuotePriceById" parameterType="Long" resultMap="EmisTmsCostQuotePriceResult">
-        select id, start_site_code, next_site_code, distance, fee_type, fee, least_price, price_type, 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
+        select id, start_site_code, next_site_code, distance, fee_type, fee, least_price, price_type, price, currency, start_weight, end_weight, initial_weight, additional_weight, condition_expression, calculate_expression, bill_type, supplier_code, start_date, end_date, bl_open, bl_ignore_zt, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_tms_cost_quote_price a
         where a.id = #{id}
     </select>
@@ -180,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startDate != null">start_date,</if>
             <if test="endDate != null">end_date,</if>
             <if test="blOpen != null and blOpen != ''">bl_open,</if>
+            <if test="blIgnoreZt != null and blIgnoreZt != ''">bl_ignore_zt,</if>
             <if test="remark != null and remark != ''">remark,</if>
             <if test="tenantId != null and tenantId != ''">tenant_id,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
@@ -212,6 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startDate != null">#{startDate},</if>
             <if test="endDate != null">#{endDate},</if>
             <if test="blOpen != null and blOpen != ''">#{blOpen},</if>
+            <if test="blIgnoreZt != null and blIgnoreZt != ''">#{blIgnoreZt},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="tenantId != null and tenantId != ''">#{tenantId},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@@ -247,6 +250,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startDate != null">start_date = #{startDate},</if>
             <if test="endDate != null">end_date = #{endDate},</if>
             <if test="blOpen != null and blOpen != ''">bl_open = #{blOpen},</if>
+            <if test="blIgnoreZt != null and blIgnoreZt != ''">bl_ignore_zt = #{blIgnoreZt},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>