diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java index ea797769..93db5e0b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import javax.servlet.http.HttpServletResponse; +import javax.xml.stream.Location; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson2.JSON; @@ -185,7 +186,6 @@ public class AppTaskController extends BaseController @Anonymous public AjaxResult receiveTaskResult(@RequestBody TaskResultFeedRequest feedBackRequest) { - logger.info("反馈任务状态：{}", JSON.toJSONString(feedBackRequest)); // 判断请求参数是否齐全 if (feedBackRequest == null || StringUtils.isEmpty(feedBackRequest.getTaskId()) @@ -196,18 +196,15 @@ public class AppTaskController extends BaseController } // 判断任务状态是否正确 if (!wcsTaskStatusList.contains(feedBackRequest.getTaskStatus())) { - logger.info("任务状态码反馈不正确。"); return error("任务状态码反馈不正确。"); } // 查询任务号 AppWcsTask thisFbWcsTask = appWcsTaskService.selectAppWcsTaskByWcsTaskId(feedBackRequest.getTaskId()); if (thisFbWcsTask == null) { - logger.info("反馈的任务号不存在。"); return error("反馈的任务号不存在。"); } // 判断反馈的任务号与数据库中是否一致 if (Objects.equals(thisFbWcsTask.getWcsTaskStatus(), feedBackRequest.getTaskStatus())) { - logger.info("请勿重复反馈相同任务状态。"); return error("请勿重复反馈相同任务状态。"); } AppTask wmsTaskQuery = new AppTask(); @@ -238,7 +235,6 @@ public class AppTaskController extends BaseController // appTaskService.batchUpdateAppTask(thisWmsTaskList); updateAppTask(thisWmsTaskList); } - logger.info("反馈任务完成成功。"); return success("反馈任务完成成功。"); } if (998 == feedBackRequest.getTaskStatus()) { @@ -254,7 +250,6 @@ public class AppTaskController extends BaseController // appTaskService.batchUpdateAppTask(thisWmsTaskList); updateAppTask(thisWmsTaskList); } - logger.info("反馈任务取消成功。"); return success("反馈任务取消成功。"); } if (999 == feedBackRequest.getTaskStatus()) { @@ -269,7 +264,6 @@ public class AppTaskController extends BaseController // appTaskService.batchUpdateAppTask(thisWmsTaskList); updateAppTask(thisWmsTaskList); } - logger.info("反馈任务异常成功。"); return success("反馈任务异常成功。"); } @@ -333,7 +327,11 @@ public class AppTaskController extends BaseController if(i == 0 ){ return error("wcs生成入库任务异常"); } - + // 占用库位 + AppLocation updateLocation = new AppLocation(); + updateLocation.setLocationId(location.getLocationId()); + updateLocation.setLocationStatus(1); + appLocationService.updateAppLocation(updateLocation); WcsDate wcsDate = new WcsDate(); wcsDate.setTaskId(appTask2.getTaskId()); wcsDate.setUser("WMS"); @@ -390,6 +388,12 @@ public class AppTaskController extends BaseController wcsDate.setUser("WMS"); wcsDate.setVehicleNo(wcsStackerTask.getVehicleNo()); wcsDate.setDestination(location.getLocationId()); + // 占用库位 + AppLocation updateLocation = new AppLocation(); + updateLocation.setLocationId(location.getLocationId()); + updateLocation.setLocationStatus(1); + appLocationService.updateAppLocation(updateLocation); + logger.info("更新库位成功"); return success(wcsDate); } @@ -1029,7 +1033,7 @@ public class AppTaskController extends BaseController } // 创建移库任务 moveTask.setTaskId(IdUtils.fastUUID()); - moveTask.setTaskType(3); + moveTask.setTaskType(9); moveTask.setTaskStatus(0); moveTask.setTaskPriority(1); moveTask.setVehicleId(moveLocation.getVehicleId()); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java index 9b6274bb..e10356c9 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java @@ -48,7 +48,7 @@ public class TaskExecutor { private final HashMap taskTypeMap = new HashMap() {{ put(1, 1);// 入库 put(2, 2);// 出库 - put(3, 3);// 移库 + put(9, 9);// 移库 }}; @Autowired private AppLocationMapper appLocationMapper; diff --git a/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml index a74bc5c3..aab5c7e8 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml @@ -189,9 +189,8 @@ update app_location - location_id = #{locationId}, - location_type = #{locationType}, location_status = #{locationStatus}, + location_type = #{locationType}, outer_id = #{outerId}, area_id = #{areaId}, tunnel_id = #{tunnelId}, @@ -206,7 +205,7 @@ is_working = #{isWorking}, is_enable = #{isEnable}, - where id = #{id} + where location_id = #{locationId} diff --git a/ruoyi-system/src/main/resources/mapper/app/AppWcsTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppWcsTaskMapper.xml index 0b0e21b6..4b6de99b 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppWcsTaskMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppWcsTaskMapper.xml @@ -73,38 +73,38 @@ insert into app_wcs_task - - ( - - wcs_task_id, - wcs_task_status, - wcs_task_type, - task_priority, - vehicle_id, - origin, - destination, - create_time, - send_time, - finish_time, - remark, - - ) + + + wcs_task_id, + wcs_task_status, + wcs_task_type, + task_priority, + vehicle_id, + origin, + destination, + create_time, + send_time, + finish_time, + remark, + + values - ( - - #{appWcsTask.wcsTaskId}, - #{appWcsTask.wcsTaskStatus}, - #{appWcsTask.wcsTaskType}, - #{appWcsTask.taskPriority}, - #{appWcsTask.vehicleId}, - #{appWcsTask.origin}, - #{appWcsTask.destination}, - #{appWcsTask.createTime}, - #{appWcsTask.sendTime}, - #{appWcsTask.finishTime}, - #{appWcsTask.remark}, + + + + #{appWcsTask.wcsTaskId}, + #{appWcsTask.wcsTaskStatus}, + #{appWcsTask.wcsTaskType}, + #{appWcsTask.taskPriority}, + #{appWcsTask.vehicleId}, + #{appWcsTask.origin}, + #{appWcsTask.destination}, + #{appWcsTask.createTime}, + #{appWcsTask.sendTime}, + #{appWcsTask.finishTime}, + #{appWcsTask.remark}, + - )