From 71246ea670d6ba0a428f4b20966efd7b3d408210 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Wed, 13 Aug 2025 09:45:33 +0800 Subject: [PATCH] =?UTF-8?q?PTL=E9=85=8D=E9=80=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/RuoYiApplication.java | 3 +- .../api/service/impl/ApiServiceImpl.java | 36 +++++++++++++++---- .../ruoyi/bas/port/mapper/WcsPortMapper.java | 23 +++++++----- .../bas/port/service/IWcsPortService.java | 23 +++++++----- .../port/service/impl/WcsPortServiceImpl.java | 21 ++++++----- .../resources/mapper/bas/WcsPortMapper.xml | 14 +++++--- 6 files changed, 83 insertions(+), 37 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 7764881..a5b62cd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -9,10 +9,9 @@ import org.springframework.scheduling.annotation.EnableScheduling; /** * 启动程序 - * + * * @author ruoyi */ -@MapperScan("com.**.mapper") @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) @EnableScheduling @EnableAsync 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 d38e269..b21e147 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 @@ -21,6 +21,8 @@ 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.bas.port.domain.WcsPort; +import com.ruoyi.bas.port.service.IWcsPortService; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.text.Convert; import com.ruoyi.device.agv.domain.AgvQueue; @@ -54,6 +56,8 @@ public class ApiServiceImpl implements IApiService { private IAgvQueueService agvQueueService; @Autowired private IBasFluentFrameService fluentFrameService; + @Autowired + private IWcsPortService wcsPortService; /** * 请求入库 @@ -148,13 +152,32 @@ public class ApiServiceImpl implements IApiService { */ @Override public AjaxResult receiveAgvMoveJob(Map param) { + String startPoint = param.get("startPoint"); + String endPoint = param.get("endPoint"); //todo 待调试 - AgvQueue agvQueue = createAgvQueue(param.get("startPoint"),param.get("endPoint"), param.get("wmsTrayCode"), param.get("taskNo"), "3"); - GenAgvSchedulingTaskResponse genAgvSchedulingTaskResponse = requestAgvQueue(agvQueue); - if (genAgvSchedulingTaskResponse.getCode() == 0) { - return AjaxResult.success(); + WcsPort startWcsPort = wcsPortService.selectWcsPortByPortCode(startPoint); + WcsPort endWcsPort = wcsPortService.selectWcsPortByPortCode(endPoint); + if (ObjUtil.isNull(startWcsPort)){ + return AjaxResult.error("起始点不存在"); } - return AjaxResult.error(genAgvSchedulingTaskResponse.getMessage()); + if (ObjUtil.isNull(endWcsPort)){ + return AjaxResult.error("结束点不存在"); + } + if ("1".equals(startWcsPort.getStatus()) && "0".equals(endWcsPort.getStatus())){ + AgvQueue agvQueue = createAgvQueue(startWcsPort.getSpare2(),endWcsPort.getSpare2(), param.get("wmsTrayCode"), param.get("taskNo"), "3"); + GenAgvSchedulingTaskResponse genAgvSchedulingTaskResponse = requestAgvQueue(agvQueue); + if (genAgvSchedulingTaskResponse.getCode() == 0) { + return AjaxResult.success(); + } + return AjaxResult.error(genAgvSchedulingTaskResponse.getMessage()); + } + if ("0".equals(startWcsPort.getStatus())){ + return AjaxResult.error("起始点位无容器"); + } + if ("1".equals(endWcsPort.getStatus())){ + return AjaxResult.error("目标点位有容器"); + } + return AjaxResult.error(); } /** @@ -329,7 +352,8 @@ public class ApiServiceImpl implements IApiService { case "takeCompleted": //ctu取货完成 HashMap takeCompletedParam = new HashMap<>(); - takeCompletedParam.put("lljCode",agvQueue.getPositionCode1()); + takeCompletedParam.put("portCode",agvQueue.getPositionCode1()); + takeCompletedParam.put("wmsType",agvQueue.getWmsTaskType()); takeCompleted(takeCompletedParam); break; default: diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/port/mapper/WcsPortMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/port/mapper/WcsPortMapper.java index 55915a9..e45c838 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/port/mapper/WcsPortMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/port/mapper/WcsPortMapper.java @@ -5,15 +5,15 @@ import com.ruoyi.bas.port.domain.WcsPort; /** * 点位管理Mapper接口 - * + * * @author ruoyi * @date 2025-06-11 */ -public interface WcsPortMapper +public interface WcsPortMapper { /** * 查询点位管理 - * + * * @param id 点位管理主键 * @return 点位管理 */ @@ -21,7 +21,7 @@ public interface WcsPortMapper /** * 查询点位管理列表 - * + * * @param wcsPort 点位管理 * @return 点位管理集合 */ @@ -29,7 +29,7 @@ public interface WcsPortMapper /** * 新增点位管理 - * + * * @param wcsPort 点位管理 * @return 结果 */ @@ -37,7 +37,7 @@ public interface WcsPortMapper /** * 修改点位管理 - * + * * @param wcsPort 点位管理 * @return 结果 */ @@ -45,7 +45,7 @@ public interface WcsPortMapper /** * 删除点位管理 - * + * * @param id 点位管理主键 * @return 结果 */ @@ -53,9 +53,16 @@ public interface WcsPortMapper /** * 批量删除点位管理 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ public int deleteWcsPortByIds(Long[] ids); + + /** + * 根据code查询点位 + * @param point + * @return + */ + WcsPort selectWcsPortByPortCode(String point); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/port/service/IWcsPortService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/port/service/IWcsPortService.java index 77c1f5e..d20fb18 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/port/service/IWcsPortService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/port/service/IWcsPortService.java @@ -5,15 +5,15 @@ import com.ruoyi.bas.port.domain.WcsPort; /** * 点位管理Service接口 - * + * * @author ruoyi * @date 2025-06-11 */ -public interface IWcsPortService +public interface IWcsPortService { /** * 查询点位管理 - * + * * @param id 点位管理主键 * @return 点位管理 */ @@ -21,7 +21,7 @@ public interface IWcsPortService /** * 查询点位管理列表 - * + * * @param wcsPort 点位管理 * @return 点位管理集合 */ @@ -29,7 +29,7 @@ public interface IWcsPortService /** * 新增点位管理 - * + * * @param wcsPort 点位管理 * @return 结果 */ @@ -37,7 +37,7 @@ public interface IWcsPortService /** * 修改点位管理 - * + * * @param wcsPort 点位管理 * @return 结果 */ @@ -45,7 +45,7 @@ public interface IWcsPortService /** * 批量删除点位管理 - * + * * @param ids 需要删除的点位管理主键集合 * @return 结果 */ @@ -53,9 +53,16 @@ public interface IWcsPortService /** * 删除点位管理信息 - * + * * @param id 点位管理主键 * @return 结果 */ public int deleteWcsPortById(Long id); + + /** + * 根据点位代码查询点位名称 + * @param startPoint + * @return + */ + WcsPort selectWcsPortByPortCode(String startPoint); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/port/service/impl/WcsPortServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/port/service/impl/WcsPortServiceImpl.java index e8c78ed..83c851e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/port/service/impl/WcsPortServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/port/service/impl/WcsPortServiceImpl.java @@ -9,19 +9,19 @@ import com.ruoyi.bas.port.service.IWcsPortService; /** * 点位管理Service业务层处理 - * + * * @author ruoyi * @date 2025-06-11 */ @Service -public class WcsPortServiceImpl implements IWcsPortService +public class WcsPortServiceImpl implements IWcsPortService { @Autowired private WcsPortMapper wcsPortMapper; /** * 查询点位管理 - * + * * @param id 点位管理主键 * @return 点位管理 */ @@ -33,7 +33,7 @@ public class WcsPortServiceImpl implements IWcsPortService /** * 查询点位管理列表 - * + * * @param wcsPort 点位管理 * @return 点位管理 */ @@ -45,7 +45,7 @@ public class WcsPortServiceImpl implements IWcsPortService /** * 新增点位管理 - * + * * @param wcsPort 点位管理 * @return 结果 */ @@ -57,7 +57,7 @@ public class WcsPortServiceImpl implements IWcsPortService /** * 修改点位管理 - * + * * @param wcsPort 点位管理 * @return 结果 */ @@ -69,7 +69,7 @@ public class WcsPortServiceImpl implements IWcsPortService /** * 批量删除点位管理 - * + * * @param ids 需要删除的点位管理主键 * @return 结果 */ @@ -81,7 +81,7 @@ public class WcsPortServiceImpl implements IWcsPortService /** * 删除点位管理信息 - * + * * @param id 点位管理主键 * @return 结果 */ @@ -90,4 +90,9 @@ public class WcsPortServiceImpl implements IWcsPortService { return wcsPortMapper.deleteWcsPortById(id); } + + @Override + public WcsPort selectWcsPortByPortCode(String point) { + return wcsPortMapper.selectWcsPortByPortCode(point); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/bas/WcsPortMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/WcsPortMapper.xml index 4739091..f8f8ac6 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/WcsPortMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/WcsPortMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + insert into wcs_port @@ -83,9 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from wcs_port where id in + delete from wcs_port where id in #{id} - \ No newline at end of file +