From 23ea86ccb6eaf4979803417d5e77c167c3fe0c86 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Fri, 29 Aug 2025 16:49:01 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=E8=A7=A3=E5=86=B3=E9=9D=9E=E6=80=BB?= =?UTF-8?q?=E9=83=A8=E8=B4=A6=E5=8F=B7=E6=9F=A5=E8=AF=A2=E7=BB=84=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=AE=8C=E6=88=90=E7=9A=84=E6=95=B0=E6=8D=AE=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=E4=B8=80=20=20oms=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E3=80=81oms=E7=BD=91=E9=A1=B5=E7=AB=AF=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=BD=95=E5=85=A5/=E4=BF=AE=E6=94=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=BF=9D=E5=AD=98=E5=AE=A2=E6=88=B7=E5=9C=B0=E5=9D=80?= =?UTF-8?q?id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../main/java/com/xdadan/erp/emis/domain/EmisWaybill.java | 2 ++ .../main/java/com/xdadan/erp/emis/domain/vo/Sender.java | 2 ++ .../java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java | 2 ++ .../main/resources/mapper/EmisTmsSiteBatchMissMapper.xml | 2 +- emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml | 8 ++++++-- 5 files changed, 13 insertions(+), 3 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 86ad03f09..9ac5d8c08 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 @@ -160,6 +160,8 @@ public class EmisWaybill extends BaseEntity private String enterpriseName; /* 企业税号 */ private String enterpriseTaxId; + /* 寄件人客户地址ID */ + private Integer sendCustomerAddressId; /* 支付方式 : 现金或月结 */ @TableField @DataAuditField(fieldComment = "支付方式",dictType="emis_payment_type") diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Sender.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Sender.java index 16e26be9a..38b91998a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Sender.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Sender.java @@ -45,4 +45,6 @@ public class Sender implements Serializable { private String enterpriseName; /* 企业税号 */ private String enterpriseTaxId; + /* 寄件人客户地址ID */ + private Integer id; } 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 ebe39bc81..502b76060 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 @@ -504,6 +504,7 @@ public class WaybillOrder implements Serializable { sender.setCompany(dbWaybill.getSendCompany()); sender.setEnterpriseName(dbWaybill.getEnterpriseName()); sender.setEnterpriseTaxId(dbWaybill.getEnterpriseTaxId()); + sender.setId(dbWaybill.getSendCustomerAddressId()); voItem.setSender(sender); // voItem.setId(dbWaybill.getId()); @@ -789,6 +790,7 @@ public class WaybillOrder implements Serializable { dbWaybill.setSendCompany(sender.getCompany()); dbWaybill.setEnterpriseName(sender.getEnterpriseName()); dbWaybill.setEnterpriseTaxId(sender.getEnterpriseTaxId()); + dbWaybill.setSendCustomerAddressId(sender.getId()); } dbWaybill.setPaymentType(this.getPaymentType()); diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml index cb024fc3a..4a64094cc 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml @@ -211,7 +211,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and w.send_date #{params.endSendDate} - and (w.start_site_code=#{params.privSiteCode} or w.send_site_code=#{params.privSiteCode} or m.start_site_code=#{params.privSiteCode} or m.next_site_code=#{params.privSiteCode}) + and (w.start_site_code=#{params.privSiteCode} or w.send_site_code=#{params.privSiteCode}) diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index ece22fff3..24fb9a22e 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -46,6 +46,7 @@ + @@ -301,7 +302,7 @@ a.receive_company, a.receive_mobile, a.receive_tel, a.receive_country, a.receive_province, a.receive_city, a.receive_county, a.receive_town, a.receive_address, a.receive_postcode, a.receive_pcd, a.send_name, a.send_company,a.start_site_code, a.send_mobile, a.send_tel, a.send_country, a.send_province, a.send_city, a.send_county, a.send_town, a.send_address, - a.send_postcode, a.send_pcd, a.enterprise_name, a.enterprise_tax_id, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type, + a.send_postcode, a.send_pcd, a.enterprise_name, a.enterprise_tax_id, a.send_customer_address_id, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type, a.time_type, a.meter_type, a.carry_type, a.customs_clear, a.customs_eclaration, a.estimate_date, a.pack_type, a.dispatch_method, a.pickup_method, a.pick_start_date, a.pick_finish_date, a.pick_fail_reason, a.into_warehouse_code, a.into_warehouse_name, a.into_warehouse_address, a.into_warehouse_contact, a.into_warehouse_phone, @@ -402,7 +403,7 @@ a.receive_company, a.receive_mobile, a.receive_tel, a.receive_country, a.receive_province, a.receive_city, a.receive_county, a.receive_town, a.receive_address, a.receive_postcode, a.receive_pcd, a.send_name, a.send_company, a.send_mobile, a.send_tel, a.send_country, a.send_province, a.send_city, a.send_county, a.send_town, a.send_address, - a.send_postcode, a.send_pcd, a.enterprise_name, a.enterprise_tax_id, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type, + a.send_postcode, a.send_pcd, a.enterprise_name, a.enterprise_tax_id, a.send_customer_address_id, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type, a.time_type, a.meter_type, a.carry_type, a.customs_clear, a.customs_eclaration, a.estimate_date, a.pack_type, a.dispatch_method, a.pickup_method, a.pick_start_date, a.pick_finish_date, a.pick_fail_reason, a.into_warehouse_code, a.into_warehouse_name, a.into_warehouse_address, a.into_warehouse_contact, a.into_warehouse_phone, @@ -2825,6 +2826,7 @@ send_address, send_postcode, send_pcd, + send_customer_address_id, enterprise_name, enterprise_tax_id, payment_type, @@ -3013,6 +3015,7 @@ #{sendAddress}, #{sendPostcode}, #{sendPcd}, + #{sendCustomerAddressId}, #{enterpriseName}, #{enterpriseTaxId}, #{paymentType}, @@ -3203,6 +3206,7 @@ send_address = #{sendAddress}, send_postcode = #{sendPostcode}, send_pcd = #{sendPcd}, + send_customer_address_id = #{sendCustomerAddressId}, enterprise_name = #{enterpriseName}, enterprise_tax_id = #{enterpriseTaxId}, payment_type = #{paymentType},