From 9c948b882c0a3117844a00444916e44b4e0e5018 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Thu, 31 Jul 2025 13:38:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E5=88=A9=E6=9E=B6?= =?UTF-8?q?=E7=A9=BA=E6=96=99=E7=AE=B1=E5=85=A5=E5=BA=93=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/api/controller/AgvController.java | 18 --------- .../api/controller/Wcs2WmsController.java | 38 +++++++++++++++++++ .../com/ruoyi/api/service/IApiService.java | 7 ++++ .../api/service/impl/ApiServiceImpl.java | 32 +++++++++++++++- .../mapper/agv/AgvQueueFinishMapper.xml | 1 + .../mapper/device/AgvQueueMapper.xml | 1 + .../framework/config/SecurityConfig.java | 2 +- ruoyi-ui/src/views/agv/queue/index.vue | 4 +- 8 files changed, 81 insertions(+), 22 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/AgvController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/AgvController.java index aadc91b..56610f0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/AgvController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/AgvController.java @@ -35,25 +35,7 @@ public class AgvController extends BaseController { return apiService.agvCallback(request); } - /** - * 接收出库任务 - * @param mydoJob - * @return - */ - @PostMapping("/receiveOutMydoJob") - public AjaxResult receiveOutMydoJob(@RequestBody MydoJob mydoJob) { - return apiService.receiveOutMydoJob(mydoJob); - } - /** - * 接收流利架空料箱入库任务 - * @param mydoJob - * @return - */ - @PostMapping("/receiveInMydoJob") - public AjaxResult receiveInMydoJob(@RequestBody MydoJob mydoJob) { - return apiService.receiveInMydoJob(mydoJob); - } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/Wcs2WmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/Wcs2WmsController.java index 0691d53..c5af13e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/Wcs2WmsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/Wcs2WmsController.java @@ -1,5 +1,11 @@ package com.ruoyi.api.controller; +import com.ruoyi.api.domain.wcs2wms.MydoJob; +import com.ruoyi.api.service.IApiService; +import com.ruoyi.common.core.domain.AjaxResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -7,4 +13,36 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/wcs2Wms/api") public class Wcs2WmsController { + @Autowired + private IApiService apiService; + + /** + * 接收出库任务 + * @param mydoJob + * @return + */ + @PostMapping("/receiveOutMydoJob") + public AjaxResult receiveOutMydoJob(@RequestBody MydoJob mydoJob) { + return apiService.receiveOutMydoJob(mydoJob); + } + + /** + * 接收流利架空料箱入库任务 + * @param mydoJob + * @return + */ + @PostMapping("/receiveInMydoJob") + public AjaxResult receiveInMydoJob(@RequestBody MydoJob mydoJob) { + return apiService.receiveInMydoJob(mydoJob); + } + + /** + * 流利架出库确认,清空状态记录表 + * @param mydoJob + * @return + */ + @PostMapping("/outMydojobMakesure") + public AjaxResult outMydojobMakesure(@RequestBody MydoJob mydoJob) { + return apiService.outMydojobMakesure(mydoJob); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java index b7cd2ff..f68c8f4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java @@ -122,4 +122,11 @@ public interface IApiService * @param mydoJob */ AjaxResult receiveInMydoJob(MydoJob mydoJob); + + /** + * 流利架状态清空表 + * @param mydoJob + * @return + */ + AjaxResult outMydojobMakesure(MydoJob mydoJob); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java index f76083e..89d3607 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java @@ -19,6 +19,8 @@ import com.ruoyi.api.domain.agv.genAgvSchedulingTask.GenAgvSchedulingTaskRespons import com.ruoyi.api.domain.agv.genAgvSchedulingTask.PositionCodeData; import com.ruoyi.api.domain.wcs2wms.MydoJob; import com.ruoyi.api.service.IApiService; +import com.ruoyi.bas.fluent.domain.BasFluentFrame; +import com.ruoyi.bas.fluent.service.IBasFluentFrameService; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.text.Convert; import com.ruoyi.device.agv.domain.AgvQueue; @@ -50,6 +52,8 @@ public class ApiServiceImpl implements IApiService { private RequestLogServiceImpl requestLogService; @Autowired private IAgvQueueService agvQueueService; + @Autowired + private IBasFluentFrameService fluentFrameService; /** * 请求入库 @@ -236,7 +240,13 @@ public class ApiServiceImpl implements IApiService { fluentPickParam.put("wmsType", "2"); fluentPickParam.put("pickSsj", agvQueue.getPositionCode2()); RequestLog requestLog = finishMydoJob(JOB_FINISH_URL, "流利架任务到达拣选口", fluentPickParam); - log.info("【AGV流利架任务结束】任务号：{},返回结果{}", taskCode, requestLog); + agvQueue.setFinishTime(DateUtil.formatDateTime(new Date())); + agvQueueService.updateAgvQueue(agvQueue); + //插入历史 + agvQueueService.insertHistory(agvQueue.getReqCode()); + //删除队列 + agvQueueService.deleteAgvQueueByReqCode(agvQueue.getReqCode()); + log.info("【AGV出库任务结束】任务号：{}", taskCode); }else { //输送机出库 PLC写入任务号 //通知wms 任务结束 @@ -328,6 +338,26 @@ public class ApiServiceImpl implements IApiService { } } + /** + * 流利架出库确认，清空流利架状态信息 + * @param mydoJob + * @return + */ + @Override + public AjaxResult outMydojobMakesure(MydoJob mydoJob) { + BasFluentFrame param = new BasFluentFrame(); + param.setTrayCode(mydoJob.getTrayCode()); + List basFluentFrames = fluentFrameService.selectBasFluentFrameList(param); + if (CollUtil.isEmpty(basFluentFrames)){ + return AjaxResult.error("无流利架信息"); + } + BasFluentFrame basFluentFrame = basFluentFrames.get(0); + basFluentFrame.setTrayCode(""); + basFluentFrame.setAllotNum(0L); + fluentFrameService.updateBasFluentFrame(basFluentFrame); + return AjaxResult.success(); + } + /** * 生成agv队列 diff --git a/ruoyi-admin/src/main/resources/mapper/agv/AgvQueueFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/agv/AgvQueueFinishMapper.xml index 5de6912..94f8a32 100644 --- a/ruoyi-admin/src/main/resources/mapper/agv/AgvQueueFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/agv/AgvQueueFinishMapper.xml @@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and status = #{status} and wms_task_type = #{wmsTaskType} + order by req_time desc