|
@@ -88,9 +88,10 @@ public class RobotNodeServiceImpl implements NodeOperationService {
|
|
|
private ZZoneMapper zZoneMapper;
|
|
|
@Autowired
|
|
|
private BBomMapper bBomMapper;
|
|
|
-
|
|
|
@Autowired
|
|
|
private ZZoneService zoneService;
|
|
|
+ @Autowired
|
|
|
+ private BomProcedureTrayService procedureTrayService;
|
|
|
|
|
|
private Map<String, Object> map = Maps.newHashMap();
|
|
|
|
|
@@ -116,7 +117,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
|
|
|
|
|
|
private List<ProductionresourcePosition> jbwList;
|
|
|
|
|
|
- private BomProcedureTrayService procedureTrayService;
|
|
|
+
|
|
|
|
|
|
private Long zoneId;
|
|
|
|
|
@@ -207,8 +208,9 @@ public class RobotNodeServiceImpl implements NodeOperationService {
|
|
|
List<Long> productionresourceIds = productionresources.stream().map(t->t.getId()).collect(Collectors.toList());
|
|
|
List<ProductionresourcePosition> startProductionresourcePositions = productionresourcePositionMapper.selectList(Wraps.<ProductionresourcePosition>lbQ().in(ProductionresourcePosition::getResourceId, productionresourceIds));
|
|
|
List<Long> startProductionresourcePositionIds = startProductionresourcePositions.stream().map(t->t.getStorgeId()).collect(Collectors.toList());
|
|
|
+
|
|
|
List<BomProcedureTray>trayList = procedureTrayService.list(Wraps.<BomProcedureTray>lbQ().in(BomProcedureTray::getProcedureId, task.getProcedureId()));
|
|
|
- List<Long>trayIdList = trayList.stream().map(t->t.getId()).collect(Collectors.toList());
|
|
|
+ List<Long>trayIdList = trayList.stream().map(t->t.getTrayId()).collect(Collectors.toList());
|
|
|
// 判断夹具是否有可用的,查询330个库位信息中是否还有夹具
|
|
|
flikustockInfos = stockInfoMapper.selectList(Wraps.<StockInfo>lbQ().in(StockInfo::getGoodsId,trayIdList).in(StockInfo::getStorgeId,startProductionresourcePositionIds).orderByAsc(StockInfo::getStorgeId));
|
|
|
// if(flikustockInfos.size() <= 0){
|