From 076c2d7927aff87d4c339db79f982406cd9ec9fe Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 7 Jun 2024 07:35:13 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/web/emis/EmisWaybillController.java    |  4 ++--
 .../com/xdadan/erp/emis/service/EmisBaseService.java  | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 77284a234..563e00f92 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -759,7 +759,7 @@ public class EmisWaybillController extends EmisBaseController
     }
 
     @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)){
@@ -769,7 +769,7 @@ public class EmisWaybillController extends EmisBaseController
         if(!StringUtils.isEmpty(billCode)){
             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();
                 printItem.put("billCode",billCode);
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 2a0718e77..2af84d91a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -537,7 +537,7 @@ public class EmisBaseService {
       * @param printType
       * @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)) {
              return null;
          }
@@ -751,7 +751,14 @@ public class EmisBaseService {
 
          String empName="LP";
          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){
              // 非session 用户打印