|
@@ -1025,11 +1025,12 @@ public class KwtTransportCommonService {
|
|
|
add(CarWaybillEnum.APPROVAL_PASS.getCode());
|
|
add(CarWaybillEnum.APPROVAL_PASS.getCode());
|
|
|
}};
|
|
}};
|
|
|
// orderFinishVO.setNumber(waybillOrderCount == null ? NumberConstant.ZERO : waybillOrderCount.getTotalComplete());
|
|
// orderFinishVO.setNumber(waybillOrderCount == null ? NumberConstant.ZERO : waybillOrderCount.getTotalComplete());
|
|
|
- orderFinishVO.setNumber(waybillOrderSubtaskMapper.selectCount(
|
|
|
|
|
|
|
+ /*orderFinishVO.setNumber(waybillOrderSubtaskMapper.selectCount(
|
|
|
new LambdaQueryWrapper<KwtWaybillOrderSubtask>()
|
|
new LambdaQueryWrapper<KwtWaybillOrderSubtask>()
|
|
|
.eq(KwtWaybillOrderSubtask::getLOrderId, Long.parseLong(orderId))
|
|
.eq(KwtWaybillOrderSubtask::getLOrderId, Long.parseLong(orderId))
|
|
|
.eq(KwtWaybillOrderSubtask::getDelFlag, 0)
|
|
.eq(KwtWaybillOrderSubtask::getDelFlag, 0)
|
|
|
- .in(KwtWaybillOrderSubtask::getStatus, orderStatus)).intValue());
|
|
|
|
|
|
|
+ .in(KwtWaybillOrderSubtask::getStatus, orderStatus)).intValue());*/
|
|
|
|
|
+ orderFinishVO.setNumber(logisticsOrder.getTotalTake());
|
|
|
orderFinishVO.setUnit(logisticsOrder.getUnit());
|
|
orderFinishVO.setUnit(logisticsOrder.getUnit());
|
|
|
orderFinishVO.setUnitName(unitMap != null ? unitMap.get(logisticsOrder.getUnit()) : null);
|
|
orderFinishVO.setUnitName(unitMap != null ? unitMap.get(logisticsOrder.getUnit()) : null);
|
|
|
orderFinishVO.setAmount(logisticsOrder.getAmount());
|
|
orderFinishVO.setAmount(logisticsOrder.getAmount());
|