Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -312,7 +312,7 @@ public class WorkerController {
         WorkOrder workOrderCheck = workOrderService.getById(workOrder.getId());
 
         Truck truck = truckService.getById(workOrderCheck.getTruckId());
-        if (truck.getTmsStatus().equals(TmsTruckStatus.RETURNING)){
+        if (truck.getTmsStatus().equals(TmsTruckStatus.RETURNING)) {
             return new Result(ErrCodeEnum.CAN_NOT_DO_ORDER.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
 
@@ -489,18 +489,24 @@ public class WorkerController {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         WorkOrder workOrder = workOrderService.getById(truckCheckInfo.getOrderId());
+        if (workOrder != null) {
+            workOrder.setEndTripUrl(truckCheckInfo.getTripUrl());
+            workOrder.setEndTrip(truckCheckInfo.getTrip());
+        }
         String utf8Name = userName;
         try {
             utf8Name = URLDecoder.decode(userName, "UTF-8");
         } catch (UnsupportedEncodingException ignored) {
         }
+
         //保存收车检查信息
         truckCheckInfo.setCreater(userId);
         truckCheckInfo.setCreaterName(utf8Name);
         truckCheckInfo.setCreateDate(LocalDateTime.now());
         truckCheckInfoService.save(truckCheckInfo);
+
+
         // 1.车辆进入已经收车状态，3.并记行车日志，4.结束当前行程周期（从收车中到出车检查也结束当前行程周期）
-        workOrder.setEndTrip(truckCheckInfo.getTrip());
         Boolean flag = workerService.finishWork(userId, utf8Name, workOrder);
         return new Result<>(flag);
     }

src/main/java/com/aoyang/tms/service/impl/WorkerServiceImpl.java

@@ -327,35 +327,42 @@ public class WorkerServiceImpl implements WorkerService {
     @Override
     @Transactional
     public Boolean finishWork(Long userId, String userName, WorkOrder workOrderParam) {
+        log.info("workOrderParam:{}", JSON.toJSONString(workOrderParam));
         Boolean flag = true;
         try {
-            WorkOrder workOrder = workOrderService.getById(workOrderParam.getId());
-            if (workOrder != null) {
-                //1.车辆进入已经收车状态
-                Truck truck = truckService.getById(workOrder.getTruckId());
-                //2.上传订单信息
-                workOrder.setWeightingListNo(workOrderParam.getWeightingListNo());
-                workOrder.setWeightingListUrl(workOrderParam.getWeightingListUrl());
-                workOrder.setPiWeight(workOrderParam.getPiWeight());
-                workOrder.setMaoWeight(workOrderParam.getMaoWeight());
-                workOrder.setJingWeight(workOrderParam.getJingWeight());
-                workOrder.setEndTrip(workOrderParam.getEndTrip());
-                workOrder.setEndTripUrl(workOrderParam.getEndTripUrl());
-                workOrderService.updateById(workOrder);
-
-                //3.结束当前行程周期（从收车中到出车检查也结束当前行程周期）
-                WorkCycle workCycle = workCycleService.findCurrentWorkCycle(workOrder.getTruckId());
-                workCycle.setEndTime(LocalDateTime.now());
-                BeanUtils.copyProperties(truck, workCycle);
-                BeanUtils.copyProperties(workOrder, workCycle);
-                workCycle.setEndTrip(workOrderParam.getEndTrip());
-                workCycleService.updateById(workCycle);
-
-                //4 记录日志
-                workOrder.setCreater(userId);
-                workOrder.setCreaterName(userName);
-                workLogService.logWorkCycleInfo(WorkLogTypeEnum.CLOSED, workOrder);
-            }
+            //1.车辆进入已经收车状态
+            Truck truck = truckService.getById(workOrderParam.getTruckId());
+            //2.上传订单信息
+            workOrderParam.setWeightingListNo(workOrderParam.getWeightingListNo());
+            workOrderParam.setWeightingListUrl(workOrderParam.getWeightingListUrl());
+            workOrderParam.setPiWeight(workOrderParam.getPiWeight());
+            workOrderParam.setMaoWeight(workOrderParam.getMaoWeight());
+            workOrderParam.setJingWeight(workOrderParam.getJingWeight());
+            workOrderParam.setEndTrip(workOrderParam.getEndTrip());
+            workOrderParam.setEndTripUrl(workOrderParam.getEndTripUrl());
+            workOrderService.updateById(workOrderParam);
+            log.info("workOrderParam:{}", JSON.toJSONString(workOrderParam));
+
+
+            //3.结束当前行程周期（从收车中到出车检查也结束当前行程周期）
+            WorkCycle workCycle = workCycleService.findCurrentWorkCycle(workOrderParam.getTruckId());
+            workCycle.setEndTime(LocalDateTime.now());
+            BeanUtils.copyProperties(truck, workCycle);
+            workCycle.setEndTrip(workOrderParam.getEndTrip());
+            workCycle.setCarNumber(workOrderParam.getCarNumber());
+            workCycle.setTrailerNumber(workOrderParam.getTrailerNumber());
+            workCycle.setDriverIdOne(workOrderParam.getDriverIdOne());
+            workCycle.setDriverNameOne(workOrderParam.getDriverNameOne());
+            workCycle.setEscortId(workOrderParam.getEscortId());
+            workCycle.setEscortName(workOrderParam.getEscortName());
+            workCycleService.updateById(workCycle);
+            log.info("workCycle:{}", JSON.toJSONString(workCycle));
+
+
+            //4 记录日志
+            workOrderParam.setCreater(userId);
+            workOrderParam.setCreaterName(userName);
+            workLogService.logWorkCycleInfo(WorkLogTypeEnum.CLOSED, workOrderParam);
         } catch (Exception e) {
             log.error("startOrder:{}", e);
             return false;