|
|
@@ -348,8 +348,12 @@ public class WorkerServiceImpl implements WorkerService {
|
|
|
|
|
|
//3.结束当前行程周期(从收车中到出车检查也结束当前行程周期)
|
|
|
WorkCycle workCycle = workCycleService.findCurrentWorkCycle(workOrderParam.getTruckId());
|
|
|
+ workCycle.setOrgId(workOrderParam.getOrgId());
|
|
|
+ workCycle.setOrgName(workOrderParam.getOrgName());
|
|
|
+ workCycle.setShipperId(workOrderParam.getShipperId());
|
|
|
+ workCycle.setShipperName(workOrderParam.getShipperName());
|
|
|
workCycle.setEndTime(LocalDateTime.now());
|
|
|
- BeanUtils.copyProperties(truck, workCycle);
|
|
|
+ workCycle.setTruckId(workOrderParam.getTruckId());
|
|
|
workCycle.setEndTrip(workOrderParam.getEndTrip());
|
|
|
workCycle.setCarNumber(workOrderParam.getCarNumber());
|
|
|
workCycle.setTrailerNumber(workOrderParam.getTrailerNumber());
|