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-06-07 07:35:13 +08:00
parent f39d976a59
commit 076c2d7927
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -759,7 +759,7 @@ public class EmisWaybillController extends EmisBaseController
} }
@RequestMapping("/getPrintDataByPrinter") @RequestMapping("/getPrintDataByPrinter")
public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType) public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType,String printManCode)
{ {
if(StringUtils.isEmpty(billCode)){ if(StringUtils.isEmpty(billCode)){
@ -769,7 +769,7 @@ public class EmisWaybillController extends EmisBaseController
if(!StringUtils.isEmpty(billCode)){ if(!StringUtils.isEmpty(billCode)){
try { try {
Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange,tplCode, lang, printType); Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange,tplCode, lang, printType,printManCode);
JSONObject printItem = new JSONObject(); JSONObject printItem = new JSONObject();
printItem.put("billCode",billCode); printItem.put("billCode",billCode);

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

@ -537,7 +537,7 @@ public class EmisBaseService {
* @param printType * @param printType
* @return * @return
*/ */
public Map<String,Object> getWaybillPrintOrder(String billCode, String billCodeRange, String tplCode,String lang, String printType) { public Map<String,Object> getWaybillPrintOrder(String billCode, String billCodeRange, String tplCode,String lang, String printType,String printManCode) {
if (StringUtils.isEmpty(billCode)) { if (StringUtils.isEmpty(billCode)) {
return null; return null;
} }
@ -751,7 +751,14 @@ public class EmisBaseService {
String empName="LP"; String empName="LP";
try { try {
empName = getCurrentUser().getEmpName(); if(StringUtils.isEmpty(printManCode)) {
empName = getCurrentUser().getEmpName();
}else{
SysUser empUser=getEmisStaffByCode(printManCode);
if(empUser!=null) {
empName = empUser.getEmpName();
}
}
} }
catch(Exception ex){ catch(Exception ex){
// 非session 用户打印 // 非session 用户打印