|
|
@@ -80,7 +80,11 @@ public class WorkerController {
|
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
}
|
|
|
Boolean flag = workOrderService.saveOrUpdate(workOrder);
|
|
|
- return new Result<>(flag);
|
|
|
+ if (flag) {
|
|
|
+ WorkOrder workOrderUpdate = workOrderService.getById(workOrder.getId());
|
|
|
+ return new Result<>(workOrderUpdate);
|
|
|
+ }
|
|
|
+ return new Result(ErrCodeEnum.ORDER_UPDATE_ERROR.getCode(), ErrCodeEnum.ORDER_UPDATE_ERROR.getMessage());
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "运单列表", notes = "卡车id必传,未完成的(待执行、前往、等待、成果报备中)运单")
|
|
|
@@ -98,7 +102,7 @@ public class WorkerController {
|
|
|
@ApiOperation(value = "当前行车周期内运单列表", notes = "卡车id必传,当前行车周期内运单列表")
|
|
|
@PostMapping("/find_cycle_order_list")
|
|
|
public Result<List<WorkOrderVO>> findCycleOrderList(@RequestHeader(value = "orgId") Long orgId,
|
|
|
- @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
|
|
|
+ @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
|
|
|
log.info("当前行车周期内运单列表,/tms/worker/find_cycle_order_list,参数:{}", JSON.toJSONString(workOrder));
|
|
|
if (workOrder == null || workOrder.getTruckId() == null) {
|
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|