|
@@ -195,8 +195,9 @@ public class ZZoneServiceImpl extends SuperServiceImpl<ZZoneMapper, ZZone> imple
|
|
|
//修改workpiece当前正在执行的工序
|
|
|
//先查出当前产线的零件
|
|
|
List<BBom>bBomList = bomMapper.selectList(Wraps.<BBom>lbQ().eq(BBom::getZoneId, data.getId()));
|
|
|
+ List<Long>bomIdList = bBomList.stream().map(p -> p.getId()).collect(Collectors.toList());
|
|
|
|
|
|
- List<TWorkpiece>workpieceList = workpieceService.list(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getIsEnd, "0").in(TWorkpiece::getBomId,bBomList));
|
|
|
+ List<TWorkpiece>workpieceList = workpieceService.list(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getIsEnd, "0").in(TWorkpiece::getBomId,bomIdList));
|
|
|
|
|
|
if(CollectionUtil.isNotEmpty(workpieceList)){
|
|
|
workpieceList.stream().map((t) -> {
|