From 1f0638a18293a89ab181d83286936bd08280a6c8 Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 26 Jun 2024 12:37:15 +0800 Subject: [PATCH] md --- .../java/com/xdadan/erp/web/emis/EmisWaybillController.java | 5 +++++ .../java/com/xdadan/erp/emis/service/EmisBaseService.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 372a501b4..9fe71dc56 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 @@ -658,6 +658,11 @@ public class EmisWaybillController extends EmisBaseController // 先检查运单是否存在 String tplCodeStr=WaybillHelper.formatQueryValue(printType); + String billCodeArr[]=tplCodeStr.split(","); + if(billCodeArr.length>0){ + + } + String strArry=PrintUtils.getPdfByBillCode(billCode,tplCodeStr,printManCode); JSONArray fileArr = JSONArray.parseArray(strArry); for(Object objFile:fileArr) { 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 dab37d0b5..c980a08ab 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 @@ -1289,7 +1289,7 @@ public class EmisBaseService { extData.put("k7",emisTransProduct.getProdNameEn()); EmisSite sendSite = getSiteByCode(waybill.getSendSiteCode()); extData.put("k8",sendSite.getSiteNameEn()); - extData.put("k10",sendSite.getSiteName()); + extData.put("k10",waybill.getSendSiteName()); EmisSite destSite = getSiteByCode(waybill.getDispatchUnderlingSiteCode());