|
|
|
@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
@Service
|
|
|
|
|
@Slf4j
|
|
|
|
@ -33,7 +34,7 @@ public class MesEquipmentService extends BaseMesService<MesEquipment> implements
|
|
|
|
|
DdlPreparedPack.getIsNotNull( "workCellCode", packBean1);
|
|
|
|
|
|
|
|
|
|
List<MesWcEquipment> workCells = mesWcEquipmentRepository.findByHqlWhere(packBean1);
|
|
|
|
|
DdlPreparedPack.getNotInPack(workCells.stream().map(MesWcEquipment::getEquipmentCode), "equipmentCode", packBean);
|
|
|
|
|
DdlPreparedPack.getNotInPack(workCells.stream().map(MesWcEquipment::getEquipmentCode).collect(Collectors.toList()), "equipmentCode", packBean);
|
|
|
|
|
}
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), "equipmentCode", packBean);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(bean.getEquipmentName(), "equipmentName", packBean);
|
|
|
|
|