md
This commit is contained in:
parent
375d95283e
commit
17592e1c43
@ -592,6 +592,16 @@ public class EmisBaseService {
|
|||||||
// k8 - 寄件网点(英文)
|
// k8 - 寄件网点(英文)
|
||||||
// k9 - 目的网点(英文)
|
// k9 - 目的网点(英文)
|
||||||
|
|
||||||
|
// k10 -寄件网点(中文)
|
||||||
|
// k11 -目的网点(中文)
|
||||||
|
// k12 -目的地(中文)
|
||||||
|
// k13 -预计到达时间
|
||||||
|
// k14 -销售联系人
|
||||||
|
// k15 -回款联系人
|
||||||
|
// k16 -报关方式
|
||||||
|
// k17 -清关方式
|
||||||
|
|
||||||
|
|
||||||
JSONObject extData = new JSONObject();
|
JSONObject extData = new JSONObject();
|
||||||
extData.put("k1",waybill.getReceiveCountryName());
|
extData.put("k1",waybill.getReceiveCountryName());
|
||||||
extData.put("k2",waybill.getTransLineTypeName());
|
extData.put("k2",waybill.getTransLineTypeName());
|
||||||
@ -603,8 +613,42 @@ 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());
|
||||||
|
|
||||||
|
|
||||||
EmisSite destSite = getSiteByCode(waybill.getDispatchUnderlingSiteCode());
|
EmisSite destSite = getSiteByCode(waybill.getDispatchUnderlingSiteCode());
|
||||||
extData.put("k9",destSite.getSiteNameEn());
|
extData.put("k9",destSite.getSiteNameEn());
|
||||||
|
extData.put("k11",destSite.getSiteName());
|
||||||
|
|
||||||
|
extData.put("k12",waybill.getDestinationName());
|
||||||
|
extData.put("k13",waybill.getEstimateDate());
|
||||||
|
extData.put("k14",waybill.getSalesmen());
|
||||||
|
extData.put("k15",waybill.getPayee());
|
||||||
|
|
||||||
|
String customsEclaration="";
|
||||||
|
if(!StringUtils.isEmpty(waybill.getCustomsEclaration())){
|
||||||
|
customsEclaration=DictUtils.getDictLabel("emis_declare_mode",waybill.getCustomsEclaration());
|
||||||
|
}
|
||||||
|
extData.put("k16",customsEclaration);
|
||||||
|
|
||||||
|
|
||||||
|
String customsClear="";
|
||||||
|
if(!StringUtils.isEmpty(waybill.getCustomsClear())){
|
||||||
|
customsClear=DictUtils.getDictLabel("emis_customs_clear",waybill.getCustomsClear());
|
||||||
|
}
|
||||||
|
extData.put("k17",customsClear);
|
||||||
|
|
||||||
|
String pickupMethod="";
|
||||||
|
if(!StringUtils.isEmpty(waybill.getPickupMethod())){
|
||||||
|
pickupMethod=DictUtils.getDictLabel("emis_qujian_fangshi",waybill.getPickupMethod());
|
||||||
|
}
|
||||||
|
extData.put("pickupMethod",pickupMethod);
|
||||||
|
|
||||||
|
|
||||||
|
extData.put("freight",waybill.getFreight());
|
||||||
|
extData.put("volumeWeight",waybill.getVolumeWeight());
|
||||||
|
extData.put("settlementWeight",waybill.getSettlementWeight());
|
||||||
|
extData.put("takePieceEmployeeName",waybill.getTakePieceEmployeeName());
|
||||||
|
|
||||||
|
|
||||||
order.put("extData",extData.toJSONString());
|
order.put("extData",extData.toJSONString());
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user