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-26 12:37:15 +08:00
parent 6c540a1bd9
commit 1f0638a182
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -658,6 +658,11 @@ public class EmisWaybillController extends EmisBaseController
// 先检查运单是否存在 // 先检查运单是否存在
String tplCodeStr=WaybillHelper.formatQueryValue(printType); String tplCodeStr=WaybillHelper.formatQueryValue(printType);
String billCodeArr[]=tplCodeStr.split(",");
if(billCodeArr.length>0){
}
String strArry=PrintUtils.getPdfByBillCode(billCode,tplCodeStr,printManCode); String strArry=PrintUtils.getPdfByBillCode(billCode,tplCodeStr,printManCode);
JSONArray fileArr = JSONArray.parseArray(strArry); JSONArray fileArr = JSONArray.parseArray(strArry);
for(Object objFile:fileArr) { for(Object objFile:fileArr) {

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

@ -1289,7 +1289,7 @@ public class EmisBaseService {
extData.put("k7",emisTransProduct.getProdNameEn()); extData.put("k7",emisTransProduct.getProdNameEn());
EmisSite sendSite = getSiteByCode(waybill.getSendSiteCode()); EmisSite sendSite = getSiteByCode(waybill.getSendSiteCode());
extData.put("k8",sendSite.getSiteNameEn()); extData.put("k8",sendSite.getSiteNameEn());
extData.put("k10",sendSite.getSiteName()); extData.put("k10",waybill.getSendSiteName());
EmisSite destSite = getSiteByCode(waybill.getDispatchUnderlingSiteCode()); EmisSite destSite = getSiteByCode(waybill.getDispatchUnderlingSiteCode());