From f2ca4a90b1fe9bf5f0c9920d6a7bc683164a8ed7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 28 Mar 2025 06:49:56 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/domain/EmisWaybill.java   | 12 +++++
 .../erp/emis/domain/vo/WaybillOrder.java      | 12 ++++-
 .../resources/mapper/EmisWaybillMapper.xml    | 50 +++++++++++++++----
 3 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
index f686e2f80..5f8c2f649 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
@@ -337,6 +337,18 @@ public class EmisWaybill extends BaseEntity
     private String insureSiteCode;
     /* 投保日期 */
     private String insureDate;
+
+    /* 是否代收 */
+    private String blCod;
+    /* 代收费用 */
+    private BigDecimal codFee;
+    /* 代收费用币种 */
+    private String codFeeCurrency;
+    /* 代收描述 */
+    @TableField
+    @DataAuditField(fieldComment = "代收描述")
+    private String codFeeDesc;
+
     /* 是否打印 0-未打印 1-已打印 */
     private String blPrint;
     /* 打印人编号 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
index 5eb097236..c25184891 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
@@ -2,6 +2,7 @@ package com.xdadan.erp.emis.domain.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xdadan.erp.common.annotation.audit.DataAuditField;
 import com.xdadan.erp.emis.domain.*;
 import lombok.Data;
 
@@ -178,10 +179,13 @@ public class WaybillOrder  implements Serializable {
 
     /* 费用备注 */
     private String feeRemark;
-    ;
+
     /* 实际货值 */
     private String realValue;
 
+    /* 代收描述 */
+    private String codFeeDesc;
+
     /* 是否同行转单 */
     private String blDispFd;
     /* 转单快递代码 */
