|
@@ -225,7 +225,7 @@ public class WorkerController {
|
|
|
@PostMapping("/start_order")
|
|
@PostMapping("/start_order")
|
|
|
public Result start_order(@RequestBody WorkOrder workOrder) {
|
|
public Result start_order(@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.getTruckId() == null) {
|
|
|
|
|
|
|
+ if (workOrder == null || workOrder.getId() == null) {
|
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
}
|
|
}
|
|
|
//TODO 1.车辆进入出车前检车状态,2.订单进入前往装车点状态,3.并记行车日志,4.创建行程周期
|
|
//TODO 1.车辆进入出车前检车状态,2.订单进入前往装车点状态,3.并记行车日志,4.创建行程周期
|
|
@@ -237,7 +237,7 @@ public class WorkerController {
|
|
|
@PostMapping("/start_work")
|
|
@PostMapping("/start_work")
|
|
|
public Result start_work(@RequestBody WorkOrder workOrder) {
|
|
public Result start_work(@RequestBody WorkOrder workOrder) {
|
|
|
log.info("完成出车前检查,开始作业,/tms/worker/start_work,参数:{}", JSON.toJSONString(workOrder));
|
|
log.info("完成出车前检查,开始作业,/tms/worker/start_work,参数:{}", JSON.toJSONString(workOrder));
|
|
|
- if (workOrder == null || workOrder.getTruckId() == null) {
|
|
|
|
|
|
|
+ if (workOrder == null || workOrder.getId() == null) {
|
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
}
|
|
}
|
|
|
//TODO 1.车辆进入作业中状态,2.订单进入前往装车点状态,3.并记行车日志
|
|
//TODO 1.车辆进入作业中状态,2.订单进入前往装车点状态,3.并记行车日志
|
|
@@ -249,7 +249,7 @@ public class WorkerController {
|
|
|
@PostMapping("/start_wait")
|
|
@PostMapping("/start_wait")
|
|
|
public Result start_wait(@RequestBody WorkOrder workOrder) {
|
|
public Result start_wait(@RequestBody WorkOrder workOrder) {
|
|
|
log.info("上报已到达装卸车点,/tms/worker/start_wait,参数:{}", JSON.toJSONString(workOrder));
|
|
log.info("上报已到达装卸车点,/tms/worker/start_wait,参数:{}", JSON.toJSONString(workOrder));
|
|
|
- if (workOrder == null || workOrder.getTruckId() == null || workOrder.getType() == null) {
|
|
|
|
|
|
|
+ if (workOrder == null || workOrder.getId() == null) {
|
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
}
|
|
}
|
|
|
//TODO 1.车辆进入作业中状态,2.订单进入装车等待状态,3.并记行车日志
|
|
//TODO 1.车辆进入作业中状态,2.订单进入装车等待状态,3.并记行车日志
|
|
@@ -261,7 +261,7 @@ public class WorkerController {
|
|
|
@PostMapping("/submit_result")
|
|
@PostMapping("/submit_result")
|
|
|
public Result submit_result(@RequestBody WorkOrder workOrder) {
|
|
public Result submit_result(@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.getTruckId() == null || workOrder.getType() == null) {
|
|
|
|
|
|
|
+ if (workOrder == null || workOrder.getId() == null) {
|
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
}
|
|
}
|
|
|
//TODO 1.车辆进入作业中状态,2.订单进入成果报备中状态,3.并记行车日志
|
|
//TODO 1.车辆进入作业中状态,2.订单进入成果报备中状态,3.并记行车日志
|
|
@@ -273,7 +273,7 @@ public class WorkerController {
|
|
|
@PostMapping("/finish_order")
|
|
@PostMapping("/finish_order")
|
|
|
public Result finish_order(@RequestBody WorkOrder workOrder) {
|
|
public Result finish_order(@RequestBody WorkOrder workOrder) {
|
|
|
log.info("确认完成运单,/tms/worker/finish_order,参数:{}", JSON.toJSONString(workOrder));
|
|
log.info("确认完成运单,/tms/worker/finish_order,参数:{}", JSON.toJSONString(workOrder));
|
|
|
- if (workOrder == null || workOrder.getTruckId() == null || workOrder.getType() == null) {
|
|
|
|
|
|
|
+ if (workOrder == null || workOrder.getId() == null) {
|
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
}
|
|
}
|
|
|
//TODO 1.车辆进入收车中状态,2.订单完成状态,3.并记行车日志
|
|
//TODO 1.车辆进入收车中状态,2.订单完成状态,3.并记行车日志
|
|
@@ -285,7 +285,7 @@ public class WorkerController {
|
|
|
@PostMapping("/arrive_terminal")
|
|
@PostMapping("/arrive_terminal")
|
|
|
public Result arrive_shouchedian(@RequestBody WorkOrder workOrder) {
|
|
public Result arrive_shouchedian(@RequestBody WorkOrder workOrder) {
|
|
|
log.info("上报已到达收车点,/tms/worker/arrive_shouchedian,参数:{}", JSON.toJSONString(workOrder));
|
|
log.info("上报已到达收车点,/tms/worker/arrive_shouchedian,参数:{}", JSON.toJSONString(workOrder));
|
|
|
- if (workOrder == null || workOrder.getTruckId() == null || workOrder.getType() == null) {
|
|
|
|
|
|
|
+ if (workOrder == null || workOrder.getId() == null) {
|
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
}
|
|
}
|
|
|
//TODO 1.车辆进入收车后检查状态,2.订单完成状态,3.并记行车日志
|
|
//TODO 1.车辆进入收车后检查状态,2.订单完成状态,3.并记行车日志
|
|
@@ -297,7 +297,7 @@ public class WorkerController {
|
|
|
@PostMapping("/finish_work")
|
|
@PostMapping("/finish_work")
|
|
|
public Result finish_work(@RequestBody WorkOrder workOrder) {
|
|
public Result finish_work(@RequestBody WorkOrder workOrder) {
|
|
|
log.info("上报已到达收车点,/tms/worker/arrive_shouchedian,参数:{}", JSON.toJSONString(workOrder));
|
|
log.info("上报已到达收车点,/tms/worker/arrive_shouchedian,参数:{}", JSON.toJSONString(workOrder));
|
|
|
- if (workOrder == null || workOrder.getTruckId() == null || workOrder.getType() == null) {
|
|
|
|
|
|
|
+ if (workOrder == null || workOrder.getId() == null) {
|
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
}
|
|
}
|
|
|
//TODO 1.车辆进入已经收车状态,2.订单完成状态,3.并记行车日志,4.结束当前行程周期(从收车中到出车检查也结束当前行程周期)
|
|
//TODO 1.车辆进入已经收车状态,2.订单完成状态,3.并记行车日志,4.结束当前行程周期(从收车中到出车检查也结束当前行程周期)
|