|
|
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.aoyang.common.param.PageParam;
|
|
|
import com.aoyang.common.result.Result;
|
|
|
import com.aoyang.tms.common.ErrCodeEnum;
|
|
|
+import com.aoyang.tms.common.WorkOrderEnum;
|
|
|
import com.aoyang.tms.controller.param.UpSignParam;
|
|
|
import com.aoyang.tms.controller.vo.LocationVO;
|
|
|
import com.aoyang.tms.controller.vo.WorkOrderVO;
|
|
|
@@ -11,6 +12,7 @@ import com.aoyang.tms.controller.vo.WorkerInfo;
|
|
|
import com.aoyang.tms.entity.*;
|
|
|
import com.aoyang.tms.service.*;
|
|
|
import com.aoyang.tms.util.DateUtils;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
@@ -311,7 +313,7 @@ public class WorkerController {
|
|
|
@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));
|
|
|
- if (truckCheckInfo == null || truckCheckInfo.getOrderId() == null || truckCheckInfo.getType() == null) {
|
|
|
+ if (truckCheckInfo == null || truckCheckInfo.getType() == null) {
|
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
}
|
|
|
//1.车辆进入作业中状态,2.订单进入前往装车点状态,3.并记行车日志
|
|
|
@@ -328,6 +330,16 @@ public class WorkerController {
|
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
}
|
|
|
}
|
|
|
+ QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.eq("truck_id", truckCheckInfo.getTruckId());
|
|
|
+ queryWrapper.and(wrapper -> wrapper.eq("order_status", WorkOrderEnum.GOTO_ZHUANGCHE_SPOT)
|
|
|
+ .or().eq("order_status", WorkOrderEnum.ZHUANGCHE_WAIT));
|
|
|
+ WorkOrder workOrder = workOrderService.getOne(queryWrapper);
|
|
|
+ if (workOrder == null) {
|
|
|
+ log.error("无执行中装车运单 不能执行出车检查:{}", JSON.toJSONString(truckCheckInfo));
|
|
|
+ return new Result(ErrCodeEnum.BAD_PARAM.getCode(), "当前不能执行出车检查");
|
|
|
+ }
|
|
|
+ truckCheckInfo.setOrderId(workOrder.getId());
|
|
|
String utf8Name = userName;
|
|
|
try {
|
|
|
utf8Name = URLDecoder.decode(userName, "UTF-8");
|