diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 02e10bff5..e55b7c41e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -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()); diff --git a/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx b/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx index b08c1b47a..5b4dfddbd 100644 Binary files a/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx and b/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx differ diff --git a/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx b/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx index ef0c68f78..9955a0589 100644 Binary files a/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx and b/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx differ diff --git a/emis-biz/src/main/resources/tpl/ws_ls_in_tpl.docx b/emis-biz/src/main/resources/tpl/ws_ls_in_tpl.docx index acb4b121a..1ef784dec 100644 Binary files a/emis-biz/src/main/resources/tpl/ws_ls_in_tpl.docx and b/emis-biz/src/main/resources/tpl/ws_ls_in_tpl.docx differ