|
@@ -417,7 +417,7 @@ public class WaybillManagementService {
|
|
|
// 执行查询
|
|
// 执行查询
|
|
|
for (SckwWaybillOrder sckwWaybillOrder : list) {
|
|
for (SckwWaybillOrder sckwWaybillOrder : list) {
|
|
|
WaybillBoardListVO waybillBoardListVO = new WaybillBoardListVO();
|
|
WaybillBoardListVO waybillBoardListVO = new WaybillBoardListVO();
|
|
|
- waybillBoardListVO.setWOrderId(String.valueOf(sckwWaybillOrder.getWOrderId()));
|
|
|
|
|
|
|
+ waybillBoardListVO.setWOrderId(sckwWaybillOrder.getWOrderId() != null ? String.valueOf(sckwWaybillOrder.getWOrderId()) : String.valueOf(sckwWaybillOrder.get_id()));
|
|
|
waybillBoardListVO.setWOrderNo(sckwWaybillOrder.getWOrderNo() == null ? null : sckwWaybillOrder.getWOrderNo());
|
|
waybillBoardListVO.setWOrderNo(sckwWaybillOrder.getWOrderNo() == null ? null : sckwWaybillOrder.getWOrderNo());
|
|
|
waybillBoardListVO.setStatus(String.valueOf(sckwWaybillOrder.getStatus()));
|
|
waybillBoardListVO.setStatus(String.valueOf(sckwWaybillOrder.getStatus()));
|
|
|
waybillBoardListVO.setType(String.valueOf(sckwWaybillOrder.getType()));
|
|
waybillBoardListVO.setType(String.valueOf(sckwWaybillOrder.getType()));
|