|
@@ -3496,7 +3496,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
waybillOrderDetailResp.setDriverPhone(billOrder.getDriverPhone());
|
|
waybillOrderDetailResp.setDriverPhone(billOrder.getDriverPhone());
|
|
|
waybillOrderDetailResp.setDriverIdCard(billOrder.getDriverIdcard());
|
|
waybillOrderDetailResp.setDriverIdCard(billOrder.getDriverIdcard());
|
|
|
if (Objects.nonNull(kwpGoods)){
|
|
if (Objects.nonNull(kwpGoods)){
|
|
|
- SysDictResDto sysDictResDto = dictValueAndDictResDtoMap.getOrDefault(goods.getGoodsType(), new SysDictResDto());
|
|
|
|
|
|
|
+ SysDictResDto sysDictResDto = dictValueAndDictResDtoMap.getOrDefault(kwpGoods.getGoodsType(), new SysDictResDto());
|
|
|
waybillOrderDetailResp.setGoodsName(kwpGoods.getName()+ "/" +sysDictResDto.getLabel()+"/"+ kwpGoods.getSpec());
|
|
waybillOrderDetailResp.setGoodsName(kwpGoods.getName()+ "/" +sysDictResDto.getLabel()+"/"+ kwpGoods.getSpec());
|
|
|
}
|
|
}
|
|
|
KwtWaybillOrderAddress loadAdd = keyAndAddressMap.getOrDefault(billOrder.getId() + "-" + AddressTypeEnum.SHIPMENT.getCode(), new KwtWaybillOrderAddress());
|
|
KwtWaybillOrderAddress loadAdd = keyAndAddressMap.getOrDefault(billOrder.getId() + "-" + AddressTypeEnum.SHIPMENT.getCode(), new KwtWaybillOrderAddress());
|