@@ -206,7 +210,6 @@ public class WaybillOrder  implements Serializable {
     /* 登记人编号 */
     private String registerManCode;
 
-
     /* 发件网点代码 */
     private String sendSiteCode;
 
@@ -562,6 +565,8 @@ public class WaybillOrder  implements Serializable {
         voItem.setOverWeightNumber(dbWaybill.getOverWeightNumber());
         voItem.setFeeRemark(dbWaybill.getFeeRemark());
 
+        voItem.setCodFeeDesc(dbWaybill.getCodFeeDesc());
+
         voItem.setBlSpecialQuote(dbWaybill.getBlSpecialQuote());
         voItem.setBlSpecialGoods(dbWaybill.getBlSpecialGoods());
 
@@ -800,6 +805,9 @@ public class WaybillOrder  implements Serializable {
 
         dbWaybill.setFeeRemark(this.getFeeRemark());
 
+        // 代收描述
+        dbWaybill.setCodFeeDesc(this.getCodFeeDesc());
+
 //        dbWaybill.setThirdCode(this.getThirdCode());
         dbWaybill.setRealValue(this.getRealValue());
 //        dbWaybill.setBlInsure(this.getBlInsure());
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index b8dba5266..072ae53ef 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -108,6 +108,12 @@
         <result property="insureRemark"    column="insure_remark"    />
         <result property="insureSiteCode"    column="insure_site_code"    />
         <result property="insureDate"    column="insure_date"    />
+
+        <result property="blCod"    column="bl_cod"    />
+        <result property="codFee"    column="cod_fee"    />
+        <result property="codFeeCurrency"    column="cod_fee_currency"    />
+        <result property="codFeeDesc"    column="cod_fee_desc"    />
+
         <result property="blPrint"    column="bl_print"    />
         <result property="printManCode"    column="print_man_code"    />
         <result property="printSite"    column="print_site"    />
@@ -294,6 +300,7 @@
             a.payment_status, a.payment_date, a.payment_remark, a.order_remark, a.data_from, a.bl_special_goods,a.ext_info,
             a.remark, a.del_flag, a.create_by,
             a.create_time, a.update_by, a.update_time, a.create_site, a.update_site,
+            a.cod_fee_desc,
 
             b.name as receive_country_name,c.name as send_country_name,
             d.region_name as receive_province_name,e.region_name as receive_city_name,f.region_name as receive_county_name,
@@ -389,6 +396,7 @@
             a.payment_status, a.payment_date, a.payment_remark, a.order_remark, a.data_from, a.bl_special_goods,a.ext_info,
             a.remark, a.del_flag, a.create_by,
             a.create_time, a.update_by, a.update_time, a.create_site, a.update_site,
+            a.cod_fee_desc,
 
             b.name as receive_country_name,c.name as send_country_name,
             d.region_name as receive_province_name,e.region_name as receive_city_name,f.region_name as receive_county_name,
@@ -2200,11 +2208,9 @@
         ORDER BY a.send_date DESC
     </select>
 
-
     <insert id="insertEmisWaybill" parameterType="EmisWaybill" useGeneratedKeys="true" keyProperty="id">
         insert into emis_waybill
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
             <if test="orderSn != null and orderSn != ''">order_sn,</if>
             <if test="custOrderId != null and custOrderId != ''">cust_order_id,</if>
             <if test="billCode != null and billCode != ''">bill_code,</if>
@@ -2291,9 +2297,12 @@
             <if test="realPaymentType != null and realPaymentType != ''">real_payment_type,</if>
             <if test="realFee != null">real_fee,</if>
             <if test="blSpecialQuote != null and blSpecialQuote != ''">bl_special_quote,</if>
+            <if test="blSensitive != null and blSensitive != ''">bl_sensitive,</if>
             <if test="blOverLong != null and blOverLong != ''">bl_over_long,</if>
+            <if test="blVirtual != null and blVirtual != ''">bl_virtual,</if>
             <if test="blBill != null and blBill != ''">bl_bill,</if>
             <if test="blBillText != null and blBillText != ''">bl_bill_text,</if>
+            <if test="blProfit != null and blProfit != ''">bl_profit,</if>
             <if test="blOverWeight != null and blOverWeight != ''">bl_over_weight,</if>
             <if test="overWeightNumber != null and overWeightNumber != ''">over_weight_number,</if>
             <if test="feeRemark != null and feeRemark != ''">fee_remark,</if>
@@ -2307,6 +2316,10 @@
             <if test="insureRemark != null and insureRemark != ''">insure_remark,</if>
             <if test="insureSiteCode != null and insureSiteCode != ''">insure_site_code,</if>
             <if test="insureDate != null and insureDate != ''">insure_date,</if>
+            <if test="blCod != null and blCod != ''">bl_cod,</if>
+            <if test="codFee != null">cod_fee,</if>
+            <if test="codFeeCurrency != null and codFeeCurrency != ''">cod_fee_currency,</if>
+            <if test="codFeeDesc != null and codFeeDesc != ''">cod_fee_desc,</if>
             <if test="blPrint != null and blPrint != ''">bl_print,</if>
             <if test="printManCode != null and printManCode != ''">print_man_code,</if>
             <if test="printSite != null and printSite != ''">print_site,</if>
@@ -2328,7 +2341,7 @@
             <if test="sendCenterCode != null and sendCenterCode != ''">send_center_code,</if>
             <if test="sendDate != null">send_date,</if>
             <if test="dispatchManCode != null and dispatchManCode != ''">dispatch_man_code,</if>
-            <if test="dispatchDate != null and dispatchDate != ''">dispatch_date,</if>
+            <if test="dispatchDate != null">dispatch_date,</if>
             <if test="dispatchSiteCode != null and dispatchSiteCode != ''">dispatch_site_code,</if>
             <if test="produceBillDate != null">produce_bill_date,</if>
             <if test="produceBillSiteCode != null and produceBillSiteCode != ''">produce_bill_site_code,</if>
@@ -2344,7 +2357,7 @@
             <if test="salesmen != null and salesmen != ''">salesmen,</if>
             <if test="operateEmployeeCode != null and operateEmployeeCode != ''">operate_employee_code,</if>
             <if test="blIsQuestion != null and blIsQuestion != ''">bl_is_question,</if>
-            <if test="problemType != null and problemType != ''">problem_type,</if>
+            <if test="problemType != null">problem_type,</if>
             <if test="problemCause != null and problemCause != ''">problem_cause,</if>
             <if test="problemDelayDays != null">problem_delay_days,</if>
             <if test="blMessage != null and blMessage != ''">bl_message,</if>
@@ -2362,10 +2375,12 @@
             <if test="paymentDate != null">payment_date,</if>
             <if test="paymentRemark != null and paymentRemark != ''">payment_remark,</if>
             <if test="orderRemark != null and orderRemark != ''">order_remark,</if>
+            <if test="cancelCause != null and cancelCause != ''">cancel_cause,</if>
             <if test="dataFrom != null and dataFrom != ''">data_from,</if>
             <if test="blSpecialGoods != null and blSpecialGoods != ''">bl_special_goods,</if>
             <if test="extInfo != null and extInfo != ''">ext_info,</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>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -2375,7 +2390,6 @@
             <if test="updateSite != null and updateSite != ''">update_site,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
             <if test="orderSn != null and orderSn != ''">#{orderSn},</if>
             <if test="custOrderId != null and custOrderId != ''">#{custOrderId},</if>
             <if test="billCode != null and billCode != ''">#{billCode},</if>
@@ -2462,9 +2476,12 @@
             <if test="realPaymentType != null and realPaymentType != ''">#{realPaymentType},</if>
             <if test="realFee != null">#{realFee},</if>
             <if test="blSpecialQuote != null and blSpecialQuote != ''">#{blSpecialQuote},</if>
+            <if test="blSensitive != null and blSensitive != ''">#{blSensitive},</if>
             <if test="blOverLong != null and blOverLong != ''">#{blOverLong},</if>
+            <if test="blVirtual != null and blVirtual != ''">#{blVirtual},</if>
             <if test="blBill != null and blBill != ''">#{blBill},</if>
             <if test="blBillText != null and blBillText != ''">#{blBillText},</if>
+            <if test="blProfit != null and blProfit != ''">#{blProfit},</if>
             <if test="blOverWeight != null and blOverWeight != ''">#{blOverWeight},</if>
             <if test="overWeightNumber != null and overWeightNumber != ''">#{overWeightNumber},</if>
             <if test="feeRemark != null and feeRemark != ''">#{feeRemark},</if>
@@ -2478,6 +2495,10 @@
             <if test="insureRemark != null and insureRemark != ''">#{insureRemark},</if>
             <if test="insureSiteCode != null and insureSiteCode != ''">#{insureSiteCode},</if>
             <if test="insureDate != null and insureDate != ''">#{insureDate},</if>
+            <if test="blCod != null and blCod != ''">#{blCod},</if>
+            <if test="codFee != null">#{codFee},</if>
+            <if test="codFeeCurrency != null and codFeeCurrency != ''">#{codFeeCurrency},</if>
+            <if test="codFeeDesc != null and codFeeDesc != ''">#{codFeeDesc},</if>
             <if test="blPrint != null and blPrint != ''">#{blPrint},</if>
             <if test="printManCode != null and printManCode != ''">#{printManCode},</if>
             <if test="printSite != null and printSite != ''">#{printSite},</if>
@@ -2499,7 +2520,7 @@
             <if test="sendCenterCode != null and sendCenterCode != ''">#{sendCenterCode},</if>
             <if test="sendDate != null">#{sendDate},</if>
             <if test="dispatchManCode != null and dispatchManCode != ''">#{dispatchManCode},</if>
-            <if test="dispatchDate != null and dispatchDate != ''">#{dispatchDate},</if>
+            <if test="dispatchDate != null">#{dispatchDate},</if>
             <if test="dispatchSiteCode != null and dispatchSiteCode != ''">#{dispatchSiteCode},</if>
             <if test="produceBillDate != null">#{produceBillDate},</if>
             <if test="produceBillSiteCode != null and produceBillSiteCode != ''">#{produceBillSiteCode},</if>
@@ -2515,7 +2536,7 @@
             <if test="salesmen != null and salesmen != ''">#{salesmen},</if>
             <if test="operateEmployeeCode != null and operateEmployeeCode != ''">#{operateEmployeeCode},</if>
             <if test="blIsQuestion != null and blIsQuestion != ''">#{blIsQuestion},</if>
-            <if test="problemType != null and problemType != ''">#{problemType},</if>
+            <if test="problemType != null">#{problemType},</if>
             <if test="problemCause != null and problemCause != ''">#{problemCause},</if>
             <if test="problemDelayDays != null">#{problemDelayDays},</if>
             <if test="blMessage != null and blMessage != ''">#{blMessage},</if>
@@ -2533,10 +2554,12 @@
             <if test="paymentDate != null">#{paymentDate},</if>
             <if test="paymentRemark != null and paymentRemark != ''">#{paymentRemark},</if>
             <if test="orderRemark != null and orderRemark != ''">#{orderRemark},</if>
+            <if test="cancelCause != null and cancelCause != ''">#{cancelCause},</if>
             <if test="dataFrom != null and dataFrom != ''">#{dataFrom},</if>
             <if test="blSpecialGoods != null and blSpecialGoods != ''">#{blSpecialGoods},</if>
             <if test="extInfo != null and extInfo != ''">#{extInfo},</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>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -2634,9 +2657,12 @@
             <if test="realPaymentType != null and realPaymentType != ''">real_payment_type = #{realPaymentType},</if>
             <if test="realFee != null">real_fee = #{realFee},</if>
             <if test="blSpecialQuote != null and blSpecialQuote != ''">bl_special_quote = #{blSpecialQuote},</if>
+            <if test="blSensitive != null and blSensitive != ''">bl_sensitive = #{blSensitive},</if>
             <if test="blOverLong != null and blOverLong != ''">bl_over_long = #{blOverLong},</if>
+            <if test="blVirtual != null and blVirtual != ''">bl_virtual = #{blVirtual},</if>
             <if test="blBill != null and blBill != ''">bl_bill = #{blBill},</if>
             <if test="blBillText != null and blBillText != ''">bl_bill_text = #{blBillText},</if>
+            <if test="blProfit != null and blProfit != ''">bl_profit = #{blProfit},</if>
             <if test="blOverWeight != null and blOverWeight != ''">bl_over_weight = #{blOverWeight},</if>
             <if test="overWeightNumber != null and overWeightNumber != ''">over_weight_number = #{overWeightNumber},</if>
             <if test="feeRemark != null and feeRemark != ''">fee_remark = #{feeRemark},</if>
@@ -2650,6 +2676,10 @@
             <if test="insureRemark != null and insureRemark != ''">insure_remark = #{insureRemark},</if>
             <if test="insureSiteCode != null and insureSiteCode != ''">insure_site_code = #{insureSiteCode},</if>
             <if test="insureDate != null and insureDate != ''">insure_date = #{insureDate},</if>
+            <if test="blCod != null and blCod != ''">bl_cod = #{blCod},</if>
+            <if test="codFee != null">cod_fee = #{codFee},</if>
+            <if test="codFeeCurrency != null and codFeeCurrency != ''">cod_fee_currency = #{codFeeCurrency},</if>
+            <if test="codFeeDesc != null and codFeeDesc != ''">cod_fee_desc = #{codFeeDesc},</if>
             <if test="blPrint != null and blPrint != ''">bl_print = #{blPrint},</if>
             <if test="printManCode != null and printManCode != ''">print_man_code = #{printManCode},</if>
             <if test="printSite != null and printSite != ''">print_site = #{printSite},</if>
@@ -2671,7 +2701,7 @@
             <if test="sendCenterCode != null and sendCenterCode != ''">send_center_code = #{sendCenterCode},</if>
             <if test="sendDate != null">send_date = #{sendDate},</if>
             <if test="dispatchManCode != null and dispatchManCode != ''">dispatch_man_code = #{dispatchManCode},</if>
-            <if test="dispatchDate != null and dispatchDate != ''">dispatch_date = #{dispatchDate},</if>
+            <if test="dispatchDate != null">dispatch_date = #{dispatchDate},</if>
             <if test="dispatchSiteCode != null and dispatchSiteCode != ''">dispatch_site_code = #{dispatchSiteCode},</if>
             <if test="produceBillDate != null">produce_bill_date = #{produceBillDate},</if>
             <if test="produceBillSiteCode != null and produceBillSiteCode != ''">produce_bill_site_code = #{produceBillSiteCode},</if>
@@ -2687,7 +2717,7 @@
             <if test="salesmen != null and salesmen != ''">salesmen = #{salesmen},</if>
             <if test="operateEmployeeCode != null and operateEmployeeCode != ''">operate_employee_code = #{operateEmployeeCode},</if>
             <if test="blIsQuestion != null and blIsQuestion != ''">bl_is_question = #{blIsQuestion},</if>
-            <if test="problemType != null and problemType != ''">problem_type = #{problemType},</if>
+            <if test="problemType != null">problem_type = #{problemType},</if>
             <if test="problemCause != null and problemCause != ''">problem_cause = #{problemCause},</if>
             <if test="problemDelayDays != null">problem_delay_days = #{problemDelayDays},</if>
             <if test="blMessage != null and blMessage != ''">bl_message = #{blMessage},</if>
@@ -2705,10 +2735,12 @@
             <if test="paymentDate != null">payment_date = #{paymentDate},</if>
             <if test="paymentRemark != null and paymentRemark != ''">payment_remark = #{paymentRemark},</if>
             <if test="orderRemark != null and orderRemark != ''">order_remark = #{orderRemark},</if>
+            <if test="cancelCause != null and cancelCause != ''">cancel_cause = #{cancelCause},</if>
             <if test="dataFrom != null and dataFrom != ''">data_from = #{dataFrom},</if>
             <if test="blSpecialGoods != null and blSpecialGoods != ''">bl_special_goods = #{blSpecialGoods},</if>
             <if test="extInfo != null and extInfo != ''">ext_info = #{extInfo},</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>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>