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-30 15:28:28 +08:00
parent f9f8b5a26e
commit 90717b4ec8
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1254,21 +1254,29 @@ public class EmisBaseService {
order.put("agingFlag", agingFlag); order.put("agingFlag", agingFlag);
order.put("kdgs", "TANEX"); order.put("kdgs", "TANEX");
order.put("pdfInfo", waybill.getThirdCode());
String packageWJC=""; // 获取起始网点
String package3dm=""; EmisSite sendSite = getSiteByCode(waybill.getSendSiteCode());
String pdfInfo = waybill.getThirdCode(); // 计算三段码 目的网点2字码+目的地名称
if(!StringUtils.isEmpty(pdfInfo)) { String destSite2Code = "";
pdfInfo = pdfInfo.replace("][", "||"); EmisSite destSite = getSiteByCode(waybill.getDispatchUnderlingSiteCode());
String[] striparr = pdfInfo.split("\\|\\|"); if(destSite!=null){
if(striparr.length == 2) { destSite2Code=destSite.getSizeCode2();
packageWJC = striparr[1].replace("]", "");
package3dm = striparr[0].replace("[", "");
} }
// 目的地名称
EmisDestination destination=getDestinationByCode(waybill.getDestinationCode());
String destName="";
if(destination!=null){
destName=destination.getDestName();
} }
String packageWJC=sendSite.getSiteName()+'-'+destName;
String package3dm=destSite2Code;
String pdfInfo="["+packageWJC+"]["+package3dm+"]";
order.put("pdfInfo", pdfInfo);
order.put("packageWJC", packageWJC); order.put("packageWJC", packageWJC);
order.put("package3dm", package3dm); order.put("package3dm", package3dm);
@ -1334,11 +1342,10 @@ public class EmisBaseService {
extData.put("k6",waybill.getThirdCode()); extData.put("k6",waybill.getThirdCode());
extData.put("k7",emisTransProduct.getProdNameEn()); extData.put("k7",emisTransProduct.getProdNameEn());
EmisSite sendSite = getSiteByCode(waybill.getSendSiteCode());
extData.put("k8",sendSite.getSiteNameEn()); extData.put("k8",sendSite.getSiteNameEn());
extData.put("k10",waybill.getSendSiteName()); extData.put("k10",waybill.getSendSiteName());
EmisSite destSite = getSiteByCode(waybill.getDispatchUnderlingSiteCode());
extData.put("k9",destSite.getSiteNameEn()); extData.put("k9",destSite.getSiteNameEn());
extData.put("k11",destSite.getSiteName()); extData.put("k11",destSite.getSiteName());
@ -1424,7 +1431,11 @@ public class EmisBaseService {
String packTypeEn=""; String packTypeEn="";
if(!StringUtils.isEmpty(waybill.getPackType())){ if(!StringUtils.isEmpty(waybill.getPackType())){
packType=DictUtils.getDictLabel("emis_tab_packing_type",waybill.getPackType()); packType=DictUtils.getDictLabel("emis_tab_packing_type",waybill.getPackType());
try {
packTypeEn= TransUtils.langTrans(packType,"zh-cn","en"); packTypeEn= TransUtils.langTrans(packType,"zh-cn","en");
} catch (Exception e) {
e.printStackTrace();
}
} }
order.put("packType",packType); order.put("packType",packType);
order.put("packTypeEn",packTypeEn); order.put("packTypeEn",packTypeEn);