|
|
|
@ -907,11 +907,11 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
|
|
|
|
|
item.setDeliveryWay(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_DELIVERY_WAY, item.getDeliveryWay())); |
|
|
|
|
item.setUrgency(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_URGENCY, item.getUrgency())); |
|
|
|
|
item.setTransportType(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_TRANSPORT_TYPE, item.getTransportType())); |
|
|
|
|
item.setPickupCompleteOrNotStr(item.getPickupCompleteOrNot() == 1 ? "是" : "否"); |
|
|
|
|
item.setTrunklineCompleteOrNotStr(item.getTrunklineCompleteOrNot() == 1 ? "是" : "否"); |
|
|
|
|
item.setPickupCompleteOrNotStr(Objects.isNull(item.getPickupCompleteOrNot())?"否":item.getPickupCompleteOrNot() == 1 ? "是" : "否"); |
|
|
|
|
item.setTrunklineCompleteOrNotStr(Objects.isNull(item.getTrunklineCompleteOrNot())?"否":item.getTrunklineCompleteOrNot() == 1 ? "是" : "否"); |
|
|
|
|
item.setWaybillStatus(WaybillStatusEnum.getValue(item.getWaybillStatus())); |
|
|
|
|
item.setFreezeStatusStr(item.getFreezeStatus() == 1 ? "是" : "否"); |
|
|
|
|
item.setAbolishStatusStr(item.getAbolishStatus() == 1 ? "是" : "否"); |
|
|
|
|
item.setFreezeStatusStr(Objects.isNull(item.getFreezeStatus())?"否":item.getFreezeStatus() == 1 ? "是" : "否"); |
|
|
|
|
item.setAbolishStatusStr(Objects.isNull(item.getAbolishStatus())?"否":item.getAbolishStatus() == 1 ? "是" : "否"); |
|
|
|
|
}); |
|
|
|
|
return list; |
|
|
|
|
} |
|
|
|
|