|
@@ -1268,11 +1268,14 @@ public class TqQuotationServiceImpl extends ServiceImpl<TqQuotationMapper, TqQuo
|
|
|
// 2.2 规格信息
|
|
|
map.put("specifications", specifications);
|
|
|
// 2.3 规格统计信息
|
|
|
+ String targetPort = "";
|
|
|
if (isNotBlank(tqQuotation.getTargetPort())){
|
|
|
- map.put("targetPort", "- To " + tqQuotation.getTargetPort());
|
|
|
+ targetPort = DictUtils.getInternationalDictLabel("target_port", tqQuotation.getTargetPort());
|
|
|
+ //装船口岸需要字典
|
|
|
+ map.put("targetPort", "- To " + targetPort);
|
|
|
}
|
|
|
if (isNotBlank(tqQuotation.getTradeType())){
|
|
|
- map.put("tradeType", "(" + DictUtils.getInternationalDictLabel("contract_trade_terms", tqQuotation.getTradeType()) + " " + tqQuotation.getTargetPort() + ")");
|
|
|
+ map.put("tradeType", "(" + DictUtils.getInternationalDictLabel("contract_trade_terms", tqQuotation.getTradeType()) + " " + targetPort + ")");
|
|
|
}
|
|
|
map.put("freightPrice", currencyName + format.format(totalFreight));
|
|
|
totalPrice = totalPrice.add(totalFreight);
|