diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java index faf1bf5f1..89c5be26d 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java @@ -133,6 +133,7 @@ public class EmisCustomerAddressController extends BaseController { String ownerSiteCode = getLoginUser().getUser().getOwnerSiteCode(); emisCustomerAddress.setUseSiteCode(ownerSiteCode); + emisCustomerAddress.setUseSite(getLoginUser().getUser().getOwnerSiteName()); return toAjax(emisCustomerAddressService.insertEmisCustomerAddress(emisCustomerAddress)); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerAddress.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerAddress.java index 93f9e07e3..b7e834941 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerAddress.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerAddress.java @@ -32,13 +32,13 @@ public class EmisCustomerAddress extends BaseEntity private Long userId; /* 客户编码 */ private String customerCode; - /* 客户名称 */ + /* 客户简称 */ private String shortName; /* 地址别名 */ private String alias; /* 地址类型 1-收 2-寄 */ private String addressType; - /* 国家 */ + /* 国家代码 */ private String country; /* 姓名 */ private String name; @@ -63,7 +63,7 @@ public class EmisCustomerAddress extends BaseEntity /* 是否默认 1-是 0-否 */ private String blDefaultFlag; /* 排序 */ - private String orderNum; + private Integer orderNum; /* 使用站点名称 */ private String useSite; /* 使用站点代码 */ @@ -73,7 +73,6 @@ public class EmisCustomerAddress extends BaseEntity /* 更新网点 */ private String updateSite; - private String countryName; private String provinceName; private String cityName;