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-15 07:48:03 +08:00
parent 4d9a5ce66c
commit 0f1fb24b64
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java
View File

@ -66,9 +66,13 @@ public class EmisCustomerAddressController extends BaseController
{ {
// 需要限制，除总部外，只能查看站点自有数据 // 需要限制，除总部外，只能查看站点自有数据
startPage(); startPage();
if(!getLoginUser().getUser().isTopSite()) { // if(!getLoginUser().getUser().isTopSite()) {
// }
if(StringUtils.isEmpty(emisCustomerAddress.getUseSiteCode())) {
emisCustomerAddress.setUseSiteCode(getLoginUser().getUser().getOwnerSiteCode()); emisCustomerAddress.setUseSiteCode(getLoginUser().getUser().getOwnerSiteCode());
} }
List<EmisCustomerAddress> list = emisCustomerAddressService.selectEmisCustomerAddressList(emisCustomerAddress); List<EmisCustomerAddress> list = emisCustomerAddressService.selectEmisCustomerAddressList(emisCustomerAddress);
return getDataTable(list); return getDataTable(list);
} }

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -204,7 +204,7 @@ public class EmisBaseService {
order.put("ext_data", "{\"k1\":\"阿尔巴尼亚\",\"k2\":\"阿尔巴尼亚快递\",\"k3\":\"阿尔巴尼亚国际特快\",\"k4\":\"1-10工作日\",\"k5\":\"阿尔AL\",\"k6\":\"山东淄博-阿尔巴尼亚地拉那\"}"); order.put("ext_data", "{\"k1\":\"阿尔巴尼亚\",\"k2\":\"阿尔巴尼亚快递\",\"k3\":\"阿尔巴尼亚国际特快\",\"k4\":\"1-10工作日\",\"k5\":\"阿尔AL\",\"k6\":\"山东淄博-阿尔巴尼亚地拉那\"}");
// order.put("sendPersonAndMobile", "Vancouver"+" "+"1604-683-1088"); // order.put("sendPersonAndMobile", "Vancouver"+" "+"1604-683-1088");
order.put("goods_info", "日常用品"); order.put("goods_info", "日常用品");
order.put("parcel_qty", "1"); order.put("parcel_qty", 1);
order.put("create_day", "2023-12-30"); order.put("create_day", "2023-12-30");
if(StringUtils.isEmpty(waybill.getBlPrint())) { if(StringUtils.isEmpty(waybill.getBlPrint())) {