From d3e54c9e02a76994af11ca5ac8bab4003577868c Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 16 May 2024 15:14:21 +0800
Subject: [PATCH] md

---
 .../resources/mapper/EmisWaybillAttachmentMapper.xml     | 2 --
 .../src/main/resources/mapper/EmisWaybillCargoMapper.xml | 2 --
 .../main/resources/mapper/EmisWaybillFeeitemMapper.xml   | 9 +++++----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
index 6edecf48b..739eaf7a3 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
@@ -54,7 +54,6 @@
     <insert id="insertEmisWaybillAttachment" parameterType="EmisWaybillAttachment">
         insert into emis_waybill_attachment
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
             <if test="waybillId != null">waybill_id,</if>
             <if test="attachType != null and attachType != ''">attach_type,</if>
             <if test="fileName != null and fileName != ''">file_name,</if>
@@ -69,7 +68,6 @@
             <if test="remark != null and remark != ''">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
             <if test="waybillId != null">#{waybillId},</if>
             <if test="attachType != null and attachType != ''">#{attachType},</if>
             <if test="fileName != null and fileName != ''">#{fileName},</if>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml
index b9cf905af..32b64b9f5 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml
@@ -98,7 +98,6 @@
     <insert id="insertEmisWaybillCargo" parameterType="EmisWaybillCargo">
         insert into emis_waybill_cargo
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
             <if test="waybillId != null">waybill_id,</if>
             <if test="goodsCode != null and goodsCode != ''">goods_code,</if>
             <if test="goodsName != null and goodsName != ''">goods_name,</if>
@@ -135,7 +134,6 @@
             <if test="remark != null and remark != ''">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
             <if test="waybillId != null">#{waybillId},</if>
             <if test="goodsCode != null and goodsCode != ''">#{goodsCode},</if>
             <if test="goodsName != null and goodsName != ''">#{goodsName},</if>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillFeeitemMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillFeeitemMapper.xml
index 651b4ea6d..afa91d77f 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillFeeitemMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillFeeitemMapper.xml
@@ -17,6 +17,7 @@
         <result property="calcExp"    column="calc_exp"    />
         <result property="initialWeightFee"    column="initial_weight_fee"    />
         <result property="addWeightPrice"    column="add_weight_price"    />
+        <result property="blAutoGen"    column="bl_auto_gen"    />
         <result property="orderNum"    column="order_num"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
@@ -27,7 +28,7 @@
     </resultMap>
 
     <sql id="selectEmisWaybillFeeitemVo">
-        select id, waybill_id, fee_code, fee_name, fee, real_fee, currency, quote_id, expr_id, calc_exp, initial_weight_fee, add_weight_price, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill_feeitem
+        select id, waybill_id, fee_code, fee_name, fee, real_fee, currency, quote_id, expr_id, calc_exp, initial_weight_fee, add_weight_price, bl_auto_gen, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill_feeitem
     </sql>
 
     <select id="selectEmisWaybillFeeitemList" parameterType="EmisWaybillFeeitem" resultMap="EmisWaybillFeeitemResult">
@@ -58,7 +59,7 @@
     </select>
 
     <select id="selectEmisWaybillFeeitemById" parameterType="Long" resultMap="EmisWaybillFeeitemResult">
-        select id, waybill_id, fee_code, fee_name, fee, real_fee, currency, quote_id, expr_id, calc_exp, initial_weight_fee, add_weight_price, order_num, del_flag, create_by, create_time, update_by, update_time, remark
+        select id, waybill_id, fee_code, fee_name, fee, real_fee, currency, quote_id, expr_id, calc_exp, initial_weight_fee, add_weight_price, bl_auto_gen, order_num, del_flag, create_by, create_time, update_by, update_time, remark
         from emis_waybill_feeitem a
         where a.id = #{id}
     </select>
@@ -66,7 +67,6 @@
     <insert id="insertEmisWaybillFeeitem" parameterType="EmisWaybillFeeitem">
         insert into emis_waybill_feeitem
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
             <if test="waybillId != null">waybill_id,</if>
             <if test="feeCode != null and feeCode != ''">fee_code,</if>
             <if test="feeName != null and feeName != ''">fee_name,</if>
@@ -78,6 +78,7 @@
             <if test="calcExp != null and calcExp != ''">calc_exp,</if>
             <if test="initialWeightFee != null">initial_weight_fee,</if>
             <if test="addWeightPrice != null">add_weight_price,</if>
+            <if test="blAutoGen != null and blAutoGen != ''">bl_auto_gen,</if>
             <if test="orderNum != null">order_num,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
@@ -87,7 +88,6 @@
             <if test="remark != null and remark != ''">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
             <if test="waybillId != null">#{waybillId},</if>
             <if test="feeCode != null and feeCode != ''">#{feeCode},</if>
             <if test="feeName != null and feeName != ''">#{feeName},</if>
@@ -99,6 +99,7 @@
             <if test="calcExp != null and calcExp != ''">#{calcExp},</if>
             <if test="initialWeightFee != null">#{initialWeightFee},</if>
             <if test="addWeightPrice != null">#{addWeightPrice},</if>
+            <if test="blAutoGen != null and blAutoGen != ''">#{blAutoGen},</if>
             <if test="orderNum != null">#{orderNum},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>