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 @@
+
+
+
+
+
+
@@ -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
-
insert into emis_waybill
- id,
order_sn,
cust_order_id,
bill_code,
@@ -2291,9 +2297,12 @@
real_payment_type,
real_fee,
bl_special_quote,
+ bl_sensitive,
bl_over_long,
+ bl_virtual,
bl_bill,
bl_bill_text,
+ bl_profit,
bl_over_weight,
over_weight_number,
fee_remark,
@@ -2307,6 +2316,10 @@
insure_remark,
insure_site_code,
insure_date,
+ bl_cod,
+ cod_fee,
+ cod_fee_currency,
+ cod_fee_desc,
bl_print,
print_man_code,
print_site,
@@ -2328,7 +2341,7 @@
send_center_code,
send_date,
dispatch_man_code,
- dispatch_date,
+ dispatch_date,
dispatch_site_code,
produce_bill_date,
produce_bill_site_code,
@@ -2344,7 +2357,7 @@
salesmen,
operate_employee_code,
bl_is_question,
- problem_type,
+ problem_type,
problem_cause,
problem_delay_days,
bl_message,
@@ -2362,10 +2375,12 @@
payment_date,
payment_remark,
order_remark,
+ cancel_cause,
data_from,
bl_special_goods,
ext_info,
remark,
+ tenant_id,
del_flag,
create_by,
create_time,
@@ -2375,7 +2390,6 @@
update_site,
- #{id},
#{orderSn},
#{custOrderId},
#{billCode},
@@ -2462,9 +2476,12 @@
#{realPaymentType},
#{realFee},
#{blSpecialQuote},
+ #{blSensitive},
#{blOverLong},
+ #{blVirtual},
#{blBill},
#{blBillText},
+ #{blProfit},
#{blOverWeight},
#{overWeightNumber},
#{feeRemark},
@@ -2478,6 +2495,10 @@
#{insureRemark},
#{insureSiteCode},
#{insureDate},
+ #{blCod},
+ #{codFee},
+ #{codFeeCurrency},
+ #{codFeeDesc},
#{blPrint},
#{printManCode},
#{printSite},
@@ -2499,7 +2520,7 @@
#{sendCenterCode},
#{sendDate},
#{dispatchManCode},
- #{dispatchDate},
+ #{dispatchDate},
#{dispatchSiteCode},
#{produceBillDate},
#{produceBillSiteCode},
@@ -2515,7 +2536,7 @@
#{salesmen},
#{operateEmployeeCode},
#{blIsQuestion},
- #{problemType},
+ #{problemType},
#{problemCause},
#{problemDelayDays},
#{blMessage},
@@ -2533,10 +2554,12 @@
#{paymentDate},
#{paymentRemark},
#{orderRemark},
+ #{cancelCause},
#{dataFrom},
#{blSpecialGoods},
#{extInfo},
#{remark},
+ #{tenantId},
#{delFlag},
#{createBy},
#{createTime},
@@ -2634,9 +2657,12 @@
real_payment_type = #{realPaymentType},
real_fee = #{realFee},
bl_special_quote = #{blSpecialQuote},
+ bl_sensitive = #{blSensitive},
bl_over_long = #{blOverLong},
+ bl_virtual = #{blVirtual},
bl_bill = #{blBill},
bl_bill_text = #{blBillText},
+ bl_profit = #{blProfit},
bl_over_weight = #{blOverWeight},
over_weight_number = #{overWeightNumber},
fee_remark = #{feeRemark},
@@ -2650,6 +2676,10 @@
insure_remark = #{insureRemark},
insure_site_code = #{insureSiteCode},
insure_date = #{insureDate},
+ bl_cod = #{blCod},
+ cod_fee = #{codFee},
+ cod_fee_currency = #{codFeeCurrency},
+ cod_fee_desc = #{codFeeDesc},
bl_print = #{blPrint},
print_man_code = #{printManCode},
print_site = #{printSite},
@@ -2671,7 +2701,7 @@
send_center_code = #{sendCenterCode},
send_date = #{sendDate},
dispatch_man_code = #{dispatchManCode},
- dispatch_date = #{dispatchDate},
+ dispatch_date = #{dispatchDate},
dispatch_site_code = #{dispatchSiteCode},
produce_bill_date = #{produceBillDate},
produce_bill_site_code = #{produceBillSiteCode},
@@ -2687,7 +2717,7 @@
salesmen = #{salesmen},
operate_employee_code = #{operateEmployeeCode},
bl_is_question = #{blIsQuestion},
- problem_type = #{problemType},
+ problem_type = #{problemType},
problem_cause = #{problemCause},
problem_delay_days = #{problemDelayDays},
bl_message = #{blMessage},
@@ -2705,10 +2735,12 @@
payment_date = #{paymentDate},
payment_remark = #{paymentRemark},
order_remark = #{orderRemark},
+ cancel_cause = #{cancelCause},
data_from = #{dataFrom},
bl_special_goods = #{blSpecialGoods},
ext_info = #{extInfo},
remark = #{remark},
+ tenant_id = #{tenantId},
del_flag = #{delFlag},
create_by = #{createBy},
create_time = #{createTime},