🐛 导入运单地点名称为空时司机端回退显示详细地址
This commit is contained in:
+6
-4
@@ -632,10 +632,12 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
|
||||
DriverWaybillCardVO card = new DriverWaybillCardVO();
|
||||
card.setId(waybill.getId());
|
||||
card.setWaybillNo(waybill.getWaybillNo());
|
||||
card.setFromName(Func.toStr(waybill.getDepartureName(), ""));
|
||||
card.setToName(Func.toStr(waybill.getArrivalName(), ""));
|
||||
card.setFromAddress(Func.toStr(waybill.getDepartureAddress(), card.getFromName()));
|
||||
card.setToAddress(Func.toStr(waybill.getArrivalAddress(), card.getToName()));
|
||||
// 批量导入的运单只有发货/到货地址、没有地点名称,名称为空时回退到地址,
|
||||
// 否则司机端首页、运单列表与打卡页的地点位置都是空的
|
||||
card.setFromName(Func.toStrWithEmpty(waybill.getDepartureName(), Func.toStr(waybill.getDepartureAddress(), "")));
|
||||
card.setToName(Func.toStrWithEmpty(waybill.getArrivalName(), Func.toStr(waybill.getArrivalAddress(), "")));
|
||||
card.setFromAddress(Func.toStrWithEmpty(waybill.getDepartureAddress(), card.getFromName()));
|
||||
card.setToAddress(Func.toStrWithEmpty(waybill.getArrivalAddress(), card.getToName()));
|
||||
card.setCargoNames(splitCargoNames(waybill.getCargoName()));
|
||||
card.setCargoCategory(Func.toStr(waybill.getCargoType(), ""));
|
||||
card.setWeight(formatWeight(waybill.getQuantity(), waybill.getQuantityUnit()));
|
||||
|
||||
Reference in New Issue
Block a user