diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AgvTaskServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AgvTaskServiceImpl.java index 8b3b631..3c9a620 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AgvTaskServiceImpl.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AgvTaskServiceImpl.java @@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gaotao.common.utils.AgvClientUtil; import com.gaotao.common.utils.PageUtils; -import com.gaotao.modules.api.entity.AgvFeedBackToWcs; -import com.gaotao.modules.api.entity.UpdateStationToWcs; -import com.gaotao.modules.api.entity.WareHouseTransferRequest; -import com.gaotao.modules.api.entity.WarehouseAskStation; +import com.gaotao.modules.api.entity.*; import com.gaotao.modules.api.service.WcsApiService; import com.gaotao.modules.api.service.WmsMessageService; @@ -544,6 +541,21 @@ public class AgvTaskServiceImpl implements AgvTaskService { System.out.println("任务未取货,执行场景1/2处理 - rqrq"); result = handleNotPickupCancel(task, wcsSuccess, wcsMessage); } + + if(task.getToLocation().startsWith("D")){ + //如果是到入库口的任务被取消 如果有栈板号 那么执行下取消组盘 + try { + SpecialPalletTask pushData = new SpecialPalletTask(); + pushData.setPalletBarcode(task.getPalletId()); + pushData.setSite(site); + pushData.setOperationType(1); + wcsIntegrationMapper.updateAllPalletDetailWcsFlagToOne(site, task.getPalletId()); + wcsApiService.SpecialPalletTask(pushData); + + }catch (Exception e) { + //调用失败也不管 + } + } System.out.println("AGV任务取消完成 - rqrq,result=" + result.getMessage()); return result;