From 18948077e12298ced60ac688c8f3e36d670bd7d5 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 17 May 2024 08:02:38 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/domain/vo/Reciever.java   |  6 ++++++
 .../com/xdadan/erp/emis/domain/vo/Sender.java     | 14 ++++++++++----
 .../xdadan/erp/emis/domain/vo/WaybillOrder.java   | 15 +++++++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Reciever.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Reciever.java
index 05ce0e638..a127cf40e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Reciever.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Reciever.java
@@ -13,6 +13,8 @@ public class Reciever  implements Serializable {
     /* 国家 */
     @NotBlank(message = "国家不能为空")
     private String country;
+
+    private String countryName;
     /* 姓名 */
     @NotBlank(message = "收件人不能为空")
     private String name;
@@ -22,10 +24,14 @@ public class Reciever  implements Serializable {
     /* 省 */
     @NotBlank(message = "收件省份不能为空")
     private String province;
+
+    private String provinceName;
     /* 市 */
     private String city;
+    private String cityName;
     /* 区 */
     private String county;
+    private String countyName;
     /* 城镇 */
     private String town;
     /* 地址 */
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 5040cfc8f..fd9999534 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
@@ -11,23 +11,29 @@ public class Sender implements Serializable {
     /* 国家 */
     @NotBlank(message = "国家不能为空")
     private String country;
+
+    private String countryName;
     /* 姓名 */
-    @NotBlank(message = "寄件人不能为空")
+    @NotBlank(message = "收件人不能为空")
     private String name;
     /* 电话 */
-    @NotBlank(message = "寄件电话不能为空")
+    @NotBlank(message = "收件电话不能为空")
     private String phone;
     /* 省 */
-    @NotBlank(message = "寄件省份不能为空")
+    @NotBlank(message = "收件省份不能为空")
     private String province;
+
+    private String provinceName;
     /* 市 */
     private String city;
+    private String cityName;
     /* 区 */
     private String county;
+    private String countyName;
     /* 城镇 */
     private String town;
     /* 地址 */
-//    @NotBlank(message = "寄件地址不能为空")
+    @NotBlank(message = "收件地址不能为空")
     private String address;
     /* 邮编 */
     private String postCode;
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 a3d2cfb52..6e85d1110 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
@@ -312,10 +312,18 @@ public class WaybillOrder  implements Serializable {
 
         reciever.setName(dbWaybill.getReceiveName());
         reciever.setPhone(dbWaybill.getReceiveMobile());
+
         reciever.setCountry(dbWaybill.getReceiveCountry());
+        reciever.setCountryName(dbWaybill.getReceiveCountryName());
+
         reciever.setProvince(dbWaybill.getReceiveProvince());
+        reciever.setProvinceName(dbWaybill.getReceiveProvinceName());
+
         reciever.setCity(dbWaybill.getReceiveCity());
+        reciever.setCityName(dbWaybill.getReceiveCityName());
+
         reciever.setCounty(dbWaybill.getReceiveCounty());
+
         reciever.setAddress(dbWaybill.getReceiveAddress());
         reciever.setPostCode(dbWaybill.getReceivePostcode());
         reciever.setCompany(dbWaybill.getReceiveCompany());
@@ -325,9 +333,16 @@ public class WaybillOrder  implements Serializable {
         Sender sender = new Sender();
         sender.setName(dbWaybill.getSendName());
         sender.setPhone(dbWaybill.getSendMobile());
+
         sender.setCountry(dbWaybill.getSendCountry());
+        sender.setCountryName(dbWaybill.getSendCountryName());
+
         sender.setProvince(dbWaybill.getSendProvince());
+        sender.setProvinceName(dbWaybill.getSendProvinceName());
+
         sender.setCity(dbWaybill.getSendCity());
+        sender.setCityName(dbWaybill.getSendCityName());
+
         sender.setCounty(dbWaybill.getSendCounty());
         sender.setAddress(dbWaybill.getSendAddress());
         sender.setPostCode(dbWaybill.getSendPostcode());