|
@@ -12,6 +12,7 @@ import com.aoyang.tms.entity.WorkSpot;
|
|
|
import com.aoyang.tms.service.*;
|
|
import com.aoyang.tms.service.*;
|
|
|
import com.aoyang.tms.util.DateUtils;
|
|
import com.aoyang.tms.util.DateUtils;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
@@ -174,7 +175,7 @@ public class WorkOrderController {
|
|
|
@PostMapping("/pc_update")
|
|
@PostMapping("/pc_update")
|
|
|
public Result pcUpdate(@RequestHeader(value = "userId") Long userId,
|
|
public Result pcUpdate(@RequestHeader(value = "userId") Long userId,
|
|
|
@RequestHeader(value = "userName") String userName,
|
|
@RequestHeader(value = "userName") String userName,
|
|
|
- @RequestBody WorkOrder param) {
|
|
|
|
|
|
|
+ @RequestBody WorkOrderVO param) {
|
|
|
if (param == null || param.getId() == null) {
|
|
if (param == null || param.getId() == null) {
|
|
|
return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
}
|
|
}
|
|
@@ -189,7 +190,7 @@ public class WorkOrderController {
|
|
|
param.setUpdateDate(LocalDateTime.now());
|
|
param.setUpdateDate(LocalDateTime.now());
|
|
|
log.info("根据id修改运单(运单分页列表PC端,待执行已完成已关闭运单可改),调用/tms/work_order/pc_update,参数:{}", JSON.toJSONString(param));
|
|
log.info("根据id修改运单(运单分页列表PC端,待执行已完成已关闭运单可改),调用/tms/work_order/pc_update,参数:{}", JSON.toJSONString(param));
|
|
|
|
|
|
|
|
- WorkOrder workOrder = workOrderService.getById(param);
|
|
|
|
|
|
|
+ WorkOrder workOrder = workOrderService.getById(param.getId());
|
|
|
if (workOrder.getOrderStatus() != 0 && workOrder.getOrderStatus() != 40 && workOrder.getOrderStatus() != 50) {
|
|
if (workOrder.getOrderStatus() != 0 && workOrder.getOrderStatus() != 40 && workOrder.getOrderStatus() != 50) {
|
|
|
return new Result<>(ErrCodeEnum.NO_UPDATE.getCode(), ErrCodeEnum.NO_UPDATE.getMessage());
|
|
return new Result<>(ErrCodeEnum.NO_UPDATE.getCode(), ErrCodeEnum.NO_UPDATE.getMessage());
|
|
|
}
|
|
}
|
|
@@ -200,6 +201,12 @@ public class WorkOrderController {
|
|
|
}
|
|
}
|
|
|
param.setSpotName(spot.getSpotName());
|
|
param.setSpotName(spot.getSpotName());
|
|
|
}
|
|
}
|
|
|
|
|
+ if (StringUtils.isNotBlank(param.getXiecheContactName()) || StringUtils.isNotBlank(param.getXiecheContactPhone())) {
|
|
|
|
|
+ WorkSpot spot = workSpotService.getById(workOrder.getSpotId());
|
|
|
|
|
+ spot.setContactPhone(param.getXiecheContactPhone());
|
|
|
|
|
+ spot.setContactName(param.getXiecheContactName());
|
|
|
|
|
+ workSpotService.updateById(spot);
|
|
|
|
|
+ }
|
|
|
return new Result<>(workOrderService.saveOrUpdate(param));
|
|
return new Result<>(workOrderService.saveOrUpdate(param));
|
|
|
}
|
|
}
|
|
|
|
|
|