diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/mapper/WcsIntegrationMapper.java b/src/main/java/com/gaotao/modules/automatedWarehouse/mapper/WcsIntegrationMapper.java index ed0b929..2f634b3 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/mapper/WcsIntegrationMapper.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/mapper/WcsIntegrationMapper.java @@ -376,7 +376,7 @@ public interface WcsIntegrationMapper { * 获取AGV站点状态 - AI制作 */ Integer getAgvStationStatus(@Param("stationCode") String stationCode); - + String getAgvStationType(@Param("stationCode") String stationCode); /** * 获取栈板详细信息(包含palletType和autoSort以及托盘类型详情) - AI制作 */ diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AutoTaskServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AutoTaskServiceImpl.java index 40a78c5..6c6a054 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AutoTaskServiceImpl.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AutoTaskServiceImpl.java @@ -328,12 +328,18 @@ public class AutoTaskServiceImpl implements AutoTaskService { // 校验当前站点是否空闲 - rqrq Integer stationStatus = wcsIntegrationMapper.getAgvStationStatus(inData.getFromLocation()); + + String stationType = wcsIntegrationMapper.getAgvStationType(inData.getFromLocation()); + if(!"正式站点".equals(stationType)){ + throw new RuntimeException("只有正式站点可以启用AGV托运!"); + } if(stationStatus == null){ throw new RuntimeException("起始站点不存在:" + inData.getFromLocation()); } if(stationStatus != 1){ throw new RuntimeException("起始站点不是有货状态,当前状态码:" + stationStatus); } + System.out.println("栈板和站点状态校验通过 - rqrq"); } diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java index a526c2f..9e0ff1a 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java @@ -427,6 +427,12 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService { //初始化的时候用 一开始栈板是没有位置的 按照第一个入栈的标签来给虚拟位置 后期不需要处理 if("TEMP".equals(labelWarehouseId)){ wcsIntegrationMapper.updatePalletLocationCode(site, palletId, "TEMP"); + }else if("W01".equals(labelWarehouseId)){ + wcsIntegrationMapper.updatePalletLocationCode(site, palletId, "W01"); + }else if("Q01".equals(labelWarehouseId)){ + wcsIntegrationMapper.updatePalletLocationCode(site, palletId, "Q01"); + }else if("W02".equals(labelWarehouseId)){ + wcsIntegrationMapper.updatePalletLocationCode(site, palletId, "W02"); }else if("AS".equals(labelLocationId)){ wcsIntegrationMapper.updatePalletLocationCode(site, palletId, "Virtual_AS"); }else { diff --git a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml index b87364a..33610c2 100644 --- a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml +++ b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml @@ -815,6 +815,12 @@ WHERE station_code = #{stationCode} + +