签名

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

@@ -304,7 +304,7 @@ public class WorkerController {
     @ApiOperation(value = "1.开始执行装卸车运单", notes = "点击-开始执行装卸车运单-按钮")
     @PostMapping("/start_order")
     public Result startOrder(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody WorkOrder workOrder) {
-        log.info("开始执行运单,/tms/worker/start_order，参数:{}", JSON.toJSONString(workOrder));
+        log.info("开始执行装卸车运单,/tms/worker/start_order，参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getId() == null || workOrder.getStartTrip() == null || StringUtils.isBlank(workOrder.getStartTripUrl())) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
@@ -340,7 +340,7 @@ public class WorkerController {
     @ApiOperation(value = "2.完成出车前检查，开始装卸车作业", notes = "点击-完成出车前检查，开始出车作业-按钮")
     @PostMapping("/start_work")
     public Result starWork(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody TruckCheckInfo truckCheckInfo) {
-        log.info("完成出车前检查，开始作业,/tms/worker/start_work，参数:{}", JSON.toJSONString(truckCheckInfo));
+        log.info("完成出车前检查，开始装卸车作业,/tms/worker/start_work，参数:{}", JSON.toJSONString(truckCheckInfo));
         if (truckCheckInfo == null || truckCheckInfo.getType() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
@@ -425,7 +425,7 @@ public class WorkerController {
     @ApiOperation(value = "4.结束等待,开始上传磅单", notes = "点击结束等待,开始上传磅单按钮")
     @PostMapping("/submit_result")
     public Result submitResult(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody WorkOrder workOrder) {
-        log.info("上报成果，/tms/worker/submit_result，参数:{}", JSON.toJSONString(workOrder));
+        log.info("结束等待,开始上传磅单，/tms/worker/submit_result，参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
@@ -484,7 +484,7 @@ public class WorkerController {
     @ApiOperation(value = "7.完成检查，结束此次行程", notes = "点击完成检查，结束此次行程")
     @PostMapping("/finish_work")
     public Result finishWork(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody TruckCheckInfo truckCheckInfo) {
-        log.info("上报已到达收车点，/tms/worker/finish_work，参数:{}", JSON.toJSONString(truckCheckInfo));
+        log.info("完成检查，结束此次行程，/tms/worker/finish_work，参数:{}", JSON.toJSONString(truckCheckInfo));
         if (truckCheckInfo == null || truckCheckInfo.getOrderId() == null || truckCheckInfo.getType() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
@@ -505,10 +505,10 @@ public class WorkerController {
     }
 
 
-    @ApiOperation(value = "8.上传签名", notes = "点击确定结束")
+    @ApiOperation(value = "8.上传签名，完成本行车周期，收车", notes = "点击确定结束")
     @PostMapping("/finish_cycle")
     public Result finishCycle(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody UpSignParam upSignParam) {
-        log.info("上传签名，/tms/worker/finish_cycle，参数:{}", JSON.toJSONString(upSignParam));
+        log.info("上传签名，完成本行车周期，收车 /tms/worker/finish_cycle，参数:{}", JSON.toJSONString(upSignParam));
         if (upSignParam == null || upSignParam.getTruckId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }

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

@@ -304,8 +304,6 @@ public class WorkerServiceImpl implements WorkerService {
             if (workOrder != null) {
                 //1.车辆进入已经收车状态
                 Truck truck = truckService.getById(workOrder.getTruckId());
-                truck.setTmsStatus(TmsTruckStatus.DONE);
-                truckService.updateById(truck);
                 //2.上传订单信息
                 workOrder.setWeightingListNo(workOrderParam.getWeightingListNo());
                 workOrder.setWeightingListUrl(workOrderParam.getWeightingListUrl());