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 9fe71dc56..bddcb6836 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
@@ -635,6 +635,7 @@ public class EmisWaybillController extends EmisBaseController
         return AjaxResult.error("获取失败");
     }
 
+    @Log(title = "APP获取面单信息", businessType = BusinessType.OTHER)
     @GetMapping("/realGetPrintList")
     public AjaxResult realGetPrintList(String billCode, String billCodeRange,String tplCode, String lang, String printType)
     {
@@ -653,19 +654,44 @@ public class EmisWaybillController extends EmisBaseController
         if(!StringUtils.isEmpty(billCode)){
             try {
 
+
                 JSONArray jArr = new JSONArray();
                 String printManCode=getLoginUser().getUser().getEmpCode();
 
-                // 先检查运单是否存在
-                String tplCodeStr=WaybillHelper.formatQueryValue(printType);
-                String billCodeArr[]=tplCodeStr.split(",");
-                if(billCodeArr.length>0){
+                // 确定是否打子单
 
+                JSONArray fileArrAll = new JSONArray();
+                String tplCodeStr=WaybillHelper.formatQueryValue(printType);
+                String tplCodeArr[]=tplCodeStr.split(",");
+
+                if(tplCodeArr.length>0){
+                    for (String tpCodeItem:tplCodeArr) {
+                        if("TAN-GC-130".equals(tpCodeItem)) {
+                            // 循环获取主单信息
+                            String billSubCodeAllStr="";
+                            String[] billCodeArr = billCode.split(",");
+                            if(billCodeArr.length>0){
+                                for (String billCodeItem:billCodeArr) {
+                                    EmisWaybill emisWaybill= emisBaseService.getWaybillByBillCode(billCodeItem);
+                                    billSubCodeAllStr=billSubCodeAllStr+emisWaybill.getBillCodeSub()+",";
+                                }
+                            }
+
+                            String strArry = PrintUtils.getPdfByBillCode(billSubCodeAllStr, tpCodeItem, printManCode);
+                            JSONArray fileArr = JSONArray.parseArray(strArry);
+                            fileArrAll.addAll(fileArr);
+                        }else{
+                            // 直接获取
+                            String strArry = PrintUtils.getPdfByBillCode(billCode, tpCodeItem, printManCode);
+                            JSONArray fileArr = JSONArray.parseArray(strArry);
+                            fileArrAll.addAll(fileArr);
+                        }
+                    }
                 }
 
-                 String strArry=PrintUtils.getPdfByBillCode(billCode,tplCodeStr,printManCode);
-                JSONArray fileArr = JSONArray.parseArray(strArry);
-                for(Object objFile:fileArr) {
+//                String strArry=PrintUtils.getPdfByBillCode(billCode,tplCodeStr,printManCode);
+//                JSONArray fileArr = JSONArray.parseArray(strArry);
+                for(Object objFile:fileArrAll) {
                     JSONObject jObjFileItem = (JSONObject) objFile;
                     String result = jObjFileItem.getString("result");
                     String billCodeItem = jObjFileItem.getString("billCodeItem");
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 c980a08ab..c23e7b843 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
@@ -1291,7 +1291,6 @@ public class EmisBaseService {
          extData.put("k8",sendSite.getSiteNameEn());
          extData.put("k10",waybill.getSendSiteName());
 
-
          EmisSite destSite = getSiteByCode(waybill.getDispatchUnderlingSiteCode());
          extData.put("k9",destSite.getSiteNameEn());
          extData.put("k11",destSite.getSiteName());