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 e76717f..7dea405 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 @@ -2553,6 +2553,16 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService { log.info("获取栈板当前所在站点 - rqrq,fromLocation={}", fromLocation); List palletDetails = wcsIntegrationMapper.getPalletDetailsData(site, palletId); + PalletType palletType = wcsIntegrationMapper.getPalletTypeInfoByPallet(site,palletId); + UpdateStationToWcs updateStationToWcs = new UpdateStationToWcs(); + updateStationToWcs.setPalletizingPosition(currentStation.getStationCode()); + updateStationToWcs.setPalletCode(palletId); + updateStationToWcs.setOperationType(1); + updateStationToWcs.setPalletType(palletType.getWcsPalletType()); + updateStationToWcs.setBasePalletType(palletType.getWcsBasePalletType()); + updateStationToWcs.setWcsTaskId("0"); + wcsApiService.updateStationToWcs(updateStationToWcs); + if (palletDetails != null && !palletDetails.isEmpty()) { Map toStationInfo = getStationInfo("FenJian"); String toWarehouseId = (String) toStationInfo.get("warehouseCode"); @@ -2578,15 +2588,8 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService { wcsIntegrationMapper.updateAgvStationStatus("FenJian", 1, "有货"); wcsIntegrationMapper.updateAgvStationStatus(currentStation.getStationCode(), 0, "空闲"); palletMapper.updateLocationWithPalletId(site, palletId,"FenJian", null); - PalletType palletType = wcsIntegrationMapper.getPalletTypeInfoByPallet(site,palletId); - UpdateStationToWcs updateStationToWcs = new UpdateStationToWcs(); - updateStationToWcs.setPalletizingPosition(currentStation.getStationCode()); - updateStationToWcs.setPalletCode(palletId); - updateStationToWcs.setOperationType(1); - updateStationToWcs.setPalletType(palletType.getWcsPalletType()); - updateStationToWcs.setBasePalletType(palletType.getWcsBasePalletType()); - updateStationToWcs.setWcsTaskId("0"); - wcsApiService.updateStationToWcs(updateStationToWcs); + + //要给wcs回传货位信息 log.info("结束分拣完成 - rqrq"); }