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 2025-01-21 09:27:08 +08:00
parent a273ed3d78
commit 7c09dcbb98
4 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -4286,6 +4286,24 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
fillMap.put("wsAddress", emisWaybillOld.getIntoWarehouseAddress());
fillMap.put("salesmen", emisWaybillOld.getSalesmen());
String salesmenPhone="";
if(!StringUtils.isEmpty(emisWaybillOld.getSalesmen())){
SysUser salesmenUser = getEmisStaffByEmpName(emisWaybillOld.getSalesmen());
if (salesmenUser != null) {
salesmenPhone=salesmenUser.getPhonenumber();
}
}
fillMap.put("salesmenPhone", salesmenPhone);
fillMap.put("orderRemark", emisWaybillOld.getOrderRemark());
if(!StringUtils.isEmpty(emisWaybillOld.getPackType())) {
String packTypeName = DictUtils.getDictLabel("emis_tab_packing_type", emisWaybillOld.getPackType());
fillMap.put("packTypeName", packTypeName);
}else{
fillMap.put("packTypeName", "");
}
fillMap.put("sendProvinceName", emisWaybillOld.getSendProvinceName());
fillMap.put("sendCityName", emisWaybillOld.getSendCityName());
@ -4486,6 +4504,22 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
fillMap.put("wsAddress", emisWaybillOld.getIntoWarehouseAddress());
fillMap.put("salesmen", emisWaybillOld.getSalesmen());
String salesmenPhone="";
if(!StringUtils.isEmpty(emisWaybillOld.getSalesmen())){
SysUser salesmenUser = getEmisStaffByEmpName(emisWaybillOld.getSalesmen());
if (salesmenUser != null) {
salesmenPhone=salesmenUser.getPhonenumber();
}
}
fillMap.put("salesmenPhone", salesmenPhone);
fillMap.put("orderRemark", emisWaybillOld.getOrderRemark());
if(!StringUtils.isEmpty(emisWaybillOld.getPackType())) {
String packTypeName = DictUtils.getDictLabel("emis_tab_packing_type", emisWaybillOld.getPackType());
fillMap.put("packTypeName", packTypeName);
}else{
fillMap.put("packTypeName", "");
}
fillMap.put("sendProvinceName", emisWaybillOld.getSendProvinceName());
fillMap.put("sendCityName", emisWaybillOld.getSendCityName());

BIN
emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx
View File

Binary file not shown.

BIN
emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx
View File

Binary file not shown.

BIN
emis-biz/src/main/resources/tpl/ws_ls_in_tpl.docx
View File

Binary file not shown.