aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-17 08:02:38 +08:00
parent 5a13ddf5ee
commit 18948077e1
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Reciever.java
View File

@ -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;
/* 地址 */

14
emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Sender.java
View File

@ -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;

15
emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
View File

@ -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());