chenxiaofei 6 месяцев назад
Родитель
Сommit
d091f8608a

+ 2 - 2
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -3533,9 +3533,9 @@ public class KwtWaybillOrderV1Service {
             waybillOrderDetailResp.setGoodsName(kwpGoods.getName()+ "/" +sysDictResDto.getLabel()+"/"+ kwpGoods.getSpec());
         }
         KwtWaybillOrderAddress loadAdd = keyAndAddressMap.getOrDefault(billOrder.getId() + "-" + AddressTypeEnum.SHIPMENT.getCode(), new KwtWaybillOrderAddress());
-        waybillOrderDetailResp.setLoadAddress(loadAdd.getDetailAddress());
+        waybillOrderDetailResp.setLoadAddress(loadAdd.getCityName()+loadAdd.getDetailAddress());
         KwtWaybillOrderAddress unLoadAdd = keyAndAddressMap.getOrDefault(billOrder.getId() + "-" + AddressTypeEnum.TAKE.getCode(), new KwtWaybillOrderAddress());
-        waybillOrderDetailResp.setUnloadAddress(unLoadAdd.getDetailAddress());
+        waybillOrderDetailResp.setUnloadAddress(unLoadAdd.getCityName()+unLoadAdd.getDetailAddress());
 
         //预计里程
         double distanceKm = DistanceUtils.calculateDistance(