|
|
|
@ -132,14 +132,14 @@ public class AgvTaskServiceImpl implements AgvTaskService { |
|
|
|
AgvStation getAgvStationFrom=wcsIntegrationMapper.getAgvStation(task.getFromLocation()); |
|
|
|
//------Rfid通道机--------- |
|
|
|
//如果从一楼点位往工作区走且栈板有东西 那么要经过通道机 400166是通道机 |
|
|
|
if("Z102;Z103;Z104;Z106;Z107;Z108;Z109;Z110;Z112".contains(getAgvStationFrom.getAreaType())&&"Z111;Z201;Z301;Z302;".contains(getAgvStation.getAreaType())) { |
|
|
|
List<PalletDetailData> palletDetails = wcsIntegrationMapper.getPalletDetailsData( |
|
|
|
task.getSite(), task.getPalletId()); |
|
|
|
|
|
|
|
if (palletDetails != null && !palletDetails.isEmpty()) { |
|
|
|
targets = Arrays.asList(task.getFromLocation(),"400166" ,task.getToLocation()); |
|
|
|
} |
|
|
|
} |
|
|
|
// if("Z102;Z103;Z104;Z106;Z107;Z108;Z109;Z110;Z112".contains(getAgvStationFrom.getAreaType())&&"Z111;Z201;Z301;Z302;".contains(getAgvStation.getAreaType())) { |
|
|
|
// List<PalletDetailData> palletDetails = wcsIntegrationMapper.getPalletDetailsData( |
|
|
|
// task.getSite(), task.getPalletId()); |
|
|
|
// |
|
|
|
// if (palletDetails != null && !palletDetails.isEmpty()) { |
|
|
|
// targets = Arrays.asList(task.getFromLocation(),"400166" ,task.getToLocation()); |
|
|
|
// } |
|
|
|
// } |
|
|
|
// 调用AGV接口创建任务 |
|
|
|
agvClientUtil.createTask( |
|
|
|
task.getTaskNo(), // 任务ID |
|
|
|
|