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-08-25 00:07:49 +08:00
parent 7cdfa0404b
commit 6d0f3816b1
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1767,7 +1767,7 @@ public class EmisBaseService {
order.put("bagNo",emisTmsPack.getPackNo()); order.put("bagNo",emisTmsPack.getPackNo());
order.put("ydSn",emisTmsPack.getPackNo()); order.put("ydSn",emisTmsPack.getPackNo());
order.put("logisticNo",emisTmsPack.getPackNo()); order.put("logisticNo",emisTmsPack.getPackNo());
order.put("printStatus", emisTmsPack.getPrintStatus()); order.put("printStatus", WaybillHelper.removeUnSeeChar(emisTmsPack.getPrintStatus()));
return order; return order;
} }
@ -1841,7 +1841,7 @@ public class EmisBaseService {
k7=emisTransProduct.getProdNameEn(); k7=emisTransProduct.getProdNameEn();
} }
order.put("agingFlag", agingFlag); order.put("agingFlag", WaybillHelper.removeUnSeeChar(agingFlag));
order.put("kdgs", "TANEX"); order.put("kdgs", "TANEX");
@ -1877,8 +1877,8 @@ public class EmisBaseService {
// } // }
// } // }
order.put("packageWJC", packageWJC); order.put("packageWJC", WaybillHelper.removeUnSeeChar(packageWJC));
order.put("package3dm", package3dm); order.put("package3dm", WaybillHelper.removeUnSeeChar(package3dm));
// 如果是子单收件人信息需要加密 // 如果是子单收件人信息需要加密
String address= WaybillHelper.removeUnSeeChar(waybill.getReceiveAddress()); String address= WaybillHelper.removeUnSeeChar(waybill.getReceiveAddress());
@ -1895,7 +1895,7 @@ public class EmisBaseService {
// company=Convert.chineseNameFirst(company); // company=Convert.chineseNameFirst(company);
} }
order.put("address", address); order.put("address", WaybillHelper.removeUnSeeChar(address));
// 地址拆分为多行 // 地址拆分为多行
String[] addrArr=WordUtils.wrap(address,48).split("\n"); String[] addrArr=WordUtils.wrap(address,48).split("\n");
for(int i=0;i<4;i++) { for(int i=0;i<4;i++) {
@ -1906,9 +1906,9 @@ public class EmisBaseService {
} }
} }
order.put("company", company); order.put("company", WaybillHelper.removeUnSeeChar(company));
order.put("mobile", mobile); order.put("mobile", WaybillHelper.removeUnSeeChar(mobile));
order.put("consignee", consignee); order.put("consignee", WaybillHelper.removeUnSeeChar(consignee));
String custName=""; String custName="";
if ( "2".equals(waybill.getPaymentType()) || "4".equals(waybill.getPaymentType()) || "5".equals(waybill.getPaymentType()) ) { if ( "2".equals(waybill.getPaymentType()) || "4".equals(waybill.getPaymentType()) || "5".equals(waybill.getPaymentType()) ) {
@ -1920,7 +1920,7 @@ public class EmisBaseService {
order.put("custName", WaybillHelper.removeUnSeeChar(custName)); order.put("custName", WaybillHelper.removeUnSeeChar(custName));
String sendAddress=WaybillHelper.removeUnSeeChar(waybill.getSendAddress()); String sendAddress=WaybillHelper.removeUnSeeChar(waybill.getSendAddress());
order.put("sendAddress",sendAddress ); order.put("sendAddress",WaybillHelper.removeUnSeeChar(sendAddress) );
// 地址拆分为多行 // 地址拆分为多行
String[] sAddrArr=WordUtils.wrap(sendAddress,48).split("\n"); String[] sAddrArr=WordUtils.wrap(sendAddress,48).split("\n");
@ -1928,7 +1928,7 @@ public class EmisBaseService {
try{ try{
order.put("sendAddress"+(i+1),sAddrArr[i]); order.put("sendAddress"+(i+1),sAddrArr[i]);
}catch (Exception ex){ }catch (Exception ex){
order.put("sendAddress"+(i+1),""); order.put("sendAddress"+(i+1)," ");
} }
} }
@ -1969,44 +1969,44 @@ public class EmisBaseService {
extData.put("k1",waybill.getReceiveCountryName()); extData.put("k1",waybill.getReceiveCountryName());
extData.put("k2",waybill.getTransLineTypeName()); extData.put("k2",waybill.getTransLineTypeName());
extData.put("k3",waybill.getProductTypeName()); extData.put("k3",waybill.getProductTypeName());
extData.put("k4",waybill.getTimeType()); extData.put("k4",WaybillHelper.removeUnSeeChar(waybill.getTimeType()));
extData.put("k5",packageWJC); extData.put("k5",WaybillHelper.removeUnSeeChar(packageWJC));
extData.put("k6",waybill.getThirdCode()); extData.put("k6",WaybillHelper.removeUnSeeChar(waybill.getThirdCode()));
extData.put("k7",k7); extData.put("k7",WaybillHelper.removeUnSeeChar(k7));
extData.put("k8",sendSite.getSiteNameEn()); extData.put("k8",WaybillHelper.removeUnSeeChar(sendSite.getSiteNameEn()));
extData.put("k10",waybill.getSendSiteName()); extData.put("k10",WaybillHelper.removeUnSeeChar(waybill.getSendSiteName()));
extData.put("k9",destSite.getSiteNameEn()); extData.put("k9",WaybillHelper.removeUnSeeChar(destSite.getSiteNameEn()));
extData.put("k11",destSite.getSiteName()); extData.put("k11",WaybillHelper.removeUnSeeChar(destSite.getSiteName()));
extData.put("k12",waybill.getDestinationName()); extData.put("k12",WaybillHelper.removeUnSeeChar(waybill.getDestinationName()));
extData.put("k13",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,waybill.getEstimateDate()) ); extData.put("k13",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,waybill.getEstimateDate()) );
extData.put("k14",waybill.getSalesmen()); extData.put("k14",WaybillHelper.removeUnSeeChar(waybill.getSalesmen()));
extData.put("k15",waybill.getPayee()); extData.put("k15",WaybillHelper.removeUnSeeChar(waybill.getPayee()));
String customsEclaration=""; String customsEclaration="";
if(!StringUtils.isEmpty(waybill.getCustomsEclaration())){ if(!StringUtils.isEmpty(waybill.getCustomsEclaration())){
customsEclaration=DictUtils.getDictLabel("emis_declare_mode",waybill.getCustomsEclaration()); customsEclaration=DictUtils.getDictLabel("emis_declare_mode",waybill.getCustomsEclaration());
} }
extData.put("k16",customsEclaration); extData.put("k16",WaybillHelper.removeUnSeeChar(customsEclaration));
String customsClear=""; String customsClear="";
if(!StringUtils.isEmpty(waybill.getCustomsClear())){ if(!StringUtils.isEmpty(waybill.getCustomsClear())){
customsClear=DictUtils.getDictLabel("emis_customs_clear",waybill.getCustomsClear()); customsClear=DictUtils.getDictLabel("emis_customs_clear",waybill.getCustomsClear());
} }
extData.put("k17",customsClear); extData.put("k17",WaybillHelper.removeUnSeeChar(customsClear));
extData.put("k18",destSite.getSizeCode3()); extData.put("k18",WaybillHelper.removeUnSeeChar(destSite.getSizeCode3()));
String pickupMethod=""; String pickupMethod="";
if(!StringUtils.isEmpty(waybill.getPickupMethod())){ if(!StringUtils.isEmpty(waybill.getPickupMethod())){
pickupMethod=DictUtils.getDictLabel("emis_qujian_fangshi",waybill.getPickupMethod()); pickupMethod=DictUtils.getDictLabel("emis_qujian_fangshi",waybill.getPickupMethod());
} }
extData.put("pickupMethod",pickupMethod); extData.put("pickupMethod",WaybillHelper.removeUnSeeChar(pickupMethod));
@ -2125,22 +2125,22 @@ public class EmisBaseService {
} }
} }
order.put("packType",packType); order.put("packType",WaybillHelper.removeUnSeeChar(packType));
order.put("packTypeEn",packTypeEn); order.put("packTypeEn",WaybillHelper.removeUnSeeChar(packTypeEn));
// 货值 // 货值
String realValue=waybill.getRealValue(); String realValue=waybill.getRealValue();
if(StringUtils.isEmpty(realValue)){ if(StringUtils.isEmpty(realValue)){
realValue=" "; realValue=" ";
} }
order.put("realValue",realValue); order.put("realValue",WaybillHelper.removeUnSeeChar(realValue));
// 附加信息 // 附加信息
String extInfo=waybill.getExtInfo(); String extInfo=waybill.getExtInfo();
if(StringUtils.isEmpty(extInfo)){ if(StringUtils.isEmpty(extInfo)){
extInfo=" "; extInfo=" ";
} }
order.put("extInfo",extInfo); order.put("extInfo",WaybillHelper.removeUnSeeChar(extInfo));
String paymentType=""; String paymentType="";
@ -2151,7 +2151,7 @@ public class EmisBaseService {
order.put("printDay", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date())); order.put("printDay", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date()));
order.put("printDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date())); order.put("printDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date()));
order.put("printMan", empName); order.put("printMan", WaybillHelper.removeUnSeeChar(empName));
order.put("printCount", waybill.getPrintCount()+1); order.put("printCount", waybill.getPrintCount()+1);